From 989e5b9c862d0b82dd5a338ff5ad9dfe5a8a2536 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Wed, 15 Dec 2021 14:22:27 +0100 Subject: [PATCH] cleanup --- .../name/TypeDesignationSetFormatter.java | 8 +- .../api/service/TaxonServiceSearchTest.java | 196 +++++++++--------- .../name/TypeDesignationSetFormatterTest.java | 1 + 3 files changed, 100 insertions(+), 105 deletions(-) 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 c74440d7ed..e666c9432e 100644 --- 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 31c469483d..3d811fedb5 100644 --- 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 )"); } + /** + * + */ + private void refreshLuceneIndex() { + +// commitAndStartNewTransaction(null); + commit(); + endTransaction(); + indexer.purge(DefaultProgressMonitor.NewInstance()); + indexer.reindex(typesToIndex, DefaultProgressMonitor.NewInstance()); + startNewTransaction(); +// commitAndStartNewTransaction(null); + } + + /** + * @param numberOfNew + * + */ + private void createRandomTaxonWithCommonName(int numberOfNew) { + + logger.debug(String.format("creating %1$s random taxan with CommonName", numberOfNew)); + + commitAndStartNewTransaction(null); + + Reference sec = ReferenceFactory.newBook(); + referenceService.save(sec); + + for (int i = numberOfNew; i < numberOfNew; i++) { + RandomStringUtils.randomAlphabetic(10); + String radomName = RandomStringUtils.randomAlphabetic(5) + " " + RandomStringUtils.randomAlphabetic(10); + String radomCommonName = RandomStringUtils.randomAlphabetic(10); + + IBotanicalName name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()); + name.setNameCache(radomName, true); + Taxon taxon = Taxon.NewInstance(name, sec); + taxonService.save(taxon); + + TaxonDescription description = TaxonDescription.NewInstance(taxon); + description.addElement(CommonTaxonName.NewInstance(radomCommonName, Language.GERMAN())); + descriptionService.save(description); + } + + commitAndStartNewTransaction(null); + } + + private void logFreeTextSearchResults(Pager> pager, Level level, String[] docFields){ + if(level == null){ + level = Level.DEBUG; + } + if(logger.isEnabledFor(level)){ + StringBuilder b = new StringBuilder(); + b.append("\n"); + int i = 0; + for(SearchResult sr : pager.getRecords()){ + + b.append(" ").append(i++).append(" - "); + b.append("score:").append(sr.getScore()).append(", "); + + if(docFields != null){ + b.append("docs : "); + for(Document doc : sr.getDocs()) { + b.append("<"); + for(String f : docFields){ + b.append(f).append(":").append(Arrays.toString(doc.getValues(f))); + } + b.append(">"); + } + } + + CdmBase entity = sr.getEntity(); + if(entity == null){ + b.append("NULL"); + } else { + b.append(entity.getClass().getSimpleName()). + append(" [").append(entity.getId()). + append(" | ").append(entity.getUuid()).append("] : "). + append(entity.toString()); + + } + b.append("\n"); + } + logger.log(level, b); + } + } + + private Set getTaxonUuidSet(@SuppressWarnings("rawtypes") Pager> pager) { + Set result = new HashSet<>(); + for (@SuppressWarnings("rawtypes") SearchResult searchResult : pager.getRecords()){ + result.add(searchResult.getEntity().getUuid()); + } + return result; + } + + /** * uncomment @Test annotation to create the dataset for this test */ @Override - // @Test - @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="ClearDBDataSet.xml") +// @Test + @DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="../../database/ClearDBDataSet.xml") public final void createTestDataSet() throws FileNotFoundException { Classification europeanAbiesClassification = Classification.NewInstance("European Abies"); @@ -1715,102 +1809,4 @@ public class TaxonServiceSearchTest extends CdmTransactionalIntegrationTest { } - /** - * - */ - private void refreshLuceneIndex() { - -// commitAndStartNewTransaction(null); - commit(); - endTransaction(); - indexer.purge(DefaultProgressMonitor.NewInstance()); - indexer.reindex(typesToIndex, DefaultProgressMonitor.NewInstance()); - startNewTransaction(); -// commitAndStartNewTransaction(null); - } - - /** - * @param numberOfNew - * - */ - private void createRandomTaxonWithCommonName(int numberOfNew) { - - logger.debug(String.format("creating %1$s random taxan with CommonName", numberOfNew)); - - commitAndStartNewTransaction(null); - - Reference sec = ReferenceFactory.newBook(); - referenceService.save(sec); - - for (int i = numberOfNew; i < numberOfNew; i++) { - RandomStringUtils.randomAlphabetic(10); - String radomName = RandomStringUtils.randomAlphabetic(5) + " " + RandomStringUtils.randomAlphabetic(10); - String radomCommonName = RandomStringUtils.randomAlphabetic(10); - - IBotanicalName name = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()); - name.setNameCache(radomName, true); - Taxon taxon = Taxon.NewInstance(name, sec); - taxonService.save(taxon); - - TaxonDescription description = TaxonDescription.NewInstance(taxon); - description.addElement(CommonTaxonName.NewInstance(radomCommonName, Language.GERMAN())); - descriptionService.save(description); - } - - commitAndStartNewTransaction(null); - } - - private void logFreeTextSearchResults(Pager> pager, Level level, String[] docFields){ - if(level == null){ - level = Level.DEBUG; - } - if(logger.isEnabledFor(level)){ - StringBuilder b = new StringBuilder(); - b.append("\n"); - int i = 0; - for(SearchResult sr : pager.getRecords()){ - - b.append(" ").append(i++).append(" - "); - b.append("score:").append(sr.getScore()).append(", "); - - if(docFields != null){ - b.append("docs : "); - for(Document doc : sr.getDocs()) { - b.append("<"); - for(String f : docFields){ - b.append(f).append(":").append(Arrays.toString(doc.getValues(f))); - } - b.append(">"); - } - } - - CdmBase entity = sr.getEntity(); - if(entity == null){ - b.append("NULL"); - } else { - b.append(entity.getClass().getSimpleName()). - append(" [").append(entity.getId()). - append(" | ").append(entity.getUuid()).append("] : "). - append(entity.toString()); - - } - b.append("\n"); - } - logger.log(level, b); - } - } - - - /** - * @param pager - * @return - */ - private Set getTaxonUuidSet(@SuppressWarnings("rawtypes") Pager> pager) { - Set result = new HashSet<>(); - for (@SuppressWarnings("rawtypes") SearchResult searchResult : pager.getRecords()){ - result.add(searchResult.getEntity().getUuid()); - } - return result; - } - } 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 d52121b248..0cd7c46f47 100644 --- 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 tds = new ArrayList<>(); tds.add(ntd); -- 2.34.1