Fixed several compile issues

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInCollectedVolumeItem.java

@@ -5,13 +5,8 @@
  */
 package org.scientificcms.publications.contenttypes;
 
-import com.arsdigita.cms.contenttypes.ui.ArticleInCollectedVolumeCreateForm;
-import com.arsdigita.cms.contenttypes.ui.ArticleInCollectedVolumePropertiesStep;
 
 import org.hibernate.envers.Audited;
-import org.librecms.CmsConstants;
-import org.librecms.contenttypes.AuthoringKit;
-import org.librecms.contenttypes.AuthoringStep;
 import org.librecms.contenttypes.ContentTypeDescription;
 import org.scientificcms.publications.ArticleInCollectedVolume;
 
@@ -31,20 +26,6 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
     labelBundle = "org.scientificcms.publications.contenttypes.ArticleInCollectedVolume",
     descriptionBundle = "org.scientificcms.publications.contenttypes.ArticleInCollectedVolume"
 )
-@AuthoringKit(
-    createComponent = ArticleInCollectedVolumeCreateForm.class,
-    steps = {
-        @AuthoringStep(
-            component = ArticleInCollectedVolumePropertiesStep.class,
-            labelBundle = CmsConstants.CMS_BUNDLE,
-            labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = CmsConstants.CMS_BUNDLE,
-            descriptionKey = "cms.contenttypes.shared.basic_properties"
-                                 + ".description",
-            order = 1
-        )
-    }
-)
 public class ArticleInCollectedVolumeItem 
     extends PublicationItem<ArticleInCollectedVolume> {
 

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInJournalItem.java

@@ -5,13 +5,8 @@
  */
 package org.scientificcms.publications.contenttypes;
 
-import com.arsdigita.cms.contenttypes.ui.ArticleInJournalCreateForm;
-import com.arsdigita.cms.contenttypes.ui.ArticleInJournalPropertiesStep;
 
 import org.hibernate.envers.Audited;
-import org.librecms.CmsConstants;
-import org.librecms.contenttypes.AuthoringKit;
-import org.librecms.contenttypes.AuthoringStep;
 import org.librecms.contenttypes.ContentTypeDescription;
 import org.scientificcms.publications.ArticleInJournal;
 
@@ -31,20 +26,6 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
     labelBundle = "org.scientificcms.publications.contenttypes.ArticleInJournal",
     descriptionBundle = "org.scientificcms.publications.contenttypes.ArticleInJournal"
 )
-@AuthoringKit(
-    createComponent = ArticleInJournalCreateForm.class,
-    steps = {
-        @AuthoringStep(
-            component = ArticleInJournalPropertiesStep.class,
-            labelBundle = CmsConstants.CMS_BUNDLE,
-            labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = CmsConstants.CMS_BUNDLE,
-            descriptionKey = "cms.contenttypes.shared.basic_properties"
-                                 + ".description",
-            order = 1
-        )
-    }
-)
 public class ArticleInJournalItem extends PublicationItem<ArticleInJournal> {
 
     private static final long serialVersionUID = 1L;

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/CollectedVolumeItem.java

@@ -5,13 +5,8 @@
  */
 package org.scientificcms.publications.contenttypes;
 
-import com.arsdigita.cms.contenttypes.ui.CollectedVolumeCreateForm;
-import com.arsdigita.cms.contenttypes.ui.CollectedVolumePropertiesStep;
 
 import org.hibernate.envers.Audited;
-import org.librecms.CmsConstants;
-import org.librecms.contenttypes.AuthoringKit;
-import org.librecms.contenttypes.AuthoringStep;
 import org.librecms.contenttypes.ContentTypeDescription;
 import org.scientificcms.publications.CollectedVolume;
 
@@ -31,20 +26,6 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
     labelBundle = "org.scientificcms.publications.contenttypes.CollectedVolume",
     descriptionBundle = "org.scientificcms.publications.contenttypes.CollectedVolume"
 )
