ref #6794 reduce calls to isLower and isHigher in Rank class in app-import

[cdmlib-apps.git] / app-import / src / main / java / eu / etaxonomy / cdm / app / vibrant / IopiActivator.java

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/vibrant/IopiActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/vibrant/IopiActivator.java
index fd815fbe7a937a13974f2681a216b2c75108bec2..364de98c18b0d755195d4af996ae9ed14ea190c6 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/vibrant/IopiActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/vibrant/IopiActivator.java
@@ -6,14 +6,14 @@
 * 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.app.vibrant;\r
 \r
 import java.lang.reflect.Method;\r
 import java.sql.ResultSet;\r
 import java.util.UUID;\r
 \r
-import org.apache.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
 \r
 import eu.etaxonomy.cdm.app.berlinModelImport.BerlinModelSources;\r
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
@@ -26,25 +26,22 @@ import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.EDITOR;\r
 import eu.etaxonomy.cdm.io.common.Source;\r
-import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.ExtensionType;\r
+import eu.etaxonomy.cdm.model.name.INonViralName;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
-import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 \r
-\r
 /**\r
  * TODO add the following to a wiki page:\r
  * HINT: If you are about to import into a mysql data base running under windows and if you wish to dump and restore the resulting data bas under another operation systen\r
  * you must set the mysql system variable lower_case_table_names = 0 in order to create data base with table compatible names.\r
  *\r
- *\r
  * @author a.mueller\r
- *\r
  */\r
 public class IopiActivator {\r
-       private static final Logger logger = Logger.getLogger(IopiActivator.class);\r
+\r
+    private static final Logger logger = LogManager.getLogger();\r
 \r
        //database validation status (create, update, validate ...)\r
        static DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE;\r
@@ -255,7 +252,7 @@ public class IopiActivator {
                String taxonName = "";\r
                String rankStr = "";\r
 \r
-               NonViralName<?>  name = CdmBase.deproxy(taxon.getName(), NonViralName.class);\r
+               INonViralName  name = taxon.getName();\r
                Rank rank = name.getRank();\r
                rankStr = transformFeRanks(rank);\r
 \r
@@ -263,7 +260,7 @@ public class IopiActivator {
                if (rank.equals(Rank.FAMILY())){\r
                        family = name.getGenusOrUninomial();\r
                        taxonName = name.getGenusOrUninomial();\r
-               }else if (rank.isHigher(Rank.GENUS())){\r
+               }else if (rank.isSupraGeneric()){\r
                        taxonName = name.getGenusOrUninomial();\r
                }else if (rank.isGenus()){\r
                        genus = name.getGenusOrUninomial();\r
@@ -295,7 +292,7 @@ public class IopiActivator {
                }else if (rank.equals(Rank.FAMILY())){ return "family";\r
                }else if (rank.equals(Rank.FORM())){ return "forma";\r
                }else if (rank.equals(Rank.GENUS())){ return "genus";\r
-               }else if (rank.equals(Rank.GREX())){ return "grex";\r
+               }else if (rank.equals(Rank.GREX_INFRASPEC())){ return "grex";\r
                }else if (rank.equals(Rank.SPECIESGROUP())){ return "group";\r
                }else if (rank.equals(Rank.ORDER())){ return "Order";\r
 //             }else if (rank.equals(Rank.PROL())){ return "proles";\r