Replace Exec.getLogger with LoggerFactory.getLogger

Author: Dai MIKURUBE

embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/AbstractJdbcOutputPlugin.java

@@ -25,6 +25,7 @@
 import org.embulk.spi.util.RetryExecutor;
 import org.embulk.spi.util.RetryExecutor.RetryGiveupException;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.joda.time.DateTimeZone;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -66,7 +67,7 @@
 public abstract class AbstractJdbcOutputPlugin
         implements OutputPlugin
 {
-    protected final Logger logger = Exec.getLogger(getClass());
+    protected static final Logger logger = LoggerFactory.getLogger(AbstractJdbcOutputPlugin.class);
 
     public interface PluginTask
             extends Task
@@ -1273,7 +1274,7 @@ class RetryableSQLExecution implements Retryable<Void> {
         private final String errorMessage;
         private final IdempotentSqlRunnable op;
 
-        private final Logger logger = Exec.getLogger(this.getClass());
+        private final Logger logger = LoggerFactory.getLogger(RetryableSQLExecution.class);
 
         public RetryableSQLExecution(IdempotentSqlRunnable op, String errorMessage) {
             this.errorMessage = errorMessage;

embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/JdbcOutputConnection.java

@@ -12,15 +12,14 @@
 import java.util.Locale;
 
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Optional;
 
-import org.embulk.spi.Exec;
-
 public class JdbcOutputConnection
         implements AutoCloseable
 {
-    protected final Logger logger = Exec.getLogger(JdbcOutputConnection.class);
+    protected static final Logger logger = LoggerFactory.getLogger(JdbcOutputConnection.class);
     protected final Connection connection;
     protected final String schemaName;
     protected final DatabaseMetaData databaseMetaData;

embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/JdbcUtils.java

@@ -5,11 +5,11 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.slf4j.Logger;
-import org.embulk.spi.Exec;
+import org.slf4j.LoggerFactory;
 
 public class JdbcUtils
 {
-    public final Logger logger = Exec.getLogger(JdbcUtils.class.getName());
+    public static final Logger logger = LoggerFactory.getLogger(JdbcUtils.class);
 
     private static String[] SEARCH_STRING_SPECIAL_CHARS = new String[] { "_", "%" };
 
@@ -150,4 +150,3 @@ public int executeUpdateWithSqlLogging(Statement stmt, String sql) throws SQLExc
     //    // TODO any substitute implementations?
     //}
 }
-

embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/StandardBatchInsert.java

@@ -10,13 +10,13 @@
 import java.sql.Time;
 import com.google.common.base.Optional;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.embulk.spi.time.Timestamp;
-import org.embulk.spi.Exec;
 
 public class StandardBatchInsert
         implements BatchInsert
 {
-    private final Logger logger = Exec.getLogger(StandardBatchInsert.class);
+    private static final Logger logger = LoggerFactory.getLogger(StandardBatchInsert.class);
 
     private final JdbcOutputConnector connector;
     private final Optional<MergeConfig> mergeConfig;

embulk-output-mysql/src/main/java/org/embulk/output/MySQLTimeZoneComparison.java

@@ -1,8 +1,7 @@
 package org.embulk.output;
 
-import org.embulk.spi.Exec;
 import org.slf4j.Logger;
-
+import org.slf4j.LoggerFactory;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -19,7 +18,7 @@ public class MySQLTimeZoneComparison {
 
     private Connection connection;
 
-    private final Logger logger = Exec.getLogger(getClass());
+    private static final Logger logger = LoggerFactory.getLogger(MySQLTimeZoneComparison.class);
 
     public MySQLTimeZoneComparison(Connection connection)
     {

embulk-output-oracle/src/main/java/org/embulk/output/oracle/oci/OCIManager.java

@@ -4,8 +4,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.embulk.spi.Exec;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class OCIManager
 {
@@ -14,8 +14,7 @@ private static class OCIWrapperAndCounter {
         public int counter;
     }
 
-
-    private final Logger logger = Exec.getLogger(getClass());
+    private static final Logger logger = LoggerFactory.getLogger(OCIManager.class);
 
     private Map<Object, OCIWrapperAndCounter> ociAndCounters = new HashMap<Object, OCIWrapperAndCounter>();
 

embulk-output-oracle/src/main/java/org/embulk/output/oracle/oci/OCIWrapper.java

@@ -13,16 +13,15 @@
 import jnr.ffi.provider.jffi.ByteBufferMemoryIO;
 
 import org.embulk.output.jdbc.AbstractJdbcOutputPlugin;
-import org.embulk.spi.Exec;
 import org.slf4j.Logger;
-
+import org.slf4j.LoggerFactory;
 
 public class OCIWrapper
 {
     private static OCI oci;
     private static BulkOCI bulkOci;
 
-    private final Logger logger = Exec.getLogger(getClass());
+    private static final Logger logger = LoggerFactory.getLogger(OCIWrapper.class);
 
     private final Charset systemCharset;
     private Pointer envHandle;

embulk-output-postgresql/src/main/java/org/embulk/output/postgresql/PostgreSQLCopyBatchInsert.java

@@ -8,14 +8,14 @@
 import org.embulk.output.jdbc.JdbcOutputConnector;
 import org.embulk.output.jdbc.JdbcSchema;
 import org.embulk.output.jdbc.TableIdentifier;
-import org.embulk.spi.Exec;
 import org.postgresql.copy.CopyManager;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PostgreSQLCopyBatchInsert
         extends AbstractPostgreSQLCopyBatchInsert
 {
-    private final Logger logger = Exec.getLogger(PostgreSQLCopyBatchInsert.class);
+    private static final Logger logger = LoggerFactory.getLogger(PostgreSQLCopyBatchInsert.class);
     private final JdbcOutputConnector connector;
 
     private PostgreSQLOutputConnection connection = null;

embulk-output-redshift/src/main/java/org/embulk/output/RedshiftOutputPlugin.java

@@ -5,10 +5,10 @@
 import java.sql.SQLException;
 
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 import com.amazonaws.auth.AWSCredentialsProvider;
-import org.embulk.spi.Exec;
 import org.embulk.util.aws.credentials.AwsCredentials;
 import org.embulk.util.aws.credentials.AwsCredentialsTaskWithPrefix;
 import org.embulk.config.Config;
@@ -26,7 +26,7 @@
 public class RedshiftOutputPlugin
         extends AbstractJdbcOutputPlugin
 {
-    private final Logger logger = Exec.getLogger(RedshiftOutputPlugin.class);
+    private static final Logger logger = LoggerFactory.getLogger(RedshiftOutputPlugin.class);
 
     public interface RedshiftPluginTask extends AwsCredentialsTaskWithPrefix, PluginTask
     {

embulk-output-redshift/src/main/java/org/embulk/output/redshift/RedshiftCopyBatchInsert.java

@@ -21,8 +21,8 @@
 import org.embulk.output.jdbc.JdbcSchema;
 import org.embulk.output.jdbc.TableIdentifier;
 import org.embulk.output.postgresql.AbstractPostgreSQLCopyBatchInsert;
-import org.embulk.spi.Exec;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.auth.AWSCredentialsProvider;
@@ -44,7 +44,7 @@
 public class RedshiftCopyBatchInsert
         extends AbstractPostgreSQLCopyBatchInsert
 {
-    private final Logger logger = Exec.getLogger(RedshiftCopyBatchInsert.class);
+    private static final Logger logger = LoggerFactory.getLogger(RedshiftCopyBatchInsert.class);
     private final JdbcOutputConnector connector;
     private final String s3BucketName;
     private final String s3KeyPrefix;