-@AuthoringKit(
-    createComponent = CollectedVolumeCreateForm.class,
-    steps = {
-        @AuthoringStep(
-            component = CollectedVolumePropertiesStep.class,
-            labelBundle = CmsConstants.CMS_BUNDLE,
-            labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = CmsConstants.CMS_BUNDLE,
-            descriptionKey = "cms.contenttypes.shared.basic_properties"
-                                 + ".description",
-            order = 1
-        )
-    }
-)
 public class CollectedVolumeItem
     extends PublicationWithPublisherItem<CollectedVolume> {
 

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ExpertiseItem.java

@@ -6,13 +6,8 @@
 package org.scientificcms.publications.contenttypes;
 
 
-import com.arsdigita.cms.contenttypes.ui.ExpertiseCreateForm;
-import com.arsdigita.cms.contenttypes.ui.ExpertisePropertiesStep;
 
 import org.hibernate.envers.Audited;
-import org.librecms.CmsConstants;
-import org.librecms.contenttypes.AuthoringKit;
-import org.librecms.contenttypes.AuthoringStep;
 import org.librecms.contenttypes.ContentTypeDescription;
 import org.scientificcms.publications.Expertise;
 
@@ -32,20 +27,6 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
     labelBundle = "org.scientificcms.publications.contenttypes.Expertise",
     descriptionBundle = "org.scientificcms.publications.contenttypes.Expertise"
 )
