From 5d17ab2ab5241bc5e6f9c71353357a9f42776b51 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 23 Dec 2019 10:00:07 +0100 Subject: [PATCH] cleanup and move isIgnoreNull from base configurator to BMconfig only --- .../cdm/app/globis/GlobisActivator.java | 19 +------- .../in/BerlinModelImportConfigurator.java | 48 ++++++++----------- .../in/BerlinModelNameStatusImport.java | 3 +- .../cdm/app/pesi/ErmsImportActivator.java | 4 -- 4 files changed, 21 insertions(+), 53 deletions(-) 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 6b930cd1..ee85132c 100644 --- 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(); - static final UUID classificationUuid = UUID.fromString("8bd27d84-fd4f-4bfa-bde0-3e6b7311b334"); static final UUID featureTreeUuid = UUID.fromString("33cbf7a8-0c47-4d47-bd11-b7d77a38d0f6"); //static final Object[] featureKeyList = new Integer[]{1,4,5,10,11,12,13,14, 249, 250, 251, 252, 253}; @@ -62,16 +61,11 @@ public class GlobisActivator { static final int partitionSize = 3000; - //NomenclaturalCode static final NomenclaturalCode nomenclaturalCode = NomenclaturalCode.ICZN; - static final boolean doReadMediaData = false; -// //ignore null - static final boolean ignoreNull = true; - // ***************** ALL ************************************************// //authors @@ -86,7 +80,6 @@ public class GlobisActivator { static final boolean doImages = true; static final boolean doCommonNames = true; - //******************** NONE ***************************************// // //authors @@ -101,8 +94,6 @@ public class GlobisActivator { // static final boolean doImages = false; // static final boolean doCommonNames = false; -// - public void doImport(Source source, ICdmDataSource destination){ System.out.println("Start import from ("+ globisSource.getDatabase() + ") ..."); @@ -111,7 +102,6 @@ public class GlobisActivator { config.setClassificationUuid(classificationUuid); config.setNomenclaturalCode(nomenclaturalCode); - config.setIgnoreNull(ignoreNull); config.setDoReadMediaData(doReadMediaData); config.setDoReferences(doReferences); config.setDoAuthors(doAuthors); @@ -130,7 +120,7 @@ public class GlobisActivator { config.setEditor(editor); // invoke import - CdmDefaultImport globisImport = new CdmDefaultImport(); + CdmDefaultImport globisImport = new CdmDefaultImport<>(); globisImport.invoke(config); if (config.isDoNewUser()){ @@ -155,10 +145,6 @@ public class GlobisActivator { System.out.println("End import from ("+ source.getDatabase() + ")..."); } - - /** - * @param args - */ public static void main(String[] args) { //make Globis Source @@ -166,8 +152,5 @@ public class GlobisActivator { ICdmDataSource destination = CdmDestinations.chooseDestination(args) != null ? CdmDestinations.chooseDestination(args) : cdmDestination; GlobisActivator me = new GlobisActivator(); me.doImport(source, destination); - } - - } 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 65eee8cb..cc7d5cf1 100644 --- 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 * @since 20.03.2008 */ -public class BerlinModelImportConfigurator extends DbImportConfiguratorBase{ +public class BerlinModelImportConfigurator + extends DbImportConfiguratorBase{ + private static final long serialVersionUID = 70300913255425256L; private static Logger logger = Logger.getLogger(BerlinModelImportConfigurator.class); @@ -75,6 +77,9 @@ public class BerlinModelImportConfigurator extends DbImportConfiguratorBasefalse. + * @return the ignoreNull + */ + public boolean isIgnoreNull() { + return ignoreNull; + } + public void setIgnoreNull(boolean ignoreNull) { + this.ignoreNull = ignoreNull; + } + /** * If true, an authorTeam with authorTeamId = 0 is not imported (casus Salvador) * @return the isIgnore0AuthorTeam 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 4207092d..82bcbfc6 100644 --- 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; import eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer; import eu.etaxonomy.cdm.io.berlinModel.in.validation.BerlinModelNameStatusImportValidator; -import eu.etaxonomy.cdm.io.common.IImportConfigurator; import eu.etaxonomy.cdm.io.common.IOValidator; import eu.etaxonomy.cdm.io.common.ImportHelper; import eu.etaxonomy.cdm.io.common.ResultSetPartitioner; @@ -210,7 +209,7 @@ public class BerlinModelNameStatusImport extends BerlinModelImportBase { return result; } - private boolean makeReference(IImportConfigurator config, NomenclaturalStatus nomStatus, + private boolean makeReference(BerlinModelImportConfigurator config, NomenclaturalStatus nomStatus, int nameId, ResultSet rs, @SuppressWarnings("rawtypes") ResultSetPartitioner partitioner) throws SQLException{ 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 41ce0e68..ff6ebfb9 100644 --- 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); -- 2.34.1