SQOOP-2306: Sqoop2: Use LinkConfiguration in Executor rather then LinkConfig

(Jarek Jarcec Cecho via Abraham Elmahrek)

connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutor.java

@@ -20,6 +20,7 @@
 import org.apache.log4j.Logger;
 import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.connector.jdbc.configuration.LinkConfig;
+import org.apache.sqoop.connector.jdbc.configuration.LinkConfiguration;
 import org.apache.sqoop.error.code.GenericJdbcConnectorError;
 import org.apache.sqoop.schema.Schema;
 import org.apache.sqoop.schema.type.Column;
@@ -58,7 +59,7 @@ public class GenericJdbcExecutor {
   /**
    * User configured link with credentials and such
    */
-  private LinkConfig linkConfig;
+  private LinkConfiguration link;
 
   /**
    * Internal connection object (we'll hold to it)
@@ -70,23 +71,24 @@ public class GenericJdbcExecutor {
    */
   private PreparedStatement preparedStatement;
 
-  public GenericJdbcExecutor(LinkConfig linkConfig) {
+  public GenericJdbcExecutor(LinkConfiguration linkConfig) {
-    assert linkConfig != null;
-    assert linkConfig.connectionString != null;
-
     // Persist link configuration for future use
-    this.linkConfig = linkConfig;
+    this.link = linkConfig;
+
+    assert link != null;
+    assert link.linkConfig != null;
+    assert link.linkConfig.connectionString != null;
 
     // Load/register the JDBC driver to JVM
-    Class driverClass = ClassUtils.loadClass(linkConfig.jdbcDriver);
+    Class driverClass = ClassUtils.loadClass(link.linkConfig.jdbcDriver);
     if(driverClass == null) {
-      throw new SqoopException(GenericJdbcConnectorError.GENERIC_JDBC_CONNECTOR_0000, linkConfig.jdbcDriver);
+      throw new SqoopException(GenericJdbcConnectorError.GENERIC_JDBC_CONNECTOR_0000, link.linkConfig.jdbcDriver);
     }
 
     // Properties that we will use for the connection
     Properties properties = new Properties();
-    if(linkConfig.jdbcProperties != null) {
+    if(link.linkConfig.jdbcProperties != null) {
-      properties.putAll(linkConfig.jdbcProperties);
+      properties.putAll(link.linkConfig.jdbcProperties);
     }
 
     // Propagate username and password to the properties
@@ -96,16 +98,16 @@ public GenericJdbcExecutor(LinkConfig linkConfig) {
     // * getConnection(url, properties)
     // As we have to use properties, we need to use the later
     // method and hence we have to persist the credentials there.
-    if(linkConfig.username != null) {
+    if(link.linkConfig.username != null) {
-      properties.put(JDBC_PROPERTY_USERNAME, linkConfig.username);
+      properties.put(JDBC_PROPERTY_USERNAME, link.linkConfig.username);
     }
-    if(linkConfig.password != null) {
+    if(link.linkConfig.password != null) {
-      properties.put(JDBC_PROPERTY_PASSWORD, linkConfig.password);
+      properties.put(JDBC_PROPERTY_PASSWORD, link.linkConfig.password);
     }
 
     // Finally create the connection
     try {
-      connection = DriverManager.getConnection(linkConfig.connectionString, properties);
+      connection = DriverManager.getConnection(link.linkConfig.connectionString, properties);
     } catch (SQLException e) {
       logSQLException(e);
       throw new SqoopException(GenericJdbcConnectorError.GENERIC_JDBC_CONNECTOR_0001, e);

connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExtractor.java

@@ -42,7 +42,7 @@ public class GenericJdbcExtractor extends Extractor<LinkConfiguration, FromJobCo
  private long rowsRead = 0;
   @Override
   public void extract(ExtractorContext context, LinkConfiguration linkConfig, FromJobConfiguration fromJobConfig, GenericJdbcPartition partition) {
-    GenericJdbcExecutor executor = new GenericJdbcExecutor(linkConfig.linkConfig);
+    GenericJdbcExecutor executor = new GenericJdbcExecutor(linkConfig);
 
     String query = context.getString(GenericJdbcConnectorConstants.CONNECTOR_JDBC_FROM_DATA_SQL);
     String conditions = partition.getConditions();

connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java

@@ -47,7 +47,7 @@ public class GenericJdbcFromInitializer extends Initializer<LinkConfiguration, F
 
   @Override
   public void initialize(InitializerContext context, LinkConfiguration linkConfig, FromJobConfiguration fromJobConfig) {
-    executor = new GenericJdbcExecutor(linkConfig.linkConfig);
+    executor = new GenericJdbcExecutor(linkConfig);
 
     try {
       configurePartitionProperties(context.getContext(), linkConfig, fromJobConfig);
@@ -68,7 +68,7 @@ public Set<String> getJars(InitializerContext context, LinkConfiguration linkCon
 
   @Override
   public Schema getSchema(InitializerContext context, LinkConfiguration linkConfig, FromJobConfiguration fromJobConfig) {
-    executor = new GenericJdbcExecutor(linkConfig.linkConfig);
+    executor = new GenericJdbcExecutor(linkConfig);
 
     String schemaName = fromJobConfig.fromJobConfig.tableName;
     if(schemaName == null) {

connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcLoader.java

@@ -32,7 +32,7 @@ public class GenericJdbcLoader extends Loader<LinkConfiguration, ToJobConfigurat
 
   @Override
   public void load(LoaderContext context, LinkConfiguration linkConfig, ToJobConfiguration toJobConfig) throws Exception{
-    GenericJdbcExecutor executor = new GenericJdbcExecutor(linkConfig.linkConfig);
+    GenericJdbcExecutor executor = new GenericJdbcExecutor(linkConfig);
     executor.setAutoCommit(false);
     String sql = context.getString(GenericJdbcConnectorConstants.CONNECTOR_JDBC_TO_DATA_SQL);
     executor.beginBatch(sql);

connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToDestroyer.java

@@ -42,7 +42,7 @@ public void destroy(DestroyerContext context, LinkConfiguration linkConfig, ToJo
   }
 
   private void moveDataToDestinationTable(LinkConfiguration linkConfig, boolean success, String stageTableName, String tableName) {
-    GenericJdbcExecutor executor = new GenericJdbcExecutor(linkConfig.linkConfig);
+    GenericJdbcExecutor executor = new GenericJdbcExecutor(linkConfig);
     try {
       if(success) {
         LOG.info("Job completed, transferring data from stage fromTable to " +

connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToInitializer.java

@@ -44,7 +44,7 @@ public class GenericJdbcToInitializer extends Initializer<LinkConfiguration, ToJ
 
   @Override
   public void initialize(InitializerContext context, LinkConfiguration linkConfig, ToJobConfiguration toJobConfig) {
-    executor = new GenericJdbcExecutor(linkConfig.linkConfig);
+    executor = new GenericJdbcExecutor(linkConfig);
     try {
       configureTableProperties(context.getContext(), linkConfig, toJobConfig);
     } finally {
@@ -61,7 +61,7 @@ public Set<String> getJars(InitializerContext context, LinkConfiguration linkCon
 
   @Override
   public Schema getSchema(InitializerContext context, LinkConfiguration linkConfig, ToJobConfiguration toJobConfig) {
-    executor = new GenericJdbcExecutor(linkConfig.linkConfig);
+    executor = new GenericJdbcExecutor(linkConfig);
 
     String schemaName = toJobConfig.toJobConfig.tableName;
 

connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutorTest.java

@@ -19,6 +19,7 @@
 
 import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.connector.jdbc.configuration.LinkConfig;
+import org.apache.sqoop.connector.jdbc.configuration.LinkConfiguration;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -35,7 +36,7 @@ public class GenericJdbcExecutorTest {
   public GenericJdbcExecutorTest() {
     table = getClass().getSimpleName().toUpperCase();
     emptyTable = table + "_EMPTY";
-    executor = new GenericJdbcExecutor(GenericJdbcTestConstants.LINK_CONFIG);
+    executor = new GenericJdbcExecutor(GenericJdbcTestConstants.LINK_CONFIGURATION);
   }
 
   @BeforeMethod(alwaysRun = true)
@@ -62,11 +63,11 @@ public void setUp() {
 
   @Test(expectedExceptions = SqoopException.class)
   public void testUnknownDriver() {
-    LinkConfig linkConfig = new LinkConfig();
+    LinkConfiguration link = new LinkConfiguration();
-    linkConfig.jdbcDriver = "net.jarcec.driver.MyAwesomeDatabase";
+    link.linkConfig.jdbcDriver = "net.jarcec.driver.MyAwesomeDatabase";
-    linkConfig.connectionString = "jdbc:awesome:";
+    link.linkConfig.connectionString = "jdbc:awesome:";
 
-    new GenericJdbcExecutor(linkConfig);
+    new GenericJdbcExecutor(link);
   }
 
   @Test

connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/GenericJdbcTestConstants.java

@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.connector.jdbc;
 
-import org.apache.sqoop.connector.jdbc.configuration.LinkConfig;
+import org.apache.sqoop.connector.jdbc.configuration.LinkConfiguration;
 
 public class GenericJdbcTestConstants {
 
@@ -34,9 +34,9 @@ public class GenericJdbcTestConstants {
   /**
    * Test link configuration
    */
-  public static final LinkConfig LINK_CONFIG = new LinkConfig();
+  public static final LinkConfiguration LINK_CONFIGURATION = new LinkConfiguration();
   static {
-    LINK_CONFIG.jdbcDriver = DRIVER;
+    LINK_CONFIGURATION.linkConfig.jdbcDriver = DRIVER;
-    LINK_CONFIG.connectionString = URL;
+    LINK_CONFIGURATION.linkConfig.connectionString = URL;
   }
 }

connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestExtractor.java

@@ -59,7 +59,7 @@ public TestExtractor() {
 
   @BeforeMethod(alwaysRun = true)
   public void setUp() {
-    executor = new GenericJdbcExecutor(GenericJdbcTestConstants.LINK_CONFIG);
+    executor = new GenericJdbcExecutor(GenericJdbcTestConstants.LINK_CONFIGURATION);
 
     if (!executor.existTable(tableName)) {
       executor.executeUpdate("CREATE TABLE "

connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestFromInitializer.java

@@ -61,7 +61,7 @@ public TestFromInitializer() {
 
   @BeforeMethod(alwaysRun = true)
   public void setUp() {
-    executor = new GenericJdbcExecutor(GenericJdbcTestConstants.LINK_CONFIG);
+    executor = new GenericJdbcExecutor(GenericJdbcTestConstants.LINK_CONFIGURATION);
 
     String fullTableName = executor.delimitIdentifier(schemaName) + "." + executor.delimitIdentifier(tableName);
     if (!executor.existTable(tableName)) {

connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestLoader.java

@@ -69,7 +69,7 @@ public TestLoader(int numberOfRows) {
 
   @BeforeMethod(alwaysRun = true)
   public void setUp() {
-    executor = new GenericJdbcExecutor(GenericJdbcTestConstants.LINK_CONFIG);
+    executor = new GenericJdbcExecutor(GenericJdbcTestConstants.LINK_CONFIGURATION);
 
     if (!executor.existTable(tableName)) {
       executor.executeUpdate("CREATE TABLE "

connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java

@@ -59,7 +59,7 @@ public TestToInitializer() {
 
   @BeforeMethod(alwaysRun = true)
   public void setUp() {
-    executor = new GenericJdbcExecutor(GenericJdbcTestConstants.LINK_CONFIG);
+    executor = new GenericJdbcExecutor(GenericJdbcTestConstants.LINK_CONFIGURATION);
 
     String fullTableName = executor.delimitIdentifier(schemaName) + "." + executor.delimitIdentifier(tableName);
     if (!executor.existTable(tableName)) {