You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by gr...@apache.org on 2017/03/22 00:33:27 UTC

[tika] branch logging-refactored updated: TIKA-2245 Logging unification fixup (to be squashed)

This is an automated email from the ASF dual-hosted git repository.

grossws pushed a commit to branch logging-refactored
in repository https://gitbox.apache.org/repos/asf/tika.git

The following commit(s) were added to refs/heads/logging-refactored by this push:
       new  f23e694   TIKA-2245 Logging unification fixup (to be squashed)
f23e694 is described below

commit f23e6943f39f00648f269b31678cda1dad4fc6b9
Author: Konstantin Gribov <gr...@gmail.com>
AuthorDate: Wed Mar 22 03:31:47 2017 +0300

    TIKA-2245 Logging unification fixup (to be squashed)
    
    log4j -> slf4j migration for classes changed since Jan.
---
 .../main/java/org/apache/tika/eval/XMLErrorLogUpdater.java  | 12 +++++-------
 .../src/main/java/org/apache/tika/eval/db/JDBCUtil.java     | 13 +++++++------
 .../src/main/java/org/apache/tika/eval/io/DBWriter.java     |  9 +++++----
 .../main/java/org/apache/tika/eval/io/ExtractReader.java    |  4 ++--
 .../src/main/java/org/apache/tika/eval/io/XMLLogReader.java | 10 +++++-----
 .../src/main/java/org/apache/tika/eval/reports/Report.java  | 11 +++++------
 .../java/org/apache/tika/eval/reports/ResultsReporter.java  |  5 ++---
 .../apache/tika/eval/tokens/CommonTokenCountManager.java    |  8 ++++----
 8 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/tika-eval/src/main/java/org/apache/tika/eval/XMLErrorLogUpdater.java b/tika-eval/src/main/java/org/apache/tika/eval/XMLErrorLogUpdater.java
