cleanup

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetFormatter.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetFormatter.java
index c74440d7ed3bdf183d6384d9c6d8f706f51da18e..e666c9432ed471034fbf07ac1fcb4426f5d452ec 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetFormatter.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetFormatter.java
@@ -60,9 +60,9 @@ public class TypeDesignationSetFormatter {
     private static final String POST_STATUS_SEPARATOR = ": ";
     private static final String POST_NAME_SEPARTOR = UTF8.EN_DASH_SPATIUM.toString();
 
-    boolean withCitation;
-    boolean withStartingTypeLabel;
-    boolean withNameIfAvailable;
+    private boolean withCitation;
+    private boolean withStartingTypeLabel;
+    private boolean withNameIfAvailable;
 
     public TypeDesignationSetFormatter(boolean withCitation, boolean withStartingTypeLabel,
             boolean withNameIfAvailable) {
@@ -153,7 +153,6 @@ public class TypeDesignationSetFormatter {
         return;
     }
 
-
     /**
      * Checks if the baseType is the same as the (only?) type in the type designation workingset.
      */
@@ -340,7 +339,6 @@ public class TypeDesignationSetFormatter {
     private static void buildTaggedTextForSpecimenTypeDesignation(SpecimenTypeDesignation td, boolean useTitleCache,
             TaggedTextBuilder workingsetBuilder, TypedEntityReference<?> typeDesignationEntity) {
 
-
         if(useTitleCache){
             String typeDesigTitle = "";
             if(td.getTypeSpecimen() != null){

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
index 31c469483d847751d7d37b34061655f3e7c7c9aa..3d811fedb5d88041db43d143294d33f4ffa9230b 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
@@ -1567,12 +1567,106 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
         logger.info("Benchmark result - [find taxon by CommonName via lucene] : " + duration + "ms (" + BENCHMARK_ROUNDS + " benchmark rounds )");\r
     }\r
 \r
+    /**\r
+     *\r
+     */\r
+    private void refreshLuceneIndex() {\r
+\r
+//        commitAndStartNewTransaction(null);\r
+        commit();\r
+        endTransaction();\r
+        indexer.purge(DefaultProgressMonitor.NewInstance());\r
+        indexer.reindex(typesToIndex, DefaultProgressMonitor.NewInstance());\r
+        startNewTransaction();\r
+//        commitAndStartNewTransaction(null);\r
+    }\r
+\r
+    /**\r
+     * @param numberOfNew\r
+     *\r
+     */\r
+    private void createRandomTaxonWithCommonName(int numberOfNew) {\r
+\r
+        logger.debug(String.format("creating %1$s random taxan with CommonName", numberOfNew));\r
+\r
+        commitAndStartNewTransaction(null);\r
+\r
+        Reference sec = ReferenceFactory.newBook();\r
+        referenceService.save(sec);\r
+\r
+        for (int i = numberOfNew; i < numberOfNew; i++) {\r
+            RandomStringUtils.randomAlphabetic(10);\r
+            String radomName = RandomStringUtils.randomAlphabetic(5) + " " + RandomStringUtils.randomAlphabetic(10);\r
+            String radomCommonName = RandomStringUtils.randomAlphabetic(10);\r
+\r
+            IBotanicalName name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());\r
+            name.setNameCache(radomName, true);\r
+            Taxon taxon = Taxon.NewInstance(name, sec);\r
+            taxonService.save(taxon);\r
+\r
+            TaxonDescription description = TaxonDescription.NewInstance(taxon);\r
+            description.addElement(CommonTaxonName.NewInstance(radomCommonName, Language.GERMAN()));\r
+            descriptionService.save(description);\r
+        }\r
+\r
+        commitAndStartNewTransaction(null);\r
+    }\r
+\r
+    private <T extends CdmBase> void logFreeTextSearchResults(Pager<SearchResult<T>> pager, Level level, String[] docFields){\r
+        if(level == null){\r
+            level = Level.DEBUG;\r
+        }\r
+        if(logger.isEnabledFor(level)){\r
+            StringBuilder b = new StringBuilder();\r
+            b.append("\n");\r
+            int i = 0;\r
+            for(SearchResult<?> sr : pager.getRecords()){\r
+\r
+                b.append(" ").append(i++).append(" - ");\r
+                b.append("score:").append(sr.getScore()).append(", ");\r
+\r
+                if(docFields != null){\r
+                    b.append("docs : ");\r
+                    for(Document doc : sr.getDocs()) {\r
+                        b.append("<");\r
+                        for(String f : docFields){\r
+                            b.append(f).append(":").append(Arrays.toString(doc.getValues(f)));\r
+                        }\r
+                        b.append(">");\r
+                    }\r
+                }\r
+\r
+                CdmBase entity = sr.getEntity();\r
+                if(entity == null){\r
+                    b.append("NULL");\r
+                } else {\r
+                    b.append(entity.getClass().getSimpleName()).\r
+                        append(" [").append(entity.getId()).\r
+                        append(" | ").append(entity.getUuid()).append("] : ").\r
+                        append(entity.toString());\r
+\r
+                }\r
+                b.append("\n");\r
+            }\r
+            logger.log(level, b);\r
+        }\r
+    }\r
+\r
+    private Set<UUID> getTaxonUuidSet(@SuppressWarnings("rawtypes") Pager<SearchResult<TaxonBase>> pager) {\r
+        Set<UUID> result = new HashSet<>();\r
+        for (@SuppressWarnings("rawtypes") SearchResult<TaxonBase> searchResult : pager.getRecords()){\r
+            result.add(searchResult.getEntity().getUuid());\r
+        }\r
+        return result;\r
+    }\r
+\r
+\r
     /**\r
      * uncomment @Test annotation to create the dataset for this test\r
      */\r
     @Override\r
-    //    @Test\r
-    @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="ClearDBDataSet.xml")\r
+//    @Test\r
+    @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="../../database/ClearDBDataSet.xml")\r
     public final void createTestDataSet() throws FileNotFoundException {\r
 \r
         Classification europeanAbiesClassification = Classification.NewInstance("European Abies");\r
@@ -1715,102 +1809,4 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest {
 \r
     }\r
 \r
-    /**\r
-     *\r
-     */\r
-    private void refreshLuceneIndex() {\r
-\r
-//        commitAndStartNewTransaction(null);\r
-        commit();\r
-        endTransaction();\r
-        indexer.purge(DefaultProgressMonitor.NewInstance());\r
-        indexer.reindex(typesToIndex, DefaultProgressMonitor.NewInstance());\r
-        startNewTransaction();\r
-//        commitAndStartNewTransaction(null);\r
-    }\r
-\r
-    /**\r
-     * @param numberOfNew\r
-     *\r
-     */\r
-    private void createRandomTaxonWithCommonName(int numberOfNew) {\r
-\r
-        logger.debug(String.format("creating %1$s random taxan with CommonName", numberOfNew));\r
-\r
-        commitAndStartNewTransaction(null);\r
-\r
-        Reference sec = ReferenceFactory.newBook();\r
-        referenceService.save(sec);\r
-\r
-        for (int i = numberOfNew; i < numberOfNew; i++) {\r
-            RandomStringUtils.randomAlphabetic(10);\r
-            String radomName = RandomStringUtils.randomAlphabetic(5) + " " + RandomStringUtils.randomAlphabetic(10);\r
-            String radomCommonName = RandomStringUtils.randomAlphabetic(10);\r
-\r
-            IBotanicalName name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());\r
-            name.setNameCache(radomName, true);\r
-            Taxon taxon = Taxon.NewInstance(name, sec);\r
-            taxonService.save(taxon);\r
-\r
-            TaxonDescription description = TaxonDescription.NewInstance(taxon);\r
-            description.addElement(CommonTaxonName.NewInstance(radomCommonName, Language.GERMAN()));\r
-            descriptionService.save(description);\r
-        }\r
-\r
-        commitAndStartNewTransaction(null);\r
-    }\r
-\r
-    private <T extends CdmBase> void logFreeTextSearchResults(Pager<SearchResult<T>> pager, Level level, String[] docFields){\r
-        if(level == null){\r
-            level = Level.DEBUG;\r
-        }\r
-        if(logger.isEnabledFor(level)){\r
-            StringBuilder b = new StringBuilder();\r
-            b.append("\n");\r
-            int i = 0;\r
-            for(SearchResult<?> sr : pager.getRecords()){\r
-\r
-                b.append(" ").append(i++).append(" - ");\r
-                b.append("score:").append(sr.getScore()).append(", ");\r
-\r
-                if(docFields != null){\r
-                    b.append("docs : ");\r
-                    for(Document doc : sr.getDocs()) {\r
-                        b.append("<");\r
-                        for(String f : docFields){\r
-                            b.append(f).append(":").append(Arrays.toString(doc.getValues(f)));\r
-                        }\r
-                        b.append(">");\r
-                    }\r
-                }\r
-\r
-                CdmBase entity = sr.getEntity();\r
-                if(entity == null){\r
-                    b.append("NULL");\r
-                } else {\r
-                    b.append(entity.getClass().getSimpleName()).\r
-                        append(" [").append(entity.getId()).\r
-                        append(" | ").append(entity.getUuid()).append("] : ").\r
-                        append(entity.toString());\r
-\r
-                }\r
-                b.append("\n");\r
-            }\r
-            logger.log(level, b);\r
-        }\r
-    }\r
-\r
-\r
-    /**\r
-     * @param pager\r
-     * @return\r
-     */\r
-    private Set<UUID> getTaxonUuidSet(@SuppressWarnings("rawtypes") Pager<SearchResult<TaxonBase>> pager) {\r
-        Set<UUID> result = new HashSet<>();\r
-        for (@SuppressWarnings("rawtypes") SearchResult<TaxonBase> searchResult : pager.getRecords()){\r
-            result.add(searchResult.getEntity().getUuid());\r
-        }\r
-        return result;\r
-    }\r
-\r
 }\r

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetFormatterTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetFormatterTest.java
index d52121b248df334501014abc347b8bf263e972e8..0cd7c46f47b71691664050c1874dd38e63cae16b 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetFormatterTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/name/TypeDesignationSetFormatterTest.java
@@ -170,6 +170,7 @@ public class TypeDesignationSetFormatterTest extends TermTestBase{
 
     @Test
     public void testNameTypeDesignationTaggedText() throws RegistrationValidationException {
+
         @SuppressWarnings("rawtypes")
         List<TypeDesignationBase> tds = new ArrayList<>();
         tds.add(ntd);