-@AuthoringKit(
-    createComponent = ExpertiseCreateForm.class,
-    steps = {
-        @AuthoringStep(
-            component = ExpertisePropertiesStep.class,
-            labelBundle = CmsConstants.CMS_BUNDLE,
-            labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = CmsConstants.CMS_BUNDLE,
-            descriptionKey = "cms.contenttypes.shared.basic_properties"
-                                 + ".description",
-            order = 1
-        )
-    }
-)
 public class ExpertiseItem extends PublicationItem<Expertise> {
 
     private static final long serialVersionUID = 1L;

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/GreyLiteratureItem.java

@@ -5,13 +5,7 @@
  */
 package org.scientificcms.publications.contenttypes;
 
-import com.arsdigita.cms.contenttypes.ui.GreyLiteratureCreateForm;
-import com.arsdigita.cms.contenttypes.ui.GreyLiteraturePropertiesStep;
-
 import org.hibernate.envers.Audited;
-import org.librecms.CmsConstants;
-import org.librecms.contenttypes.AuthoringKit;
-import org.librecms.contenttypes.AuthoringStep;
 import org.librecms.contenttypes.ContentTypeDescription;
 import org.scientificcms.publications.GreyLiterature;
 
@@ -30,21 +24,7 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
 @ContentTypeDescription(
     labelBundle = "org.scientificcms.publications.contenttypes.GreyLiterature",
     descriptionBundle
-    = "org.scientificcms.publications.contenttypes.GreyLiterature"
+        = "org.scientificcms.publications.contenttypes.GreyLiterature"
-)
-@AuthoringKit(
-    createComponent = GreyLiteratureCreateForm.class,
-    steps = {
-        @AuthoringStep(
-            component = GreyLiteraturePropertiesStep.class,
-            labelBundle = CmsConstants.CMS_BUNDLE,
-            labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = CmsConstants.CMS_BUNDLE,
-            descriptionKey = "cms.contenttypes.shared.basic_properties"
-                                 + ".description",
-            order = 1
-        )
-    }
 )
 public class GreyLiteratureItem extends PublicationItem<GreyLiterature> {
 

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItem.java

@@ -5,13 +5,8 @@
  */
 package org.scientificcms.publications.contenttypes;
 
-import com.arsdigita.cms.contenttypes.ui.InProceedingsCreateForm;
-import com.arsdigita.cms.contenttypes.ui.InProceedingsPropertiesStep;
 
 import org.hibernate.envers.Audited;
-import org.librecms.CmsConstants;
-import org.librecms.contenttypes.AuthoringKit;
-import org.librecms.contenttypes.AuthoringStep;
 import org.librecms.contenttypes.ContentTypeDescription;
 import org.scientificcms.publications.InProceedings;
 
@@ -32,20 +27,6 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
     descriptionBundle
     = "org.scientificcms.publications.contenttypes.InProceedings"
 )
-@AuthoringKit(
-    createComponent = InProceedingsCreateForm.class,
-    steps = {
-        @AuthoringStep(
-            component = InProceedingsPropertiesStep.class,
-            labelBundle = CmsConstants.CMS_BUNDLE,
-            labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = CmsConstants.CMS_BUNDLE,
-            descriptionKey = "cms.contenttypes.shared.basic_properties"
-                                 + ".description",
-            order = 1
-        )
-    }
-)
 public class InProceedingsItem extends PublicationItem<InProceedings> {
 
     private static final long serialVersionUID = 1L;

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InternetArticleItem.java

@@ -5,13 +5,8 @@
  */
 package org.scientificcms.publications.contenttypes;
 
-import com.arsdigita.cms.contenttypes.ui.InternetArticleCreateForm;
-import com.arsdigita.cms.contenttypes.ui.InternetArticlePropertiesStep;
 
 import org.hibernate.envers.Audited;
-import org.librecms.CmsConstants;
-import org.librecms.contenttypes.AuthoringKit;
-import org.librecms.contenttypes.AuthoringStep;
 import org.librecms.contenttypes.ContentTypeDescription;
 import org.scientificcms.publications.InternetArticle;
 
@@ -32,20 +27,6 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
     descriptionBundle
         = "org.scientificcms.publications.contenttypes.InternetArticle"
 )
-@AuthoringKit(
-    createComponent = InternetArticleCreateForm.class,
-    steps = {
-        @AuthoringStep(
-            component = InternetArticlePropertiesStep.class,
-            labelBundle = CmsConstants.CMS_BUNDLE,
-            labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = CmsConstants.CMS_BUNDLE,
-            descriptionKey = "cms.contenttypes.shared.basic_properties"
-                                 + ".description",
-            order = 1
-        )
-    }
-)
 public class InternetArticleItem extends PublicationItem<InternetArticle> {
 
     private static final long serialVersionUID = 1L;

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/MonographItem.java

@@ -5,12 +5,6 @@
  */
 package org.scientificcms.publications.contenttypes;
 
-import com.arsdigita.cms.contenttypes.ui.MonographCreateForm;
-import com.arsdigita.cms.contenttypes.ui.MonographPropertiesStep;
-
-import org.librecms.CmsConstants;
-import org.librecms.contenttypes.AuthoringKit;
-import org.librecms.contenttypes.AuthoringStep;
 import org.librecms.contenttypes.ContentTypeDescription;
 import org.scientificcms.publications.Monograph;
 
@@ -29,20 +23,6 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
     labelBundle = "org.scientificcms.publications.contenttypes.Monograph",
     descriptionBundle = "org.scientificcms.publications.contenttypes.Monograph"
 )
-@AuthoringKit(
-    createComponent = MonographCreateForm.class,
-    steps = {
-        @AuthoringStep(
-            component = MonographPropertiesStep.class,
-            labelBundle = CmsConstants.CMS_BUNDLE,
-            labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = CmsConstants.CMS_BUNDLE,
-            descriptionKey = "cms.contenttypes.shared.basic_properties"
-                                 + ".description",
-            order = 1
-        )
-    }
-)
 public class MonographItem extends PublicationWithPublisherItem<Monograph> {
 
     private static final long serialVersionUID = 1L;

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItem.java

@@ -5,12 +5,6 @@
  */
 package org.scientificcms.publications.contenttypes;
 
-import com.arsdigita.cms.contenttypes.ui.ProceedingsCreateForm;
-import com.arsdigita.cms.contenttypes.ui.ProceedingsPropertiesStep;
-
-import org.librecms.CmsConstants;
-import org.librecms.contenttypes.AuthoringKit;
-import org.librecms.contenttypes.AuthoringStep;
 import org.librecms.contenttypes.ContentTypeDescription;
 import org.scientificcms.publications.Proceedings;
 
@@ -30,20 +24,7 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
     descriptionBundle
     = "org.scientificcms.publications.contenttypes.Proceedings"
 )
-@AuthoringKit(
+
-    createComponent = ProceedingsCreateForm.class,
-    steps = {
-        @AuthoringStep(
-            component = ProceedingsPropertiesStep.class,
-            labelBundle = CmsConstants.CMS_BUNDLE,
-            labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = CmsConstants.CMS_BUNDLE,
-            descriptionKey = "cms.contenttypes.shared.basic_properties"
-                                 + ".description",
-            order = 1
-        )
-    }
-)
 public class ProceedingsItem extends PublicationWithPublisherItem<Proceedings> {
 
     private static final long serialVersionUID = 1L;

sci-publications/src/main/java/org/scientificcms/publications/contenttypes/WorkingPaperItem.java

@@ -5,13 +5,8 @@
  */
 package org.scientificcms.publications.contenttypes;
 
-import com.arsdigita.cms.contenttypes.ui.WorkingPaperCreateForm;
-import com.arsdigita.cms.contenttypes.ui.WorkingPaperPropertiesStep;
 
 import org.hibernate.envers.Audited;
-import org.librecms.CmsConstants;
-import org.librecms.contenttypes.AuthoringKit;
-import org.librecms.contenttypes.AuthoringStep;
 import org.librecms.contenttypes.ContentTypeDescription;
 import org.scientificcms.publications.WorkingPaper;
 
@@ -32,20 +27,6 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
     descriptionBundle
     = "org.scientificcms.publications.contenttypes.WorkingPaper"
 )
-@AuthoringKit(
-    createComponent = WorkingPaperCreateForm.class,
-    steps = {
-        @AuthoringStep(
-            component = WorkingPaperPropertiesStep.class,
-            labelBundle = CmsConstants.CMS_BUNDLE,
-            labelKey = "cms.contenttypes.shared.basic_properties.title",
-            descriptionBundle = CmsConstants.CMS_BUNDLE,
-            descriptionKey = "cms.contenttypes.shared.basic_properties"
-                                 + ".description",
-            order = 1
-        )
-    }
-)
 public class WorkingPaperItem extends PublicationItem<WorkingPaper> {
 
     private static final long serialVersionUID = 1L;

sci-publications/src/main/java/org/scientificcms/publications/rs/Publications.java

@@ -5,8 +5,6 @@
  */
 package org.scientificcms.publications.rs;
 
-import com.arsdigita.cms.contenttypes.ui.PublicationSeriesTable;
-
 import org.libreccm.l10n.GlobalizationHelper;
 import org.librecms.assets.Person;
 import org.scientificcms.publications.Authorship;
@@ -25,7 +23,6 @@ import javax.json.Json;
 import javax.json.JsonArrayBuilder;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
-import javax.json.JsonValue;
 import javax.json.JsonWriter;
 import javax.transaction.Transactional;
 import javax.ws.rs.GET;
@@ -102,7 +99,7 @@ public class Publications {
         if (Publication.class.isAssignableFrom(clazz)) {
             @SuppressWarnings("unchecked")
             final Class<Publication> typeClass
-                                               = (Class<Publication>) clazz;
+                                         = (Class<Publication>) clazz;
             return typeClass;
         } else {
             throw new IllegalArgumentException(String.format(

sci-publications/src/test/java/org/libreccm/security/SecurityEntitiesPrefabProvider.java

@@ -5,7 +5,8 @@
  */
 package org.libreccm.security;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 
 /**
  *
@@ -17,7 +18,9 @@ public final class SecurityEntitiesPrefabProvider {
         // Nothing
     }
 
-    public static void addPrefabEntities(final EqualsVerifierApi<?> verifier) {
+    public static void addPrefabEntities(
+        final SingleTypeEqualsVerifierApi<?> verifier
+    ) {
 
         final Role role1 = new Role();
         role1.setRoleId(2001);
@@ -57,9 +60,11 @@ public final class SecurityEntitiesPrefabProvider {
         permission1.setGrantedPrivilege("privilege1");
         final Permission permission2 = new Permission();
         permission2.setGrantedPrivilege("privilege2");
-        verifierApi.withPrefabValues(Permission.class,
+        verifierApi.withPrefabValues(
-                                     permission1,
+            Permission.class,
-                                     permission2);
+            permission1,
+            permission2
+        );
     }
 
 }

sci-publications/src/test/java/org/scientificcms/publications/EqualsAndHashCodeTest.java

@@ -5,7 +5,7 @@
  */
 package org.scientificcms.publications;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.testutils.EqualsVerifier;
@@ -52,7 +52,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         final CollectedVolume volume1 = new CollectedVolume();
         volume1.getTitle().putValue(Locale.ENGLISH, "Test 1");
@@ -90,17 +90,21 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
         organization1.setName("Orga 1");
         final Organization organization2 = new Organization();
         organization2.setName("Orga 2");
-        verifier.withPrefabValues(Organization.class,
+        verifier.withPrefabValues(
-                                  organization1,
+            Organization.class,
-                                  organization2);
+            organization1,
+            organization2
+        );
 
         final Proceedings proceedings1 = new Proceedings();
         proceedings1.getTitle().putValue(Locale.ENGLISH, "Proceedings 1");
         final Proceedings proceedings2 = new Proceedings();
         proceedings2.getTitle().putValue(Locale.ENGLISH, "Proceedings 2");
-        verifier.withPrefabValues(Proceedings.class,
+        verifier.withPrefabValues(
-                                  proceedings1,
+            Proceedings.class,
-                                  proceedings2);
+            proceedings1,
+            proceedings2
+        );
 
         final Series series1 = new Series();
         series1.getTitle().putValue(Locale.ENGLISH, "Series Alpha");

sci-publications/src/test/java/org/scientificcms/publications/assets/EqualsAndHashCodeTest.java

@@ -5,7 +5,7 @@
  */
 package org.scientificcms.publications.assets;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.categorization.Category;
@@ -45,13 +45,15 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(
+        final SingleTypeEqualsVerifierApi<?> verifier
+    ) {
 
         final CollectedVolume volume1 = new CollectedVolume();
-        volume1.getTitle().addValue(Locale.ENGLISH, "Test 1");
+        volume1.getTitle().putValue(Locale.ENGLISH, "Test 1");
         final CollectedVolume volume2 = new CollectedVolume();
-        volume2.getTitle().addValue(Locale.ENGLISH, "Test 2");
+        volume2.getTitle().putValue(Locale.ENGLISH, "Test 2");
-        verifier.withPrefabValues(CollectedVolume.putValueolume1, volume2);
+        verifier.withPrefabValues(CollectedVolume.class, volume1, volume2);
 
         final Journal journal1 = new Journal();
         journal1.setTitle("Journal 1");
@@ -63,17 +65,19 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
 
         final Publisher publisher1 = new Publisher();
         publisher1.setName("publisher1");
-        finalputValueer publisher2 = new Publisher();
+        final Publisher publisher2 = new Publisher();
         publisher2.setName("publisher2");
-        verifier.withPrefabValues(Publisher.putValueublisher1, publisher2);
+        verifier.withPrefabValues(Publisher.class, publisher1, publisher2);
 
         final PublisherAsset publisherAsset1 = new PublisherAsset();
         publisherAsset1.setPublisher(publisher1);
         final PublisherAsset publisherAsset2 = new PublisherAsset();
         publisherAsset2.setPublisher(publisher2);
-        verifier.withPrefabValues(PublisherAsset.class,
+        verifier.withPrefabValues(
+            PublisherAsset.class,
                                   publisherAsset1,
-                                  publisherAsset2);
+                                  publisherAsset2
+        );
 
         final ItemAttachment<PublisherAsset> attachment1
                                              = new ItemAttachment<>();
@@ -86,18 +90,20 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
                                   attachment2);
 
         final Proceedings proceedings1 = new Proceedings();
-        proceedings1.getTitle().addValue(Locale.ENGLISH, "Proceedings 1");
+        proceedings1.getTitle().putValue(Locale.ENGLISH, "Proceedings 1");
         final Proceedings proceedings2 = new Proceedings();
-        proceedings2.getTitle().addValueputValue(Locale.ENGLISH, "Proceedings 2");
+        proceedings2.getTitle().putValue(Locale.ENGLISH, "Proceedings 2");
-        verifier.withPrefabValues(Proceedings.class,
+        verifier.withPrefabValues(
-                                  proceedings1put
+            Proceedings.class,
-                                  proceedings2);
+                                  proceedings1,
+                                  proceedings2
+        );
         
         SecurityEntitiesPrefabProvider.addPrefabPermissions(verifier);
         
         final Category category1 = new Category();
         category1.setName("category1");
-        final Category category2 = newputValuey();
+        final Category category2 = new Category();
         category2.setName("category2");
         verifier.withPrefabValues(Category.class, category1, category2);
         

sci-publications/src/test/java/org/scientificcms/publications/assets/PrefabAssetsProvider.java

@@ -5,7 +5,7 @@
  */
 package org.scientificcms.publications.assets;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.EqualsVerifierApi;
 import org.librecms.contentsection.ItemAttachment;
 import org.scientificcms.publications.Publisher;
 

sci-publications/src/test/java/org/scientificcms/publications/contenttypes/EqualsAndHashCodeTest.java

@@ -5,8 +5,9 @@
  */
 package org.scientificcms.publications.contenttypes;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
 import nl.jqno.equalsverifier.Warning;
+import nl.jqno.equalsverifier.api.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.categorization.Category;
@@ -48,7 +49,8 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
             GreyLiteratureItem.class,
             InProceedingsItem.class,
             InternetArticleItem.class,
-            MonographItem.classputVa         ProceedingsItem.class,
+            MonographItem.class,
+            ProceedingsItem.class,
             TalkItem.class,
             WorkingPaperItem.class
         });
@@ -59,18 +61,22 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addSuppressWarnings(final EqualsVerifierApi<?> verifier) {
+    protected void addSuppressWarnings(
+        final SingleTypeEqualsVerifierApi<?> verifier
+    ) {
         super.addSuppressWarnings(verifier);
         verifier.suppress(Warning.REFERENCE_EQUALITY);
     }
 
     @Override
     protected void addPrefabValues(
-        final nl.jqno.equalsverifier.EqualsVerifierApi<?> verifier) {
+        final SingleTypeEqualsVerifierApi<?> verifier
+    ) {
 
-        final CollectedVolume volume1 = new CollectedVolumeputVa       volume1.getTitle().addValue(Locale.ENGLISH, "Test 1");
+        final CollectedVolume volume1 = new CollectedVolume();
+        volume1.getTitle().putValue(Locale.ENGLISH, "Test 1");
         final CollectedVolume volume2 = new CollectedVolume();
-        volume2.getTitle().addValue(Locale.ENGLISH, "Test 2");
+        volume2.getTitle().putValue(Locale.ENGLISH, "Test 2");
         verifier.withPrefabValues(CollectedVolume.class, volume1, volume2);
 
         final Journal journal1 = new Journal();
@@ -95,23 +101,23 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
                                   organization2);
 
         final Proceedings proceedings1 = new Proceedings();
-        proceedings1.getTitle().addValue(Locale.ENGLISH, "Proceedings 1");
+        proceedings1.getTitle().putValue(Locale.ENGLISH, "Proceedings 1");
         final Proceedings proceedings2 = new Proceedings();
-        proceedings2.getTitle().addValue(Locale.ENGLISH, "Proceedings 2");
+        proceedings2.getTitle().putValue(Locale.ENGLISH, "Proceedings 2");
         verifier.withPrefabValues(Proceedings.class,
                                   proceedings1,
                                   proceedings2);
 
-        final ContentSection section1p= new ContentSection();
+        final ContentSection section1 = new ContentSection();
         section1.setDisplayName("section1");
         final ContentSection section2 = new ContentSection();
         section2.setDisplayName("section2");
         verifier.withPrefabValues(ContentSection.class, section1, section2);
 
         final Workflow workflow1 = new Workflow();
-        workflow1.getName().addValue(Locale.ENGLISH, "workflow1");
+        workflow1.getName().putValue(Locale.ENGLISH, "workflow1");
         final Workflow workflow2 = new Workflow();
-        workflow2.getName().addValue(Locale.ENGLISH, "workflow2");
+        workflow2.getName().putValue(Locale.ENGLISH, "workflow2");
         verifier.withPrefabValues(Workflow.class, workflow1, workflow2);
 
         SecurityEntitiesPrefabProvider.addPrefabPermissions(verifier);
@@ -138,10 +144,10 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
 
         final LifecycleDefinition lifecycleDef1 = new LifecycleDefinition();
         lifecycleDef1.setDefinitionId(-100);
-        lifecycleDef1.getLabel().addValue(Locale.ENGLISH, "def1");
+        lifecycleDef1.getLabel().putValue(Locale.ENGLISH, "def1");
         final LifecycleDefinition lifecycleDef2 = new LifecycleDefinition();
         lifecycleDef2.setDefinitionId(-110);
-        lifecycleDef2.getLabel().addValue(Locale.ENGLISH, "def2");
+        lifecycleDef2.getLabel().putValue(Locale.ENGLISH, "def2");
         verifier.withPrefabValues(LifecycleDefinition.class,
                                   lifecycleDef1,
                                   lifecycleDef2);
@@ -154,9 +160,9 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
         verifier.withPrefabValues(Lifecycle.class, lifecycle1, lifecycle2);
 
         final Publication publication1 = new Publication();
-        publication1.getTitle().addValue(Locale.ENGLISH, "Alpha");
+        publication1.getTitle().putValue(Locale.ENGLISH, "Alpha");
         final Publication publication2 = new Publication();
-        publication2.getTitle().addValue(Locale.ENGLISH, "Bravo");
+        publication2.getTitle().putValue(Locale.ENGLISH, "Bravo");
         verifier.withPrefabValues(Publication.class, publication1, publication2);
     }
 

sci-types-project/src/test/java/org/libreccm/security/SecurityEntitiesPrefabProvider.java

@@ -5,7 +5,7 @@
  */
 package org.libreccm.security;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.EqualsVerifierApi;
 
 /**
  *

sci-types-project/src/test/java/org/scientificcms/contenttypes/sciproject/EqualsAndHashCodeTest.java

@@ -5,8 +5,9 @@
  */
 package org.scientificcms.contenttypes.sciproject;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.EqualsVerifierApi;
 import nl.jqno.equalsverifier.Warning;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.categorization.Category;
@@ -51,7 +52,9 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(
+        final SingleTypeEqualsVerifierApi<?> verifier
+    ) {
 
         final Contact contact1 = new Contact();
         contact1.setContactId(10);