index 42bc4c3..bbde74d 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/XMLErrorLogUpdater.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/XMLErrorLogUpdater.java
@@ -49,13 +49,11 @@ import org.slf4j.LoggerFactory;
  * the "comparisons" table.  It should not be run in a multithreaded environment.
  */
 public class XMLErrorLogUpdater {
-
-    protected static Logger LOGGER = LoggerFactory.getLogger(ResultsReporter.class);
+    protected static Logger LOG = LoggerFactory.getLogger(ResultsReporter.class);
 
     private Statement statement;
 
     public static void main(String[] args) throws Exception {
-
         XMLErrorLogUpdater writer = new XMLErrorLogUpdater();
         Path xmlLogFileA = Paths.get(args[0]);
         Path xmlLogFileB = Paths.get(args[1]);
@@ -174,9 +172,9 @@ public class XMLErrorLogUpdater {
             int updated = statement.executeUpdate(sql);
             if (updated == 0) {
                 //TODO: log
-                LOGGER.warn("made no updates in xmlerrorlogupdater!");
+                LOG.warn("made no updates in xmlerrorlogupdater!");
             } else if (updated > 1) {
-                LOGGER.warn("made too many updates");
+                LOG.warn("made too many updates");
             }
         }
 
@@ -195,9 +193,9 @@ public class XMLErrorLogUpdater {
             rs.close();
 
             if (resultCount == 0) {
-                LOGGER.warn("Should have found a container for: "+resourceId);
+                LOG.warn("Should have found a container for: {}", resourceId);
             } else if (resultCount > 1) {
-                LOGGER.error("Records ids should be unique:"+resourceId);
+                LOG.error("Records ids should be unique: {}", resourceId);
             }
 /*
             if (containerId < 0) {
diff --git a/tika-eval/src/main/java/org/apache/tika/eval/db/JDBCUtil.java b/tika-eval/src/main/java/org/apache/tika/eval/db/JDBCUtil.java
index f8a97f3..e6b1938 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/db/JDBCUtil.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/db/JDBCUtil.java
@@ -37,9 +37,11 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JDBCUtil {
+    public static Logger LOG = LoggerFactory.getLogger(JDBCUtil.class);
 
     public enum CREATE_TABLE {
         DROP_IF_EXISTS,
@@ -47,7 +49,6 @@ public class JDBCUtil {
         THROW_EX_IF_EXISTS,
     }
 
-    public static Logger logger = Logger.getLogger(JDBCUtil.class);
     private final String connectionString;
     private String driverClass;
 
@@ -159,7 +160,7 @@ public class JDBCUtil {
             }
             return insertStatement.executeUpdate();
         } catch (SQLException e) {
-            logger.warn("couldn't insert data for this row: " + e.getMessage());
+            LOG.warn("couldn't insert data for this row: {}", e.getMessage());
             e.printStackTrace();
             return -1;
         }
@@ -176,7 +177,7 @@ public class JDBCUtil {
                 case Types.VARCHAR:
                     if (value != null && value.length() > colInfo.getPrecision()) {
                         value = value.substring(0, colInfo.getPrecision());
-                        logger.warn("truncated varchar value in " + colInfo.getName() + " : " + value);
+                        LOG.warn("truncated varchar value in {} : {}", colInfo.getName(), value);
                     }
                     st.setString(dbColOffset, value);
                     break;
@@ -203,11 +204,11 @@ public class JDBCUtil {
             }
         } catch (NumberFormatException e) {
             if (!"".equals(value)) {
-                logger.warn("number format exception: " + colInfo.getName() + " : " + value);
+                LOG.warn("number format exception: {} : {}", colInfo.getName(), value);
             }
             st.setNull(dbColOffset, colInfo.getType());
         } catch (SQLException e) {
-            logger.warn("sqlexception: " + colInfo + " : " + value);
+            LOG.warn("sqlexception: {} : {}", colInfo, value);
             st.setNull(dbColOffset, colInfo.getType());
         }
     }
diff --git a/tika-eval/src/main/java/org/apache/tika/eval/io/DBWriter.java b/tika-eval/src/main/java/org/apache/tika/eval/io/DBWriter.java
index b1f3b36..ff15989 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/io/DBWriter.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/io/DBWriter.java
@@ -26,13 +26,14 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.log4j.Logger;
 import org.apache.tika.eval.db.ColInfo;
 import org.apache.tika.eval.db.Cols;
 import org.apache.tika.eval.db.JDBCUtil;
 import org.apache.tika.eval.db.MimeBuffer;
 import org.apache.tika.eval.db.TableInfo;
 import org.apache.tika.io.IOExceptionWithCause;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This is still in its early stages.  The idea is to
@@ -45,9 +46,9 @@ import org.apache.tika.io.IOExceptionWithCause;
  * DBWriter creates its own PreparedStatements at initialization.
  */
 public class DBWriter implements IDBWriter {
-    private static final AtomicInteger WRITER_ID = new AtomicInteger();
+    private static Logger LOG = LoggerFactory.getLogger(DBWriter.class);
 
-    private static Logger logger = Logger.getLogger(DBWriter.class);
+    private static final AtomicInteger WRITER_ID = new AtomicInteger();
     private final AtomicLong insertedRows = new AtomicLong();
     private final Long commitEveryX = 1000L;
 
@@ -116,7 +117,7 @@ public class DBWriter implements IDBWriter {
             dbUtil.insert(p, table, data);
             long rows = insertedRows.incrementAndGet();
             if (rows % commitEveryX == 0) {
-                logger.debug("writer ("+myId+") is committing after "+ rows + " rows");
+                LOG.debug("writer ({}) is committing after {} rows", myId, rows);
                 conn.commit();
             }
         } catch (SQLException e) {
diff --git a/tika-eval/src/main/java/org/apache/tika/eval/io/ExtractReader.java b/tika-eval/src/main/java/org/apache/tika/eval/io/ExtractReader.java
index fd35363..e164113 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/io/ExtractReader.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/io/ExtractReader.java
@@ -52,7 +52,7 @@ public class ExtractReader {
         FIRST_ONLY, //take only the metadata list for the "container" document
         CONCATENATE_CONTENT_INTO_FIRST // concatenate all of the content into the first
     }
-    private final static Logger LOGGER = LoggerFactory.getLogger(ExtractReader.class);
+    private final static Logger LOG = LoggerFactory.getLogger(ExtractReader.class);
     TikaConfig tikaConfig = TikaConfig.getDefaultConfig();
 
     private final ALTER_METADATA_LIST alterMetadataList;
@@ -125,7 +125,7 @@ public class ExtractReader {
                 } else if (fileSuffixes.compression.equals("zip")) {
                     is = new ZCompressorInputStream(is);
                 } else {
-                    LOGGER.warn("Can't yet process compression of type: " + fileSuffixes.compression);
+                    LOG.warn("Can't yet process compression of type: {}", fileSuffixes.compression);
                     return metadataList;
                 }
             }
diff --git a/tika-eval/src/main/java/org/apache/tika/eval/io/XMLLogReader.java b/tika-eval/src/main/java/org/apache/tika/eval/io/XMLLogReader.java
index bb47b77..01afcf9 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/io/XMLLogReader.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/io/XMLLogReader.java
@@ -26,14 +26,14 @@ import java.io.InputStream;
 import java.sql.SQLException;
 
 import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 import org.apache.tika.io.IOUtils;
 import org.apache.tika.parser.ParseContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class XMLLogReader {
-
-    private final static Logger logger = Logger.getLogger(XMLLogReader.class);
+    private final static Logger LOG = LoggerFactory.getLogger(XMLLogReader.class);
     //class that wraps a logger's xml output
     //into a single xml parseable input stream.
 
@@ -59,10 +59,10 @@ public class XMLLogReader {
                             handler.handleMsg(level, reader.getElementText());
                         } catch (IOException e) {
                             e.printStackTrace();
-                            logger.warn("Error parsing: "+reader.getElementText());
+                            LOG.warn("Error parsing: {}", reader.getElementText());
                         } catch (SQLException e) {
                             e.printStackTrace();
-                            logger.warn("SQLException: "+e.getMessage());
+                            LOG.warn("SQLException: {}", e.getMessage());
                         }
                     }
                     break;
diff --git a/tika-eval/src/main/java/org/apache/tika/eval/reports/Report.java b/tika-eval/src/main/java/org/apache/tika/eval/reports/Report.java
index b7e2c09..3683a71 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/reports/Report.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/reports/Report.java
@@ -31,7 +31,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
@@ -39,13 +38,14 @@ import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class represents a single report.
  */
 public class Report {
-
-    static final Logger logger = Logger.getLogger(Report.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Report.class);
 
     final String NULL_VALUE = "";//TODO: make this configurable!!!
     Map<String, XSLXCellFormatter> cellFormatters = new HashMap<>();
@@ -60,7 +60,7 @@ public class Report {
     String reportName;
 
     public void writeReport(Connection c, Path reportsRoot) throws SQLException, IOException {
-        logger.info("Writing report: "+reportName + " to "+reportFilename);
+        LOG.info("Writing report: {} to {}", reportName, reportFilename);
         dumpXLSX(c, reportsRoot);
     }
 
@@ -189,8 +189,7 @@ public class Report {
                 } else {
                     cell.setCellValue(rs.getString(colIndex));
                 }
-                logger.warn("Couldn't find type for: " + meta.getColumnType(colIndex) +
-                        ". Defaulting to String");
+                LOG.warn("Couldn't find type for: {}. Defaulting to String", meta.getColumnType(colIndex));
         }
     }
 
diff --git a/tika-eval/src/main/java/org/apache/tika/eval/reports/ResultsReporter.java b/tika-eval/src/main/java/org/apache/tika/eval/reports/ResultsReporter.java
index 072ba53..fff2871 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/reports/ResultsReporter.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/reports/ResultsReporter.java
@@ -53,8 +53,7 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 public class ResultsReporter {
-
-    protected static Logger LOGGER = LoggerFactory.getLogger(ResultsReporter.class);
+    protected static Logger LOG = LoggerFactory.getLogger(ResultsReporter.class);
 
     private static Options OPTIONS;
 
@@ -257,7 +256,7 @@ public class ResultsReporter {
 
                 Path reportsRootDirectory = Paths.get(commandLine.getOptionValue("rd", "reports"));
                 if (Files.isDirectory(reportsRootDirectory)) {
-                    LOGGER.warn("'Reports' directory exists.  Will overwrite existing reports.");
+                    LOG.warn("'Reports' directory exists.  Will overwrite existing reports.");
                 }
 
                 resultsReporter.execute(c, reportsRootDirectory);
diff --git a/tika-eval/src/main/java/org/apache/tika/eval/tokens/CommonTokenCountManager.java b/tika-eval/src/main/java/org/apache/tika/eval/tokens/CommonTokenCountManager.java
index e1bdfbd..f839ff7 100644
--- a/tika-eval/src/main/java/org/apache/tika/eval/tokens/CommonTokenCountManager.java
+++ b/tika-eval/src/main/java/org/apache/tika/eval/tokens/CommonTokenCountManager.java
@@ -36,9 +36,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class CommonTokenCountManager {
+    private final static Logger LOG = LoggerFactory.getLogger(CommonTokenCountManager.class);
 
     private final static Charset COMMON_TOKENS_CHARSET = StandardCharsets.UTF_8;
-    private final static Logger LOGGER = LoggerFactory.getLogger(CommonTokenCountManager.class);
 
     private final Path commonTokensDir;
 
@@ -56,7 +56,7 @@ public class CommonTokenCountManager {
         //set to prevent npes later
         Set<String> set = commonTokenMap.get(defaultLangCode);
         if (set == null) {
-            LOGGER.warn("No common tokens for default language: '"+defaultLangCode+"'");
+            LOG.warn("No common tokens for default language: '"+defaultLangCode+"'");
             commonTokenMap.put(defaultLangCode, new HashSet<String>());
         }
     }
@@ -128,7 +128,7 @@ public class CommonTokenCountManager {
 
 
             if (is == null) {
-                LOGGER.warn("Couldn't find common tokens file for: '" + langCode + "': " +
+                LOG.warn("Couldn't find common tokens file for: '" + langCode + "': " +
                         p.toAbsolutePath());
                 alreadyTriedToLoad.add(langCode);
                 return;
@@ -161,7 +161,7 @@ public class CommonTokenCountManager {
                 }
             }
         } catch (IOException e) {
-            LOGGER.warn("IOException trying to read: '" + langCode + "'");
+            LOG.warn("IOException trying to read: '" + langCode + "'");
         } finally {
             IOUtils.closeQuietly(is);
         }

-- 
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].