From 2d7694bfb024ae6f321940ec8b6a9baf9c9d8c5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Fri, 17 Jun 2022 16:06:20 +0200 Subject: [PATCH] cleanup --- .../cdm/io/cdmLight/CdmLightClassificationExport.java | 4 ---- .../cdm/io/specimen/abcd206/in/AbcdGgbnImportTest.java | 1 - .../persistence/hibernate/PostMergeEntityListener.java | 9 ++++++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java index 3b03e3f23b..7fb2d2fe63 100755 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightClassificationExport.java @@ -198,10 +198,6 @@ public class CdmLightClassificationExport private void setOrderIndex(CdmLightExportState state, OrderHelper order) { - // String sortIndex = StringUtils.isBlank(sort_index)? - // String.valueOf(order.getOrderIndex()): sort_index+ "_" - // +String.valueOf(order.getOrderIndex()); - if (order.getTaxonUuid() != null && state.getProcessor().hasRecord(CdmLightExportTable.TAXON, order.getTaxonUuid().toString())) { String[] csvLine = state.getProcessor().getRecord(CdmLightExportTable.TAXON, diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/AbcdGgbnImportTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/AbcdGgbnImportTest.java index 61bab7cb23..c9f16a2091 100644 --- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/AbcdGgbnImportTest.java +++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/AbcdGgbnImportTest.java @@ -120,7 +120,6 @@ public class AbcdGgbnImportTest extends CdmTransactionalIntegrationTest { * - Campanula bononiensis */ List nodes = taxonNodeService.list(TaxonNode.class, 100, 0, null, null); - // TODO: this needs to be fixed, the sortindex should never be -1 for (TaxonNode node: nodes){ if (node.getTaxon() != null){ assertTrue("The sortindex should not be smaller than 0", node.getSortIndex() > -1 ); diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java index 0a4400fbc8..d757672e0c 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java @@ -13,7 +13,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.LazyInitializationException; @@ -33,10 +34,12 @@ import eu.etaxonomy.cdm.model.term.TermTree; * @since 23 Sep 2015 */ public class PostMergeEntityListener implements MergeEventListener { + private static final long serialVersionUID = 1565797119368313987L; + @SuppressWarnings("unused") + private static final Logger logger = LogManager.getLogger(PostMergeEntityListener.class); private static Map> newEntitiesMap = new ConcurrentHashMap<>(); - private static final Logger logger = LogManager.getLogger(PostMergeEntityListener.class); public static void addSession(Session session) { newEntitiesMap.put(session, new HashSet<>()); @@ -52,7 +55,7 @@ public class PostMergeEntityListener implements MergeEventListener { @Override public void onMerge(MergeEvent event) throws HibernateException { - Object entity = event.getEntity(); +// Object entity = event.getEntity(); } @Override -- 2.34.1