ref #9359, ref #10072 adapt app-import to log4j2 and cleanup

[cdmlib-apps.git] / app-import / src / main / java / eu / etaxonomy / cdm / io / berlinModel / in / validation / BerlinModelFactsImportValidator.java

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelFactsImportValidator.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelFactsImportValidator.java
index 2728025c384749610efa37252f86782e0a5415c9..05662a2eb821c0596a24a83d8d3268b8a7102c3e 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelFactsImportValidator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelFactsImportValidator.java
@@ -1,19 +1,19 @@
 /**\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.berlinModel.in.validation;\r
 \r
 import java.sql.ResultSet;\r
 import java.sql.SQLException;\r
 \r
 import org.apache.commons.lang.StringUtils;\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.io.berlinModel.in.BerlinModelImportConfigurator;\r
 import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportState;\r
@@ -25,7 +25,8 @@ import eu.etaxonomy.cdm.io.common.Source;
  * @since 17.02.2010\r
  */\r
 public class BerlinModelFactsImportValidator implements IOValidator<BerlinModelImportState> {\r
-       private static final Logger logger = Logger.getLogger(BerlinModelFactsImportValidator.class);\r
+\r
+    private static final Logger logger = LogManager.getLogger();\r
 \r
        @Override\r
        public boolean validate(BerlinModelImportState state) {\r
@@ -34,8 +35,8 @@ public class BerlinModelFactsImportValidator implements IOValidator<BerlinModelI
                result &= checkFactsForSynonyms(state);\r
                return result;\r
        }\r
-       \r
-       \r
+\r
+\r
        private boolean checkDesignationRefsExist(BerlinModelImportState state){\r
                try {\r
                        boolean result = true;\r
@@ -45,18 +46,18 @@ public class BerlinModelFactsImportValidator implements IOValidator<BerlinModelI
                                        " FROM Fact " +\r
                                        " WHERE (NOT (PTDesignationRefFk IS NULL) ) OR " +\r
                       " (NOT (PTDesignationRefDetailFk IS NULL) )";\r
-                       \r
+\r
                        if (StringUtils.isNotBlank(config.getFactFilter())){\r
-                               strQuery += String.format(" AND (%s) ", config.getFactFilter()) ; \r
+                               strQuery += String.format(" AND (%s) ", config.getFactFilter()) ;\r
                        }\r
-                       \r
+\r
                        ResultSet rs = source.getResultSet(strQuery);\r
                        rs.next();\r
                        int count = rs.getInt("n");\r
                        if (count > 0){\r
                                System.out.println("========================================================");\r
                                logger.warn("There are "+count+" Facts with not empty designation references. Designation references are not imported.");\r
-                               \r
+\r
                                System.out.println("========================================================");\r
                        }\r
                        return result;\r
@@ -66,7 +67,7 @@ public class BerlinModelFactsImportValidator implements IOValidator<BerlinModelI
                }\r
 \r
        }\r
-       \r
+\r
        private boolean checkFactsForSynonyms(BerlinModelImportState state){\r
                try {\r
                        boolean result = true;\r
@@ -78,13 +79,13 @@ public class BerlinModelFactsImportValidator implements IOValidator<BerlinModelI
                                                " INNER JOIN PTaxon pt ON f.PTNameFk = pt.PTNameFk AND f.PTRefFk = pt.PTRefFk" +\r
                                                " INNER JOIN Name n ON pt.PTNameFk = n.NameId " +\r
                                " INNER JOIN Status s ON pt.StatusFk = s.StatusId " +\r
-                               " LEFT OUTER JOIN Reference r ON pt.PTRefFk = r.RefId " + \r
+                               " LEFT OUTER JOIN Reference r ON pt.PTRefFk = r.RefId " +\r
                                        " WHERE (pt.StatusFk NOT IN ( 1, 5))  ";\r
-                       \r
+\r
                        if (StringUtils.isNotBlank(config.getFactFilter())){\r
-                               strQuery += String.format(" AND (%s) ", config.getFactFilter()) ; \r
+                               strQuery += String.format(" AND (%s) ", config.getFactFilter()) ;\r
                        }\r
-                       \r
+\r
                        ResultSet resulSet = source.getResultSet(strQuery);\r
                        boolean firstRow = true;\r
                        while (resulSet.next()){\r
@@ -101,13 +102,13 @@ public class BerlinModelFactsImportValidator implements IOValidator<BerlinModelI
                                String fullNameCache = resulSet.getString("FullNameCache");\r
                                String ptRefFk = resulSet.getString("PTRefFk");\r
                                String ptRef = resulSet.getString("RefCache");\r
-                               \r
-                               System.out.println("FactId: " + factId + "\n  Fact: " + fact + \r
+\r
+                               System.out.println("FactId: " + factId + "\n  Fact: " + fact +\r
                                                "\n  FactCategory: "  + factCategory + "\n  FactCategoryId: " + factCategoryId +\r
-                                               "\n  Status: " + status + \r
+                                               "\n  Status: " + status +\r
                                                "\n  FullNameCache: " + fullNameCache +  "\n  ptRefFk: " + ptRefFk +\r
                                                "\n  sec: " + ptRef );\r
-                               \r
+\r
                                result = firstRow = false;\r
                        }\r
                        return result;\r