cleanup

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/SDDExportActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/SDDExportActivator.java
index dd551db735d33b6ea59a6d82092614f76d759a8c..7fa0461fc18f9a2affcdc443b20e328d743ca7b9 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/SDDExportActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/SDDExportActivator.java
@@ -24,7 +24,6 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.io.common.CdmDefaultExport;\r
 import eu.etaxonomy.cdm.io.common.IExportConfigurator.DO_REFERENCES;\r
 import eu.etaxonomy.cdm.io.sdd.out.SDDExportConfigurator;\r
-import junit.framework.Assert;\r
 \r
 /**\r
  * @author l.morris\r

diff --git a/app-import/src/test/java/eu/etaxonomy/cdm/io/redlist/bfnXml/BfnXmlImportConfiguratorTest.java b/app-import/src/test/java/eu/etaxonomy/cdm/io/redlist/bfnXml/BfnXmlImportConfiguratorTest.java
index c21e3715d50e8be27c0e6e77f7167f5f683c71f1..247fa4a436ca958efa8631a69eef905a6fb5cc8b 100644 (file)
--- a/app-import/src/test/java/eu/etaxonomy/cdm/io/redlist/bfnXml/BfnXmlImportConfiguratorTest.java
+++ b/app-import/src/test/java/eu/etaxonomy/cdm/io/redlist/bfnXml/BfnXmlImportConfiguratorTest.java
@@ -1,16 +1,14 @@
 /**\r
 * Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
 * http://www.e-taxonomy.eu\r
-* \r
+*\r
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
 package eu.etaxonomy.cdm.io.redlist.bfnXml;\r
 \r
-//import static junit.framework.Assert.assertNotNull;\r
-//import static junit.framework.Assert.assertTrue;\r
 //\r
 //import java.net.URISyntaxException;\r
 //import java.net.URL;\r
@@ -40,40 +38,40 @@ package eu.etaxonomy.cdm.io.redlist.bfnXml;
 //\r
 //     @SpringBeanByType\r
 //     INameService nameService;\r
-//     \r
+//\r
 //     @SpringBeanByType\r
 //     ITaxonService taxonService;\r
 //\r
 //     @SpringBeanByType\r
 //     IClassificationService classificationService;\r
-//     \r
+//\r
 //     private IImportConfigurator configurator;\r
-//     \r
+//\r
 //     @Before(value = "")\r
 //     public void setUp() throws URISyntaxException {\r
-//             \r
+//\r
 //             String inputFile = "/eu/etaxonomy/cdm/io/bfnXml/bfnXmlTest-input.xml";\r
 //             URL url = this.getClass().getResource(inputFile);\r
 //             assertNotNull("URL for the test file '" + inputFile + "' does not exist", url);\r
 //             configurator = BfnXmlImportConfigurator.NewInstance(url.toURI(), null);\r
 //             assertNotNull("Configurator could not be created", configurator);\r
 //     }\r
-//     \r
+//\r
 //     @Test\r
 //     public void testInit() {\r
 //             assertNotNull("cdmTcsXmlImport should not be null", defaultImport);\r
 //             assertNotNull("nameService should not be null", nameService);\r
 //     }\r
-//     \r
+//\r
 //     @Test\r
 //     public void testDoInvoke() {\r
 //             boolean result = defaultImport.invoke(configurator);\r
 //             assertTrue("Return value for import.invoke should be true", result);\r
-               \r
-               \r
-               \r
-               \r
-               \r
+\r
+\r
+\r
+\r
+\r
 //             List<Classification> classificationList = classificationService.list(Classification.class, null, null, null, null);\r
 //             if(classificationList != null && !classificationList.isEmpty()){\r
 //                     for(Classification classification:classificationList){\r
@@ -87,7 +85,7 @@ package eu.etaxonomy.cdm.io.redlist.bfnXml;
 //             }\r
 //             List<TaxonBase> taxonBaseList = taxonService.list(TaxonBase.class, null, null, null, null);\r
 //             for(TaxonBase taxon:taxonBaseList){\r
-//                     \r
+//\r
 //                     if(taxon instanceof Taxon){\r
 //                     logger.info("Taxon: "+taxon.getTitleCache());\r
 //                     }\r

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
index e192bdddf7559254067d54fa546cb4197e216bba..21a5528ecc07b5d1179ef25ef0ad4addecd8ef8f 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
@@ -108,11 +108,6 @@ public class CdmDestinations {
                return CdmDataSource.NewH2EmbeddedInstance("cdm", "sa", "");
        }
 
-       public static ICdmDataSource localH2(String database, String username, String filePath){
-               return CdmDataSource.NewH2EmbeddedInstance(database, "sa", "", filePath);
-       }
-
-
        public static ICdmDataSource localH2EuroMed(){
                return CdmDataSource.NewH2EmbeddedInstance("euroMed", "sa", "");
        }

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/merging/FaunaEuErmsMergeActivator.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/merging/FaunaEuErmsMergeActivator.java
index 62a3f68541fc762d342620871b6efa9eacb3ad51..ec9e8396fe3bec9d8f5bcf27a5b18cd2b9e67e4c 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/merging/FaunaEuErmsMergeActivator.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/merging/FaunaEuErmsMergeActivator.java
@@ -371,9 +371,11 @@ public class FaunaEuErmsMergeActivator {
                        }
 
                        if (taxonErms != null){
-                               List<Synonym> synsTaxonFaunaEu = appCtrInit.getTaxonService().getSynonyms(taxonFaunaEu, null, 1000, 0, null, null);
+                               Pager<Synonym> synsTaxonFaunaEuPager = appCtrInit.getTaxonService().getSynonyms(taxonFaunaEu, null, null, null, null, null);
+                               List<Synonym> synsTaxonFaunaEu = synsTaxonFaunaEuPager.getRecords();
 
-                               List<Synonym> synsTaxonErms = appCtrInit.getTaxonService().getSynonyms(taxonErms, null, 1000, 0, null, null);
+                               Pager<Synonym> synsTaxonErmsPager = appCtrInit.getTaxonService().getSynonyms(taxonErms, null, null, null, null, null);
+                               List<Synonym> synsTaxonErms = synsTaxonErmsPager.getRecords();
 
                                List<Synonym> deleteRel = new ArrayList<>();
                                for (Synonym synFauEu: synsTaxonFaunaEu){