cleanup and move isIgnoreNull from base configurator to BMconfig only

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/globis/GlobisActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/globis/GlobisActivator.java
index 6b930cd16c510c76d361fb404f999df07e898c97..ee85132cdfa1fef3bdcb62bafb7ad28001210079 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/globis/GlobisActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/globis/GlobisActivator.java
@@ -45,7 +45,6 @@ public class GlobisActivator {
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_production_globis();\r
 \r
 \r
-\r
        static final UUID classificationUuid = UUID.fromString("8bd27d84-fd4f-4bfa-bde0-3e6b7311b334");\r
        static final UUID featureTreeUuid = UUID.fromString("33cbf7a8-0c47-4d47-bd11-b7d77a38d0f6");\r
        //static final Object[] featureKeyList = new Integer[]{1,4,5,10,11,12,13,14, 249, 250, 251, 252, 253};\r
@@ -62,16 +61,11 @@ public class GlobisActivator {
 \r
        static final int partitionSize = 3000;\r
 \r
-\r
        //NomenclaturalCode\r
        static final NomenclaturalCode nomenclaturalCode = NomenclaturalCode.ICZN;\r
 \r
-\r
        static final boolean doReadMediaData = false;\r
 \r
-//     //ignore null\r
-       static final boolean ignoreNull = true;\r
-\r
 // ***************** ALL ************************************************//\r
 \r
        //authors\r
@@ -86,7 +80,6 @@ public class GlobisActivator {
        static final boolean doImages = true;\r
        static final boolean doCommonNames = true;\r
 \r
-\r
 //******************** NONE ***************************************//\r
 \r
 //     //authors\r
@@ -101,8 +94,6 @@ public class GlobisActivator {
 //     static final boolean doImages = false;\r
 //     static final boolean doCommonNames = false;\r
 \r
-//\r
-\r
        public void doImport(Source source, ICdmDataSource destination){\r
                System.out.println("Start import from ("+ globisSource.getDatabase() + ") ...");\r
 \r
@@ -111,7 +102,6 @@ public class GlobisActivator {
                config.setClassificationUuid(classificationUuid);\r
                config.setNomenclaturalCode(nomenclaturalCode);\r
 \r
-               config.setIgnoreNull(ignoreNull);\r
                config.setDoReadMediaData(doReadMediaData);\r
                config.setDoReferences(doReferences);\r
                config.setDoAuthors(doAuthors);\r
@@ -130,7 +120,7 @@ public class GlobisActivator {
                config.setEditor(editor);\r
 \r
                // invoke import\r
-               CdmDefaultImport<GlobisImportConfigurator> globisImport = new CdmDefaultImport<GlobisImportConfigurator>();\r
+               CdmDefaultImport<GlobisImportConfigurator> globisImport = new CdmDefaultImport<>();\r
                globisImport.invoke(config);\r
 \r
                if (config.isDoNewUser()){\r
@@ -155,10 +145,6 @@ public class GlobisActivator {
                System.out.println("End import from ("+ source.getDatabase() + ")...");\r
        }\r
 \r
-\r
-       /**\r
-        * @param args\r
-        */\r
        public static void main(String[] args) {\r
 \r
                //make Globis Source\r
@@ -166,8 +152,5 @@ public class GlobisActivator {
                ICdmDataSource destination = CdmDestinations.chooseDestination(args) != null ? CdmDestinations.chooseDestination(args) : cdmDestination;\r
                GlobisActivator me = new GlobisActivator();\r
                me.doImport(source, destination);\r
-\r
        }\r
-\r
-\r
 }\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportConfigurator.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportConfigurator.java
index 65eee8cb9634be1029eacf1e6a21de2ed3e7d787..cc7d5cf1c6fa99420ce905a9630cb6a95d1e6494 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportConfigurator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportConfigurator.java
@@ -29,7 +29,9 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
  * @author a.mueller\r
  * @since 20.03.2008\r
  */\r
-public class BerlinModelImportConfigurator extends DbImportConfiguratorBase<BerlinModelImportState>{\r
+public class BerlinModelImportConfigurator\r
+        extends DbImportConfiguratorBase<BerlinModelImportState>{\r
+\r
     private static final long serialVersionUID = 70300913255425256L;\r
 \r
     private static Logger logger = Logger.getLogger(BerlinModelImportConfigurator.class);\r
@@ -75,6 +77,9 @@ public class BerlinModelImportConfigurator extends DbImportConfiguratorBase<Berl
        //references\r
        private boolean doSourceNumber = false;\r
 \r
+    //nullValues\r
+    private boolean ignoreNull = false;\r
+\r
        //occurrences\r
        private boolean isSplitTdwgCodes = true;\r
 \r
@@ -162,31 +167,17 @@ public class BerlinModelImportConfigurator extends DbImportConfiguratorBase<Berl
                };\r
        }\r
 \r
-\r
-\r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.common.IImportConfigurator#getNewState()\r
-        */\r
        @Override\r
     public BerlinModelImportState getNewState() {\r
                return new BerlinModelImportState(this);\r
        }\r
 \r
-\r
-\r
-       /**\r
-        * @param berlinModelSource\r
-        * @param sourceReference\r
-        * @param destination\r
-        */\r
        protected BerlinModelImportConfigurator(Source berlinModelSource, ICdmDataSource destination) {\r
           super(berlinModelSource, destination, NomenclaturalCode.ICNAFP, defaultTransformer); //default for Berlin Model\r
        }\r
 \r
-\r
        /**\r
         * Import name relationships yes/no?.\r
-        * @return\r
         */\r
        public boolean isDoRelNames() {\r
                return doRelNames;\r
@@ -195,30 +186,16 @@ public class BerlinModelImportConfigurator extends DbImportConfiguratorBase<Berl
                this.doRelNames = doRelNames;\r
        }\r
 \r
-       /**\r
-        * @return the mediaUrl\r
-        */\r
        public URL getMediaUrl() {\r
                return mediaUrl;\r
        }\r
-\r
-       /**\r
-        * @param mediaUrl the mediaUrl to set\r
-        */\r
        public void setMediaUrl(URL mediaUrl) {\r
                this.mediaUrl = mediaUrl;\r
        }\r
 \r
-       /**\r
-        * @return the mediaPath\r
-        */\r
        public File getMediaPath() {\r
                return mediaPath;\r
        }\r
-\r
-       /**\r
-        * @param mediaPath the mediaPath to set\r
-        */\r
        public void setMediaPath(File mediaPath) {\r
                this.mediaPath = mediaPath;\r
        }\r
@@ -251,6 +228,19 @@ public class BerlinModelImportConfigurator extends DbImportConfiguratorBase<Berl
                this.maximumNumberOfNameFacts = maximumNumberOfNameFacts;\r
        }\r
 \r
+    /**\r
+     * If true, no errors occur if objects are not found that should exist. This may\r
+     * be needed e.g. when only subsets of the data are imported.\r
+     * Default value is <cod>false</code>.\r
+     * @return the ignoreNull\r
+     */\r
+    public boolean isIgnoreNull() {\r
+        return ignoreNull;\r
+    }\r
+    public void setIgnoreNull(boolean ignoreNull) {\r
+        this.ignoreNull = ignoreNull;\r
+    }\r
+\r
        /**\r
         * If true, an authorTeam with authorTeamId = 0 is not imported (casus Salvador)\r
         * @return the isIgnore0AuthorTeam\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameStatusImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameStatusImport.java
index 4207092dae98781d42fe01277e7910b566b10605..82bcbfc6c473805af5c0b09622942947cced30ba 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameStatusImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameStatusImport.java
@@ -22,7 +22,6 @@ import org.springframework.stereotype.Component;
 \r
 import eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer;\r
 import eu.etaxonomy.cdm.io.berlinModel.in.validation.BerlinModelNameStatusImportValidator;\r
-import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.io.common.IOValidator;\r
 import eu.etaxonomy.cdm.io.common.ImportHelper;\r
 import eu.etaxonomy.cdm.io.common.ResultSetPartitioner;\r
@@ -210,7 +209,7 @@ public class BerlinModelNameStatusImport extends BerlinModelImportBase {
                return result;\r
        }\r
 \r
-       private boolean makeReference(IImportConfigurator config, NomenclaturalStatus nomStatus,\r
+       private boolean makeReference(BerlinModelImportConfigurator config, NomenclaturalStatus nomStatus,\r
                        int nameId, ResultSet rs, @SuppressWarnings("rawtypes") ResultSetPartitioner partitioner)\r
                        throws SQLException{\r
 \r

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsImportActivator.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsImportActivator.java
index 41ce0e68fa4e8ed90e1042e91633332c9edc532e..ff6ebfb9e6bd3f904de3afff11058bb8a74413cf 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsImportActivator.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsImportActivator.java
@@ -41,7 +41,6 @@ public class ErmsImportActivator {
 
        static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql_erms();
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql_erms2();
-//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_faunaEu_mysql();
 
 
        static final boolean includeExport2PESI = false;
@@ -57,8 +56,6 @@ public class ErmsImportActivator {
        //check - import
        static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK;
        static final int partitionSize = 5000;
-       //ignore null
-       static final boolean ignoreNull = true;
 
 // ***************** ALL ************************************************//
 
@@ -97,7 +94,6 @@ public class ErmsImportActivator {
 
                config.setClassificationUuid(classificationUuid);
 
-               config.setIgnoreNull(ignoreNull);
                config.setDoReferences(doReferences);
 
                config.setDoTaxa(doTaxa);