From c378ac77ee9e7028a997f386130c3162322eeb50 Mon Sep 17 00:00:00 2001 From: hito4t Date: Wed, 1 May 2019 15:19:20 +0900 Subject: [PATCH] Refactoring --- .../java/org/embulk/output/db2/DB2OutputConnection.java | 3 +-- .../java/org/embulk/output/db2/DB2OutputConnector.java | 8 ++++---- .../java/org/embulk/output/jdbc/JdbcOutputConnection.java | 6 ++++++ .../org/embulk/output/mysql/MySQLOutputConnection.java | 3 +-- .../org/embulk/output/mysql/MySQLOutputConnector.java | 8 ++++---- .../org/embulk/output/oracle/OracleOutputConnection.java | 3 +-- .../org/embulk/output/oracle/OracleOutputConnector.java | 8 ++++---- .../output/postgresql/PostgreSQLOutputConnection.java | 3 +-- .../output/postgresql/PostgreSQLOutputConnector.java | 8 ++++---- .../embulk/output/redshift/RedshiftOutputConnection.java | 3 +-- .../embulk/output/redshift/RedshiftOutputConnector.java | 8 ++++---- .../output/sqlserver/SQLServerOutputConnection.java | 3 +-- .../embulk/output/sqlserver/SQLServerOutputConnector.java | 8 ++++---- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/embulk-output-db2/src/main/java/org/embulk/output/db2/DB2OutputConnection.java b/embulk-output-db2/src/main/java/org/embulk/output/db2/DB2OutputConnection.java index 88e16c44..4bb60cf1 100644 --- a/embulk-output-db2/src/main/java/org/embulk/output/db2/DB2OutputConnection.java +++ b/embulk-output-db2/src/main/java/org/embulk/output/db2/DB2OutputConnection.java @@ -12,11 +12,10 @@ public class DB2OutputConnection extends JdbcOutputConnection { - public DB2OutputConnection(Connection connection, String schemaName, boolean autoCommit) + public DB2OutputConnection(Connection connection, String schemaName) throws SQLException { super(connection, schemaName); - connection.setAutoCommit(autoCommit); } @Override diff --git a/embulk-output-db2/src/main/java/org/embulk/output/db2/DB2OutputConnector.java b/embulk-output-db2/src/main/java/org/embulk/output/db2/DB2OutputConnector.java index 8a6920db..49a2630d 100644 --- a/embulk-output-db2/src/main/java/org/embulk/output/db2/DB2OutputConnector.java +++ b/embulk-output-db2/src/main/java/org/embulk/output/db2/DB2OutputConnector.java @@ -6,10 +6,10 @@ import java.util.Properties; import org.embulk.output.jdbc.JdbcOutputConnection; -import org.embulk.output.jdbc.JdbcOutputConnector; +import org.embulk.output.jdbc.AbstractJdbcOutputConnector; public class DB2OutputConnector - implements JdbcOutputConnector + extends AbstractJdbcOutputConnector { private final String url; private final Properties properties; @@ -28,7 +28,7 @@ public DB2OutputConnector(String url, Properties properties, String schemaName) } @Override - public JdbcOutputConnection connect(boolean autoCommit) throws SQLException + protected JdbcOutputConnection connect() throws SQLException { Connection c = DriverManager.getConnection(url, properties); if (c == null) { @@ -37,7 +37,7 @@ public JdbcOutputConnection connect(boolean autoCommit) throws SQLException } try { - DB2OutputConnection con = new DB2OutputConnection(c, schemaName, autoCommit); + DB2OutputConnection con = new DB2OutputConnection(c, schemaName); c = null; return con; diff --git a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/JdbcOutputConnection.java b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/JdbcOutputConnection.java index 999834e4..bc0176de 100644 --- a/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/JdbcOutputConnection.java +++ b/embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/JdbcOutputConnection.java @@ -38,6 +38,12 @@ public JdbcOutputConnection(Connection connection, String schemaName) } } + public void initialize(boolean autoCommit) + throws SQLException + { + connection.setAutoCommit(autoCommit); + } + @Override public void close() throws SQLException { diff --git a/embulk-output-mysql/src/main/java/org/embulk/output/mysql/MySQLOutputConnection.java b/embulk-output-mysql/src/main/java/org/embulk/output/mysql/MySQLOutputConnection.java index ad2c1091..62824763 100644 --- a/embulk-output-mysql/src/main/java/org/embulk/output/mysql/MySQLOutputConnection.java +++ b/embulk-output-mysql/src/main/java/org/embulk/output/mysql/MySQLOutputConnection.java @@ -14,11 +14,10 @@ public class MySQLOutputConnection extends JdbcOutputConnection { - public MySQLOutputConnection(Connection connection, boolean autoCommit) + public MySQLOutputConnection(Connection connection) throws SQLException { super(connection, null); - connection.setAutoCommit(autoCommit); } @Override diff --git a/embulk-output-mysql/src/main/java/org/embulk/output/mysql/MySQLOutputConnector.java b/embulk-output-mysql/src/main/java/org/embulk/output/mysql/MySQLOutputConnector.java index 3fecfbc0..8dbeff7e 100644 --- a/embulk-output-mysql/src/main/java/org/embulk/output/mysql/MySQLOutputConnector.java +++ b/embulk-output-mysql/src/main/java/org/embulk/output/mysql/MySQLOutputConnector.java @@ -6,10 +6,10 @@ import java.sql.SQLException; import org.embulk.output.jdbc.JdbcOutputConnection; -import org.embulk.output.jdbc.JdbcOutputConnector; +import org.embulk.output.jdbc.AbstractJdbcOutputConnector; public class MySQLOutputConnector - implements JdbcOutputConnector + extends AbstractJdbcOutputConnector { private final String url; private final Properties properties; @@ -21,11 +21,11 @@ public MySQLOutputConnector(String url, Properties properties) } @Override - public JdbcOutputConnection connect(boolean autoCommit) throws SQLException + protected JdbcOutputConnection connect() throws SQLException { Connection c = DriverManager.getConnection(url, properties); try { - MySQLOutputConnection con = new MySQLOutputConnection(c, autoCommit); + MySQLOutputConnection con = new MySQLOutputConnection(c); c = null; return con; } finally { diff --git a/embulk-output-oracle/src/main/java/org/embulk/output/oracle/OracleOutputConnection.java b/embulk-output-oracle/src/main/java/org/embulk/output/oracle/OracleOutputConnection.java index 02c2d019..ddab762d 100644 --- a/embulk-output-oracle/src/main/java/org/embulk/output/oracle/OracleOutputConnection.java +++ b/embulk-output-oracle/src/main/java/org/embulk/output/oracle/OracleOutputConnection.java @@ -35,11 +35,10 @@ public class OracleOutputConnection private OracleCharset charset; private OracleCharset nationalCharset; - public OracleOutputConnection(Connection connection, String schemaName, boolean autoCommit, boolean direct) + public OracleOutputConnection(Connection connection, String schemaName, boolean direct) throws SQLException { super(connection, schemaName == null ? getSchema(connection) : schemaName); - connection.setAutoCommit(autoCommit); this.direct = direct; } diff --git a/embulk-output-oracle/src/main/java/org/embulk/output/oracle/OracleOutputConnector.java b/embulk-output-oracle/src/main/java/org/embulk/output/oracle/OracleOutputConnector.java index 05db6997..f8cd973a 100644 --- a/embulk-output-oracle/src/main/java/org/embulk/output/oracle/OracleOutputConnector.java +++ b/embulk-output-oracle/src/main/java/org/embulk/output/oracle/OracleOutputConnector.java @@ -6,10 +6,10 @@ import java.util.Properties; import org.embulk.output.jdbc.JdbcOutputConnection; -import org.embulk.output.jdbc.JdbcOutputConnector; +import org.embulk.output.jdbc.AbstractJdbcOutputConnector; public class OracleOutputConnector - implements JdbcOutputConnector + extends AbstractJdbcOutputConnector { private final String url; private final Properties properties; @@ -30,7 +30,7 @@ public OracleOutputConnector(String url, Properties properties, String schemaNam } @Override - public JdbcOutputConnection connect(boolean autoCommit) throws SQLException + protected JdbcOutputConnection connect() throws SQLException { Connection c = DriverManager.getConnection(url, properties); if (c == null) { @@ -39,7 +39,7 @@ public JdbcOutputConnection connect(boolean autoCommit) throws SQLException } try { - OracleOutputConnection con = new OracleOutputConnection(c, schemaName, autoCommit, direct); + OracleOutputConnection con = new OracleOutputConnection(c, schemaName, direct); c = null; return con; diff --git a/embulk-output-postgresql/src/main/java/org/embulk/output/postgresql/PostgreSQLOutputConnection.java b/embulk-output-postgresql/src/main/java/org/embulk/output/postgresql/PostgreSQLOutputConnection.java index 78d56dff..317e026a 100644 --- a/embulk-output-postgresql/src/main/java/org/embulk/output/postgresql/PostgreSQLOutputConnection.java +++ b/embulk-output-postgresql/src/main/java/org/embulk/output/postgresql/PostgreSQLOutputConnection.java @@ -18,11 +18,10 @@ public class PostgreSQLOutputConnection { private static final int MAX_NUMERIC_PRECISION = 1000; - public PostgreSQLOutputConnection(Connection connection, String schemaName, boolean autoCommit) + public PostgreSQLOutputConnection(Connection connection, String schemaName) throws SQLException { super(connection, schemaName); - connection.setAutoCommit(autoCommit); } public String buildCopySql(TableIdentifier toTable, JdbcSchema toTableSchema) diff --git a/embulk-output-postgresql/src/main/java/org/embulk/output/postgresql/PostgreSQLOutputConnector.java b/embulk-output-postgresql/src/main/java/org/embulk/output/postgresql/PostgreSQLOutputConnector.java index e38a03f7..3c221422 100644 --- a/embulk-output-postgresql/src/main/java/org/embulk/output/postgresql/PostgreSQLOutputConnector.java +++ b/embulk-output-postgresql/src/main/java/org/embulk/output/postgresql/PostgreSQLOutputConnector.java @@ -6,10 +6,10 @@ import java.sql.SQLException; import org.embulk.output.jdbc.JdbcOutputConnection; -import org.embulk.output.jdbc.JdbcOutputConnector; +import org.embulk.output.jdbc.AbstractJdbcOutputConnector; public class PostgreSQLOutputConnector - implements JdbcOutputConnector + extends AbstractJdbcOutputConnector { private final String url; private final Properties properties; @@ -23,11 +23,11 @@ public PostgreSQLOutputConnector(String url, Properties properties, String schem } @Override - public JdbcOutputConnection connect(boolean autoCommit) throws SQLException + protected JdbcOutputConnection connect() throws SQLException { Connection c = DriverManager.getConnection(url, properties); try { - PostgreSQLOutputConnection con = new PostgreSQLOutputConnection(c, schemaName, autoCommit); + PostgreSQLOutputConnection con = new PostgreSQLOutputConnection(c, schemaName); c = null; return con; } finally { diff --git a/embulk-output-redshift/src/main/java/org/embulk/output/redshift/RedshiftOutputConnection.java b/embulk-output-redshift/src/main/java/org/embulk/output/redshift/RedshiftOutputConnection.java index fb08c079..2f388df1 100644 --- a/embulk-output-redshift/src/main/java/org/embulk/output/redshift/RedshiftOutputConnection.java +++ b/embulk-output-redshift/src/main/java/org/embulk/output/redshift/RedshiftOutputConnection.java @@ -19,11 +19,10 @@ public class RedshiftOutputConnection { private final Logger logger = Exec.getLogger(RedshiftOutputConnection.class); - public RedshiftOutputConnection(Connection connection, String schemaName, boolean autoCommit) + public RedshiftOutputConnection(Connection connection, String schemaName) throws SQLException { super(connection, schemaName); - connection.setAutoCommit(autoCommit); } // ALTER TABLE cannot change the schema of a table diff --git a/embulk-output-redshift/src/main/java/org/embulk/output/redshift/RedshiftOutputConnector.java b/embulk-output-redshift/src/main/java/org/embulk/output/redshift/RedshiftOutputConnector.java index acf22969..833f7495 100644 --- a/embulk-output-redshift/src/main/java/org/embulk/output/redshift/RedshiftOutputConnector.java +++ b/embulk-output-redshift/src/main/java/org/embulk/output/redshift/RedshiftOutputConnector.java @@ -4,11 +4,11 @@ import java.sql.Driver; import java.sql.Connection; import java.sql.SQLException; -import org.embulk.output.jdbc.JdbcOutputConnector; +import org.embulk.output.jdbc.AbstractJdbcOutputConnector; import org.embulk.output.jdbc.JdbcOutputConnection; public class RedshiftOutputConnector - implements JdbcOutputConnector + extends AbstractJdbcOutputConnector { private static final Driver driver = new org.postgresql.Driver(); @@ -24,11 +24,11 @@ public RedshiftOutputConnector(String url, Properties properties, String schemaN } @Override - public JdbcOutputConnection connect(boolean autoCommit) throws SQLException + protected JdbcOutputConnection connect() throws SQLException { Connection c = driver.connect(url, properties); try { - RedshiftOutputConnection con = new RedshiftOutputConnection(c, schemaName, autoCommit); + RedshiftOutputConnection con = new RedshiftOutputConnection(c, schemaName); c = null; return con; } finally { diff --git a/embulk-output-sqlserver/src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnection.java b/embulk-output-sqlserver/src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnection.java index 3555f180..33533db1 100644 --- a/embulk-output-sqlserver/src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnection.java +++ b/embulk-output-sqlserver/src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnection.java @@ -14,11 +14,10 @@ public class SQLServerOutputConnection extends JdbcOutputConnection { - public SQLServerOutputConnection(Connection connection, String schemaName, boolean autoCommit) + public SQLServerOutputConnection(Connection connection, String schemaName) throws SQLException { super(connection, schemaName); - connection.setAutoCommit(autoCommit); } @Override diff --git a/embulk-output-sqlserver/src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnector.java b/embulk-output-sqlserver/src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnector.java index 8f78e71d..34886086 100644 --- a/embulk-output-sqlserver/src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnector.java +++ b/embulk-output-sqlserver/src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnector.java @@ -8,13 +8,13 @@ import java.util.Properties; import org.embulk.output.jdbc.JdbcOutputConnection; -import org.embulk.output.jdbc.JdbcOutputConnector; +import org.embulk.output.jdbc.AbstractJdbcOutputConnector; import org.embulk.spi.Exec; import org.slf4j.Logger; public class SQLServerOutputConnector - implements JdbcOutputConnector + extends AbstractJdbcOutputConnector { private final Logger logger = Exec.getLogger(getClass()); @@ -30,7 +30,7 @@ public SQLServerOutputConnector(String url, Properties properties, String schema } @Override - public JdbcOutputConnection connect(boolean autoCommit) throws SQLException + protected JdbcOutputConnection connect() throws SQLException { Connection c = DriverManager.getConnection(url, properties); if (c == null) { @@ -56,7 +56,7 @@ public JdbcOutputConnection connect(boolean autoCommit) throws SQLException } try { - SQLServerOutputConnection con = new SQLServerOutputConnection(c, schemaName, autoCommit); + SQLServerOutputConnection con = new SQLServerOutputConnection(c, schemaName); c = null; return con;