From a5516896ce817c8896805c678f647bd1c79745a7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 3 May 2021 09:07:17 +0200 Subject: [PATCH] cleanup --- .../model/metadata/NamedAreaSearchField.java | 5 +- .../cdm/model/metadata/NodeOrderEnum.java | 8 +- .../cdm/model/metadata/PublishEnum.java | 5 +- .../metadata/SecReferenceHandlingEnum.java | 8 +- .../cdm/model/metadata/TermComboEnum.java | 5 +- .../cdm/model/metadata/TermDisplayEnum.java | 4 +- .../cdm/model/metadata/TermOrder.java | 5 +- .../term/DefinedTermDaoImplTest.java | 90 +++++++++---------- 8 files changed, 61 insertions(+), 69 deletions(-) diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/NamedAreaSearchField.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/NamedAreaSearchField.java index 6fe95c86a4..032b88de2d 100755 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/NamedAreaSearchField.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/NamedAreaSearchField.java @@ -13,6 +13,7 @@ package eu.etaxonomy.cdm.model.metadata; * @since 12.09.2019 */ public enum NamedAreaSearchField implements IKeyLabel{ + IDInVocabulary("idInVocabulary", "ID in vocabulary"), Symbol1("symbol1", "First symbol"), Symbol2("symbol2", "Second symbol"), @@ -26,7 +27,6 @@ public enum NamedAreaSearchField implements IKeyLabel{ this.key = key; } - @Override public String getLabel() { return label; @@ -45,5 +45,4 @@ public enum NamedAreaSearchField implements IKeyLabel{ } throw new IllegalArgumentException(); } - -} +} \ No newline at end of file diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/NodeOrderEnum.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/NodeOrderEnum.java index eed64d650a..7c7f174d79 100755 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/NodeOrderEnum.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/NodeOrderEnum.java @@ -15,13 +15,13 @@ package eu.etaxonomy.cdm.model.metadata; * */ public enum NodeOrderEnum implements IKeyLabel{ + AlphabeticalOrder("AlphabeticalOrder", "Alphabetical"), //$NON-NLS-1$ NaturalOrder("NaturalOrder", "Natural"), //$NON-NLS-1$ RankAndNameOrder("RankAndNameOrder", "Rank and Name"); //$NON-NLS-1$ - - String label; - String key; + private String label; + private String key; private NodeOrderEnum(String key, String label){ this.label = label; @@ -42,4 +42,4 @@ public enum NodeOrderEnum implements IKeyLabel{ public String toString(){ return key; } -} +} \ No newline at end of file diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PublishEnum.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PublishEnum.java index b821c1ee45..0caf78de19 100755 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PublishEnum.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PublishEnum.java @@ -19,9 +19,8 @@ public enum PublishEnum implements IKeyLabel{ NotPublish("NotPublish", "Don't publish"), InheritFromParent("InheritFromParent", "Inherit from parent"); - - String label; - String key; + private String label; + private String key; private PublishEnum(String key, String label){ this.label = label; diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/SecReferenceHandlingEnum.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/SecReferenceHandlingEnum.java index 1a63b63a5d..37d9a29132 100755 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/SecReferenceHandlingEnum.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/SecReferenceHandlingEnum.java @@ -21,15 +21,14 @@ public enum SecReferenceHandlingEnum implements IKeyLabel { UseNewParentSec("UseNewParentSec", "Always use new parent sec"); // UseOldParentSec("UseOldParentSec", "Always use old parent sec"); - String label; - String key; + private String label; + private String key; private SecReferenceHandlingEnum(String key, String label){ this.label = label; this.key = key; } - @Override public String getLabel() { return label; @@ -39,5 +38,4 @@ public enum SecReferenceHandlingEnum implements IKeyLabel { public String getKey() { return key; } - -} +} \ No newline at end of file diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/TermComboEnum.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/TermComboEnum.java index f17fa3e715..2f8df6e888 100755 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/TermComboEnum.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/TermComboEnum.java @@ -11,7 +11,6 @@ package eu.etaxonomy.cdm.model.metadata; /** * @author k.luther * @since 03.06.2019 - * */ public enum TermComboEnum implements IKeyLabel{ @@ -21,8 +20,8 @@ public enum TermComboEnum implements IKeyLabel{ Title("Label", "Label"), TermDisplayPlusTitle("TermDisplay+Label", "[Term Display] Label"); - String label; - String key; + private String label; + private String key; private TermComboEnum(String key, String label){ this.label = label; diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/TermDisplayEnum.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/TermDisplayEnum.java index 2eed3ce5be..9fb26f6a2e 100755 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/TermDisplayEnum.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/TermDisplayEnum.java @@ -19,8 +19,8 @@ public enum TermDisplayEnum implements IKeyLabel{ Symbol2("Symbol2", "Symbol 2"), Title("Label", "Label"); - String label; - String key; + private String label; + private String key; private TermDisplayEnum(String key, String label){ this.label = label; diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/TermOrder.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/TermOrder.java index 889a9a16dc..858f9e5f8a 100755 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/TermOrder.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/TermOrder.java @@ -19,9 +19,8 @@ public enum TermOrder implements IKeyLabel{ Label("Label", "Label"), Natural("Natural", "Natural"); - - String label; - String key; + private String label; + private String key; private TermOrder(String key, String label){ this.label = label; diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/DefinedTermDaoImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/DefinedTermDaoImplTest.java index a528fe3174..75b1bca2be 100644 --- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/DefinedTermDaoImplTest.java +++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/term/DefinedTermDaoImplTest.java @@ -271,54 +271,52 @@ public class DefinedTermDaoImplTest extends CdmTransactionalIntegrationTest { Assert.assertEquals("German Label should be the new title cache again as English representation is not there anymore", "Deutscher Modifier", newModifier.getTitleCache()); } - @Test - @DataSets({ + @Test + @DataSets({ @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="/eu/etaxonomy/cdm/database/ClearDB_with_Terms_DataSet.xml"), @DataSet("/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml")} - ) - public void testListByTermType(){ - - TermType termType = TermType.Modifier; - - List existingList = this.dao.listByTermType(termType, null, null, null, null); - int nExisting = existingList.size(); - int nExistingTerms = this.dao.list(DefinedTerm.class, null, null, null, null).size(); - - - //prepare - @SuppressWarnings("unchecked") - TermVocabulary newVoc = TermVocabulary.NewInstance(termType); - UUID vocUuid = UUID.fromString("6ced4c45-9c1b-4053-9dc3-6b8c51d286ed"); - newVoc.setUuid(vocUuid); - UUID termUuid = UUID.fromString("2ab69720-c06c-4cfc-8928-d2ae6f1e4a48"); - DefinedTerm newModifier = DefinedTerm.NewModifierInstance("Test Modifier Description", "English Modifier", "TM"); - newModifier.setUuid(termUuid); - newVoc.addTerm(newModifier); - vocabularyDao.save(newVoc); - this.commitAndStartNewTransaction(null); - - //assert 1 more - int nNow = this.dao.listByTermType(termType, null, null, null, null).size(); - Assert.assertEquals("There should be exactly 1 more term now", nExisting + 1 , nNow); - int nTermsNow = this.dao.list(DefinedTerm.class, null, null, null, null).size(); - Assert.assertEquals("There should be exactly 1 more term now", nExistingTerms + 1 , nTermsNow); - this.commitAndStartNewTransaction(null); - - //Add German representation - Representation newRepresentation = Representation.NewInstance("Beschreibung", "Deutscher Modifier", "Abk.", Language.GERMAN()); - newModifier.addRepresentation(newRepresentation); - dao.saveOrUpdate(newModifier); - this.commitAndStartNewTransaction(null); - - nNow = this.dao.listByTermType(termType, null, null, null, null).size(); - Assert.assertEquals("There should still be only one more term (but with 2 representations)", nExisting + 1 , nNow); - nTermsNow = this.dao.list(DefinedTerm.class, null, null, null, null).size(); - Assert.assertEquals("There should be exactly 1 more term now", nExistingTerms + 1 , nTermsNow); - - - List languages = this.dao.listByTermType(TermType.Language, null, null, null, null); - Assert.assertNotNull(languages); - Assert.assertEquals(485, languages.size()); + ) + public void testListByTermType(){ + + TermType termType = TermType.Modifier; + + List existingList = this.dao.listByTermType(termType, null, null, null, null); + int nExisting = existingList.size(); + int nExistingTerms = this.dao.list(DefinedTerm.class, null, null, null, null).size(); + + //prepare + @SuppressWarnings("unchecked") + TermVocabulary newVoc = TermVocabulary.NewInstance(termType); + UUID vocUuid = UUID.fromString("6ced4c45-9c1b-4053-9dc3-6b8c51d286ed"); + newVoc.setUuid(vocUuid); + UUID termUuid = UUID.fromString("2ab69720-c06c-4cfc-8928-d2ae6f1e4a48"); + DefinedTerm newModifier = DefinedTerm.NewModifierInstance("Test Modifier Description", "English Modifier", "TM"); + newModifier.setUuid(termUuid); + newVoc.addTerm(newModifier); + vocabularyDao.save(newVoc); + this.commitAndStartNewTransaction(null); + + //assert 1 more + int nNow = this.dao.listByTermType(termType, null, null, null, null).size(); + Assert.assertEquals("There should be exactly 1 more term now", nExisting + 1 , nNow); + int nTermsNow = this.dao.list(DefinedTerm.class, null, null, null, null).size(); + Assert.assertEquals("There should be exactly 1 more term now", nExistingTerms + 1 , nTermsNow); + this.commitAndStartNewTransaction(null); + + //Add German representation + Representation newRepresentation = Representation.NewInstance("Beschreibung", "Deutscher Modifier", "Abk.", Language.GERMAN()); + newModifier.addRepresentation(newRepresentation); + dao.saveOrUpdate(newModifier); + this.commitAndStartNewTransaction(null); + + nNow = this.dao.listByTermType(termType, null, null, null, null).size(); + Assert.assertEquals("There should still be only one more term (but with 2 representations)", nExisting + 1 , nNow); + nTermsNow = this.dao.list(DefinedTerm.class, null, null, null, null).size(); + Assert.assertEquals("There should be exactly 1 more term now", nExistingTerms + 1 , nTermsNow); + + List languages = this.dao.listByTermType(TermType.Language, null, null, null, null); + Assert.assertNotNull(languages); + Assert.assertEquals(485, languages.size()); } @Test -- 2.34.1