http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfig.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfig.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfig.java index 8b23144..12ceb21 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfig.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfig.java @@ -18,7 +18,7 @@ package org.apache.sqoop.connector.jdbc.configuration; import org.apache.sqoop.connector.jdbc.GenericJdbcConnectorConstants; -import org.apache.sqoop.model.FormClass; +import org.apache.sqoop.model.ConfigClass; import org.apache.sqoop.model.Input; import org.apache.sqoop.model.Validator; import org.apache.sqoop.validation.Status; @@ -28,7 +28,7 @@ import org.apache.sqoop.validation.validators.NullOrContains; /** * */ -@FormClass( validators = {@Validator(FromJobConfig.FormValidator.class)}) +@ConfigClass( validators = {@Validator(FromJobConfig.ConfigValidator.class)}) public class FromJobConfig { @Input(size = 50) public String schemaName; @@ -51,16 +51,16 @@ public class FromJobConfig { @Input(size = 50) public String boundaryQuery; - public static class FormValidator extends AbstractValidator<FromJobConfig> { + public static class ConfigValidator extends AbstractValidator<FromJobConfig> { @Override - public void validate(FromJobConfig form) { - if(form.tableName == null && form.sql == null) { + public void validate(FromJobConfig config) { + if(config.tableName == null && config.sql == null) { addMessage(Status.UNACCEPTABLE, "Either table name or SQL must be specified"); } - if(form.tableName != null && form.sql != null) { + if(config.tableName != null && config.sql != null) { addMessage(Status.UNACCEPTABLE, "Both table name and SQL cannot be specified"); } - if(form.schemaName != null && form.sql != null) { + if(config.schemaName != null && config.sql != null) { addMessage(Status.UNACCEPTABLE, "Both schema name and SQL cannot be specified"); } }
http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfiguration.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfiguration.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfiguration.java index b036421..39e8edd 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfiguration.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfiguration.java @@ -18,14 +18,14 @@ package org.apache.sqoop.connector.jdbc.configuration; import org.apache.sqoop.model.ConfigurationClass; -import org.apache.sqoop.model.Form; +import org.apache.sqoop.model.Config; /** * */ @ConfigurationClass public class FromJobConfiguration { - @Form public FromJobConfig fromJobConfig; + @Config public FromJobConfig fromJobConfig; public FromJobConfiguration() { fromJobConfig = new FromJobConfig(); http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfig.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfig.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfig.java index 7b76eeb..be86855 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfig.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfig.java @@ -17,7 +17,7 @@ */ package org.apache.sqoop.connector.jdbc.configuration; -import org.apache.sqoop.model.FormClass; +import org.apache.sqoop.model.ConfigClass; import org.apache.sqoop.model.Input; import org.apache.sqoop.model.Validator; import org.apache.sqoop.validation.Status; @@ -33,7 +33,7 @@ import java.util.Map; /** * */ -@FormClass(validators = {@Validator(LinkConfig.FormValidator.class)}) +@ConfigClass(validators = {@Validator(LinkConfig.ConfigValidator.class)}) public class LinkConfig { @Input(size = 128, validators = {@Validator(NotEmpty.class), @Validator(ClassAvailable.class)} ) public String jdbcDriver; @@ -50,7 +50,7 @@ public class LinkConfig { @Input public Map<String, String> jdbcProperties; - public static class FormValidator extends AbstractValidator<LinkConfig> { + public static class ConfigValidator extends AbstractValidator<LinkConfig> { @Override public void validate(LinkConfig linkConfig) { // See if we can connect to the database http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfiguration.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfiguration.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfiguration.java index 7d614f7..ed55bff 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfiguration.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfiguration.java @@ -18,7 +18,7 @@ package org.apache.sqoop.connector.jdbc.configuration; import org.apache.sqoop.model.ConfigurationClass; -import org.apache.sqoop.model.Form; +import org.apache.sqoop.model.Config; /** * @@ -26,9 +26,9 @@ import org.apache.sqoop.model.Form; @ConfigurationClass public class LinkConfiguration { - @Form public LinkConfig link; + @Config public LinkConfig linkConfig; public LinkConfiguration() { - link = new LinkConfig(); + linkConfig = new LinkConfig(); } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfig.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfig.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfig.java index a42a6ec..2428601 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfig.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfig.java @@ -17,7 +17,7 @@ */ package org.apache.sqoop.connector.jdbc.configuration; -import org.apache.sqoop.model.FormClass; +import org.apache.sqoop.model.ConfigClass; import org.apache.sqoop.model.Input; import org.apache.sqoop.model.Validator; import org.apache.sqoop.validation.Status; @@ -26,7 +26,7 @@ import org.apache.sqoop.validation.validators.AbstractValidator; /** * */ -@FormClass(validators = {@Validator(ToJobConfig.FormValidator.class)}) +@ConfigClass(validators = {@Validator(ToJobConfig.ConfigValidator.class)}) public class ToJobConfig { @Input(size = 50) public String schemaName; @Input(size = 2000) public String tableName; @@ -35,19 +35,19 @@ public class ToJobConfig { @Input(size = 2000) public String stageTableName; @Input public Boolean clearStageTable; - public static class FormValidator extends AbstractValidator<ToJobConfig> { + public static class ConfigValidator extends AbstractValidator<ToJobConfig> { @Override - public void validate(ToJobConfig form) { - if(form.tableName == null && form.sql == null) { + public void validate(ToJobConfig config) { + if(config.tableName == null && config.sql == null) { addMessage(Status.UNACCEPTABLE, "Either table name or SQL must be specified"); } - if(form.tableName != null && form.sql != null) { + if(config.tableName != null && config.sql != null) { addMessage(Status.UNACCEPTABLE, "Both table name and SQL cannot be specified"); } - if(form.tableName == null && form.stageTableName != null) { + if(config.tableName == null && config.stageTableName != null) { addMessage(Status.UNACCEPTABLE, "Stage table name cannot be specified without specifying table name"); } - if(form.stageTableName == null && form.clearStageTable != null) { + if(config.stageTableName == null && config.clearStageTable != null) { addMessage(Status.UNACCEPTABLE, "Clear stage table cannot be specified without specifying name of the stage table."); } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfiguration.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfiguration.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfiguration.java index ad68681..fd5d54b 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfiguration.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfiguration.java @@ -18,14 +18,14 @@ package org.apache.sqoop.connector.jdbc.configuration; import org.apache.sqoop.model.ConfigurationClass; -import org.apache.sqoop.model.Form; +import org.apache.sqoop.model.Config; /** * */ @ConfigurationClass public class ToJobConfiguration { - @Form public ToJobConfig toJobConfig; + @Config public ToJobConfig toJobConfig; public ToJobConfiguration() { toJobConfig = new ToJobConfig(); http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-generic-jdbc/src/main/resources/generic-jdbc-connector-config.properties ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/main/resources/generic-jdbc-connector-config.properties b/connector/connector-generic-jdbc/src/main/resources/generic-jdbc-connector-config.properties index 921ac28..c535e9b 100644 --- a/connector/connector-generic-jdbc/src/main/resources/generic-jdbc-connector-config.properties +++ b/connector/connector-generic-jdbc/src/main/resources/generic-jdbc-connector-config.properties @@ -18,33 +18,33 @@ ############################ # Link Config # -link.label = Link configuration -link.help = You must supply the information requested in order to \ +linkConfig.label = Link configuration +linkConfig.help = You must supply the information requested in order to \ create a connection object. # jdbc driver -link.jdbcDriver.label = JDBC Driver Class -link.jdbcDriver.help = Enter the fully qualified class name of the JDBC \ +linkConfig.jdbcDriver.label = JDBC Driver Class +linkConfig.jdbcDriver.help = Enter the fully qualified class name of the JDBC \ driver that will be used for establishing this connection. # connect string -link.connectionString.label = JDBC Connection String -link.connectionString.help = Enter the value of JDBC connection string to be \ +linkConfig.connectionString.label = JDBC Connection String +linkConfig.connectionString.help = Enter the value of JDBC connection string to be \ used by this connector for creating connections. # username string -link.username.label = Username -link.username.help = Enter the username to be used for connecting to the \ +linkConfig.username.label = Username +linkConfig.username.help = Enter the username to be used for connecting to the \ database. # password string -link.password.label = Password -link.password.help = Enter the password to be used for connecting to the \ +linkConfig.password.label = Password +linkConfig.password.help = Enter the password to be used for connecting to the \ database. # jdbc properties -link.jdbcProperties.label = JDBC Connection Properties -link.jdbcProperties.help = Enter any JDBC properties that should be \ +linkConfig.jdbcProperties.label = JDBC Connection Properties +linkConfig.jdbcProperties.help = Enter any JDBC properties that should be \ supplied during the creation of connection. # From Job Config http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutorTest.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutorTest.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutorTest.java index 1022370..61846b7 100644 --- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutorTest.java +++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutorTest.java @@ -60,7 +60,6 @@ public class GenericJdbcExecutorTest { } @Test - @SuppressWarnings("unchecked") public void testDeleteTableData() throws Exception { executor.deleteTableData(table); assertEquals("Table " + table + " is expected to be empty.", @@ -68,7 +67,6 @@ public class GenericJdbcExecutorTest { } @Test - @SuppressWarnings("unchecked") public void testMigrateData() throws Exception { assertEquals("Table " + emptyTable + " is expected to be empty.", 0, executor.getTableRowCount(emptyTable)); @@ -86,7 +84,6 @@ public class GenericJdbcExecutorTest { } @Test - @SuppressWarnings("unchecked") public void testGetTableRowCount() throws Exception { assertEquals("Table " + table + " is expected to be empty.", NUMBER_OF_ROWS, executor.getTableRowCount(table)); http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestExtractor.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestExtractor.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestExtractor.java index fbdf9c6..d1e6805 100644 --- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestExtractor.java +++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestExtractor.java @@ -74,10 +74,10 @@ public class TestExtractor { public void testQuery() throws Exception { MutableContext context = new MutableMapContext(); - LinkConfiguration connectionConfig = new LinkConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); - connectionConfig.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connectionConfig.link.connectionString = GenericJdbcTestConstants.URL; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; FromJobConfiguration jobConfig = new FromJobConfiguration(); @@ -92,25 +92,25 @@ public class TestExtractor { partition = new GenericJdbcPartition(); partition.setConditions("-50.0 <= DCOL AND DCOL < -16.6666666666666665"); - extractor.extract(extractorContext, connectionConfig, jobConfig, partition); + extractor.extract(extractorContext, linkConfig, jobConfig, partition); partition = new GenericJdbcPartition(); partition.setConditions("-16.6666666666666665 <= DCOL AND DCOL < 16.666666666666667"); - extractor.extract(extractorContext, connectionConfig, jobConfig, partition); + extractor.extract(extractorContext, linkConfig, jobConfig, partition); partition = new GenericJdbcPartition(); partition.setConditions("16.666666666666667 <= DCOL AND DCOL <= 50.0"); - extractor.extract(extractorContext, connectionConfig, jobConfig, partition); + extractor.extract(extractorContext, linkConfig, jobConfig, partition); } @Test public void testSubquery() throws Exception { MutableContext context = new MutableMapContext(); - LinkConfiguration connectionConfig = new LinkConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); - connectionConfig.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connectionConfig.link.connectionString = GenericJdbcTestConstants.URL; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; FromJobConfiguration jobConfig = new FromJobConfiguration(); @@ -127,15 +127,15 @@ public class TestExtractor { partition = new GenericJdbcPartition(); partition.setConditions("-50 <= ICOL AND ICOL < -16"); - extractor.extract(extractorContext, connectionConfig, jobConfig, partition); + extractor.extract(extractorContext, linkConfig, jobConfig, partition); partition = new GenericJdbcPartition(); partition.setConditions("-16 <= ICOL AND ICOL < 17"); - extractor.extract(extractorContext, connectionConfig, jobConfig, partition); + extractor.extract(extractorContext, linkConfig, jobConfig, partition); partition = new GenericJdbcPartition(); partition.setConditions("17 <= ICOL AND ICOL < 50"); - extractor.extract(extractorContext, connectionConfig, jobConfig, partition); + extractor.extract(extractorContext, linkConfig, jobConfig, partition); } public class DummyWriter extends DataWriter { http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestFromInitializer.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestFromInitializer.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestFromInitializer.java index 54e6acf..345fe9b 100644 --- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestFromInitializer.java +++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestFromInitializer.java @@ -116,19 +116,19 @@ public class TestFromInitializer { @Test @SuppressWarnings("unchecked") public void testTableName() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.fromJobConfig.tableName = schemalessTableName; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.fromJobConfig.tableName = schemalessTableName; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcFromInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "SELECT * FROM " + executor.delimitIdentifier(schemalessTableName) @@ -143,20 +143,20 @@ public class TestFromInitializer { @Test @SuppressWarnings("unchecked") public void testTableNameWithTableColumns() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.fromJobConfig.tableName = schemalessTableName; - jobConf.fromJobConfig.columns = tableColumns; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.fromJobConfig.tableName = schemalessTableName; + jobConfig.fromJobConfig.columns = tableColumns; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcFromInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "SELECT ICOL,VCOL FROM " + executor.delimitIdentifier(schemalessTableName) @@ -171,20 +171,20 @@ public class TestFromInitializer { @Test @SuppressWarnings("unchecked") public void testTableSql() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.fromJobConfig.sql = schemalessTableSql; - jobConf.fromJobConfig.partitionColumn = "DCOL"; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.fromJobConfig.sql = schemalessTableSql; + jobConfig.fromJobConfig.partitionColumn = "DCOL"; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcFromInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "SELECT * FROM " + executor.delimitIdentifier(schemalessTableName) @@ -199,21 +199,21 @@ public class TestFromInitializer { @Test @SuppressWarnings("unchecked") public void testTableSqlWithTableColumns() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.fromJobConfig.sql = schemalessTableSql; - jobConf.fromJobConfig.columns = tableColumns; - jobConf.fromJobConfig.partitionColumn = "DCOL"; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.fromJobConfig.sql = schemalessTableSql; + jobConfig.fromJobConfig.columns = tableColumns; + jobConfig.fromJobConfig.partitionColumn = "DCOL"; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcFromInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "SELECT SQOOP_SUBQUERY_ALIAS.ICOL,SQOOP_SUBQUERY_ALIAS.VCOL FROM " @@ -229,22 +229,22 @@ public class TestFromInitializer { @Test @SuppressWarnings("unchecked") public void testTableNameWithSchema() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); String fullTableName = executor.delimitIdentifier(schemaName) + "." + executor.delimitIdentifier(tableName); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.fromJobConfig.schemaName = schemaName; - jobConf.fromJobConfig.tableName = tableName; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.fromJobConfig.schemaName = schemaName; + jobConfig.fromJobConfig.tableName = tableName; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcFromInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "SELECT * FROM " + fullTableName @@ -259,23 +259,23 @@ public class TestFromInitializer { @Test @SuppressWarnings("unchecked") public void testTableNameWithTableColumnsWithSchema() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); String fullTableName = executor.delimitIdentifier(schemaName) + "." + executor.delimitIdentifier(tableName); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.fromJobConfig.schemaName = schemaName; - jobConf.fromJobConfig.tableName = tableName; - jobConf.fromJobConfig.columns = tableColumns; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.fromJobConfig.schemaName = schemaName; + jobConfig.fromJobConfig.tableName = tableName; + jobConfig.fromJobConfig.columns = tableColumns; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcFromInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "SELECT ICOL,VCOL FROM " + fullTableName @@ -290,23 +290,23 @@ public class TestFromInitializer { @Test @SuppressWarnings("unchecked") public void testTableSqlWithSchema() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); String fullTableName = executor.delimitIdentifier(schemaName) + "." + executor.delimitIdentifier(tableName); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.fromJobConfig.schemaName = schemaName; - jobConf.fromJobConfig.sql = tableSql; - jobConf.fromJobConfig.partitionColumn = "DCOL"; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.fromJobConfig.schemaName = schemaName; + jobConfig.fromJobConfig.sql = tableSql; + jobConfig.fromJobConfig.partitionColumn = "DCOL"; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcFromInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "SELECT * FROM " + fullTableName @@ -321,68 +321,68 @@ public class TestFromInitializer { @Test @SuppressWarnings("unchecked") public void testGetSchemaForTable() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.fromJobConfig.schemaName = schemaName; - jobConf.fromJobConfig.tableName = tableName; - jobConf.fromJobConfig.partitionColumn = "DCOL"; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.fromJobConfig.schemaName = schemaName; + jobConfig.fromJobConfig.tableName = tableName; + jobConfig.fromJobConfig.partitionColumn = "DCOL"; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcFromInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); - Schema schema = initializer.getSchema(initializerContext, connConf, jobConf); - assertEquals(getSchema(jobConf.fromJobConfig.schemaName + "." + tableName), schema); + initializer.initialize(initializerContext, linkConfig, jobConfig); + Schema schema = initializer.getSchema(initializerContext, linkConfig, jobConfig); + assertEquals(getSchema(jobConfig.fromJobConfig.schemaName + "." + tableName), schema); } @Test @SuppressWarnings("unchecked") public void testGetSchemaForSql() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.fromJobConfig.schemaName = schemaName; - jobConf.fromJobConfig.sql = tableSql; - jobConf.fromJobConfig.partitionColumn = "DCOL"; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.fromJobConfig.schemaName = schemaName; + jobConfig.fromJobConfig.sql = tableSql; + jobConfig.fromJobConfig.partitionColumn = "DCOL"; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcFromInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); - Schema schema = initializer.getSchema(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); + Schema schema = initializer.getSchema(initializerContext, linkConfig, jobConfig); assertEquals(getSchema("Query"), schema); } @Test @SuppressWarnings("unchecked") public void testTableSqlWithTableColumnsWithSchema() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); String fullTableName = executor.delimitIdentifier(schemaName) + "." + executor.delimitIdentifier(tableName); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.fromJobConfig.schemaName = schemaName; - jobConf.fromJobConfig.sql = tableSql; - jobConf.fromJobConfig.columns = tableColumns; - jobConf.fromJobConfig.partitionColumn = "DCOL"; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.fromJobConfig.schemaName = schemaName; + jobConfig.fromJobConfig.sql = tableSql; + jobConfig.fromJobConfig.columns = tableColumns; + jobConfig.fromJobConfig.partitionColumn = "DCOL"; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcFromInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "SELECT SQOOP_SUBQUERY_ALIAS.ICOL,SQOOP_SUBQUERY_ALIAS.VCOL FROM " http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestLoader.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestLoader.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestLoader.java index 144b92a..538b033 100644 --- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestLoader.java +++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestLoader.java @@ -82,10 +82,10 @@ public class TestLoader { public void testInsert() throws Exception { MutableContext context = new MutableMapContext(); - LinkConfiguration connectionConfig = new LinkConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); - connectionConfig.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connectionConfig.link.connectionString = GenericJdbcTestConstants.URL; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; ToJobConfiguration jobConfig = new ToJobConfiguration(); @@ -95,7 +95,7 @@ public class TestLoader { Loader loader = new GenericJdbcLoader(); DummyReader reader = new DummyReader(); LoaderContext loaderContext = new LoaderContext(context, reader, null); - loader.load(loaderContext, connectionConfig, jobConfig); + loader.load(loaderContext, linkConfig, jobConfig); int index = START; ResultSet rs = executor.executeQuery("SELECT * FROM " http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestPartitioner.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestPartitioner.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestPartitioner.java index ec75e1e..3ae64f0 100644 --- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestPartitioner.java +++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestPartitioner.java @@ -58,12 +58,12 @@ public class TestPartitioner { GenericJdbcConnectorConstants.CONNECTOR_JDBC_PARTITION_MAXVALUE, String.valueOf(START + NUMBER_OF_ROWS - 1)); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 5, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[] { "-5 <= ICOL AND ICOL < -3", @@ -90,12 +90,12 @@ public class TestPartitioner { GenericJdbcConnectorConstants.CONNECTOR_JDBC_PARTITION_MAXVALUE, String.valueOf(START + NUMBER_OF_ROWS - 1)); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 3, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[] { "-5 <= ICOL AND ICOL < -1", @@ -120,12 +120,12 @@ public class TestPartitioner { GenericJdbcConnectorConstants.CONNECTOR_JDBC_PARTITION_MAXVALUE, String.valueOf(START + NUMBER_OF_ROWS - 1)); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 13, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[] { "-5 <= ICOL AND ICOL < -4", @@ -157,12 +157,12 @@ public class TestPartitioner { GenericJdbcConnectorConstants.CONNECTOR_JDBC_PARTITION_MAXVALUE, String.valueOf((double)(START + NUMBER_OF_ROWS - 1))); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 5, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[] { "-5.0 <= DCOL AND DCOL < -3.0", @@ -189,12 +189,12 @@ public class TestPartitioner { GenericJdbcConnectorConstants.CONNECTOR_JDBC_PARTITION_MAXVALUE, String.valueOf((double)(START + NUMBER_OF_ROWS - 1))); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 3, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[] { "-5.0 <= DCOL AND DCOL < -1.6666666666666665", @@ -211,12 +211,12 @@ public class TestPartitioner { context.setString(GenericJdbcConnectorConstants.CONNECTOR_JDBC_PARTITION_MINVALUE, String.valueOf(START)); context.setString(GenericJdbcConnectorConstants.CONNECTOR_JDBC_PARTITION_MAXVALUE, String.valueOf(START + NUMBER_OF_ROWS - 1)); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 5, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[] { "-5 <= ICOL AND ICOL < -3", @@ -235,12 +235,12 @@ public class TestPartitioner { context.setString(GenericJdbcConnectorConstants.CONNECTOR_JDBC_PARTITION_MINVALUE, String.valueOf(new BigDecimal(START))); context.setString(GenericJdbcConnectorConstants.CONNECTOR_JDBC_PARTITION_MAXVALUE, String.valueOf(new BigDecimal(START + NUMBER_OF_ROWS - 1))); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 3, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[]{ "-5 <= DCOL AND DCOL < -2", @@ -257,12 +257,12 @@ public class TestPartitioner { context.setString(GenericJdbcConnectorConstants.CONNECTOR_JDBC_PARTITION_MINVALUE, String.valueOf(new BigDecimal(START))); context.setString(GenericJdbcConnectorConstants.CONNECTOR_JDBC_PARTITION_MAXVALUE, String.valueOf(new BigDecimal(START))); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 3, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[]{ "DCOL = -5", @@ -282,12 +282,12 @@ public class TestPartitioner { .toString()); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 3, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[]{ @@ -311,12 +311,12 @@ public class TestPartitioner { Time.valueOf("10:40:50").toString()); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 3, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[]{ "'01:01:01' <= TCOL AND TCOL < '04:14:17'", @@ -337,12 +337,12 @@ public class TestPartitioner { context.setString(GenericJdbcConnectorConstants.CONNECTOR_JDBC_PARTITION_MAXVALUE, Timestamp.valueOf("2013-12-31 10:40:50.654").toString()); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 3, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[]{ "'2013-01-01 01:01:01.123' <= TSCOL AND TSCOL < '2013-05-02 12:14:17.634'", "'2013-05-02 12:14:17.634' <= TSCOL AND TSCOL < '2013-08-31 23:27:34.144'", @@ -362,12 +362,12 @@ public class TestPartitioner { context.setString(GenericJdbcConnectorConstants .CONNECTOR_JDBC_PARTITION_MAXVALUE, "1"); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 3, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[]{ "BCOL = TRUE", "BCOL = FALSE", @@ -386,12 +386,12 @@ public class TestPartitioner { context.setString(GenericJdbcConnectorConstants .CONNECTOR_JDBC_PARTITION_MAXVALUE, "Z"); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 25, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[] { "'A' <= VCCOL AND VCCOL < 'B'", @@ -434,11 +434,11 @@ public class TestPartitioner { context.setString(GenericJdbcConnectorConstants .CONNECTOR_JDBC_PARTITION_MAXVALUE, "Warty Warthog"); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 5, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); assertEquals(partitions.size(), 5); // First partition needs to contain entire upper bound assertTrue(partitions.get(0).toString().contains("Breezy Badger")); @@ -458,13 +458,13 @@ public class TestPartitioner { context.setString(GenericJdbcConnectorConstants .CONNECTOR_JDBC_PARTITION_MAXVALUE, "AAF"); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 5, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[] { "'AAA' <= VCCOL AND VCCOL < 'AAB'", @@ -488,14 +488,14 @@ public class TestPartitioner { context.setString(GenericJdbcConnectorConstants .CONNECTOR_JDBC_PARTITION_MAXVALUE, "AAE"); - LinkConfiguration connConf = new LinkConfiguration(); - FromJobConfiguration jobConf = new FromJobConfiguration(); - jobConf.fromJobConfig.partitionColumnNull = true; + LinkConfiguration linkConfig = new LinkConfiguration(); + FromJobConfiguration jobConfig = new FromJobConfiguration(); + jobConfig.fromJobConfig.partitionColumnNull = true; Partitioner partitioner = new GenericJdbcPartitioner(); PartitionerContext partitionerContext = new PartitionerContext(context, 5, null); - List<Partition> partitions = partitioner.getPartitions(partitionerContext, connConf, jobConf); + List<Partition> partitions = partitioner.getPartitions(partitionerContext, linkConfig, jobConfig); verifyResult(partitions, new String[] { "VCCOL IS NULL", http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java ---------------------------------------------------------------------- diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java index a87ce7a..243de01 100644 --- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java +++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java @@ -17,6 +17,10 @@ */ package org.apache.sqoop.connector.jdbc; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import org.apache.sqoop.common.MutableContext; import org.apache.sqoop.common.MutableMapContext; import org.apache.sqoop.common.SqoopException; @@ -24,17 +28,13 @@ import org.apache.sqoop.connector.jdbc.configuration.LinkConfiguration; import org.apache.sqoop.connector.jdbc.configuration.ToJobConfiguration; import org.apache.sqoop.job.etl.Initializer; import org.apache.sqoop.job.etl.InitializerContext; +import org.apache.sqoop.validation.ConfigValidationResult; +import org.apache.sqoop.validation.ConfigValidationRunner; import org.apache.sqoop.validation.Status; -import org.apache.sqoop.validation.ValidationResult; -import org.apache.sqoop.validation.ValidationRunner; import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - public class TestToInitializer { private final String schemaName; private final String tableName; @@ -82,21 +82,21 @@ public class TestToInitializer { @Test @SuppressWarnings("unchecked") public void testTableName() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - ToJobConfiguration jobConf = new ToJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + ToJobConfiguration jobConfig = new ToJobConfiguration(); String fullTableName = executor.delimitIdentifier(schemalessTableName); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.toJobConfig.tableName = schemalessTableName; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.toJobConfig.tableName = schemalessTableName; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcToInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "INSERT INTO " + fullTableName + " VALUES (?,?,?)"); } @@ -104,22 +104,22 @@ public class TestToInitializer { @Test @SuppressWarnings("unchecked") public void testTableNameWithTableColumns() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - ToJobConfiguration jobConf = new ToJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + ToJobConfiguration jobConfig = new ToJobConfiguration(); String fullTableName = executor.delimitIdentifier(schemalessTableName); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.toJobConfig.tableName = schemalessTableName; - jobConf.toJobConfig.columns = tableColumns; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.toJobConfig.tableName = schemalessTableName; + jobConfig.toJobConfig.columns = tableColumns; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcToInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "INSERT INTO " + fullTableName + " (" + tableColumns + ") VALUES (?,?)"); } @@ -127,19 +127,19 @@ public class TestToInitializer { @Test @SuppressWarnings("unchecked") public void testTableSql() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - ToJobConfiguration jobConf = new ToJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + ToJobConfiguration jobConfig = new ToJobConfiguration(); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.toJobConfig.sql = schemalessTableSql; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.toJobConfig.sql = schemalessTableSql; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcToInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "INSERT INTO " + executor.delimitIdentifier(schemalessTableName) + " VALUES (?,?,?)"); } @@ -147,22 +147,22 @@ public class TestToInitializer { @Test @SuppressWarnings("unchecked") public void testTableNameWithSchema() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - ToJobConfiguration jobConf = new ToJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + ToJobConfiguration jobConfig = new ToJobConfiguration(); String fullTableName = executor.delimitIdentifier(schemaName) + "." + executor.delimitIdentifier(tableName); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.toJobConfig.schemaName = schemaName; - jobConf.toJobConfig.tableName = tableName; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.toJobConfig.schemaName = schemaName; + jobConfig.toJobConfig.tableName = tableName; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcToInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "INSERT INTO " + fullTableName + " VALUES (?,?,?)"); } @@ -170,23 +170,23 @@ public class TestToInitializer { @Test @SuppressWarnings("unchecked") public void testTableNameWithTableColumnsWithSchema() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - ToJobConfiguration jobConf = new ToJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + ToJobConfiguration jobConfig = new ToJobConfiguration(); String fullTableName = executor.delimitIdentifier(schemaName) + "." + executor.delimitIdentifier(tableName); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.toJobConfig.schemaName = schemaName; - jobConf.toJobConfig.tableName = tableName; - jobConf.toJobConfig.columns = tableColumns; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.toJobConfig.schemaName = schemaName; + jobConfig.toJobConfig.tableName = tableName; + jobConfig.toJobConfig.columns = tableColumns; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcToInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "INSERT INTO " + fullTableName + " (" + tableColumns + ") VALUES (?,?)"); } @@ -194,20 +194,20 @@ public class TestToInitializer { @Test @SuppressWarnings("unchecked") public void testTableSqlWithSchema() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - ToJobConfiguration jobConf = new ToJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + ToJobConfiguration jobConfig = new ToJobConfiguration(); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.toJobConfig.schemaName = schemaName; - jobConf.toJobConfig.sql = tableSql; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.toJobConfig.schemaName = schemaName; + jobConfig.toJobConfig.sql = tableSql; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcToInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "INSERT INTO " + executor.delimitIdentifier(tableName) + " VALUES (?,?,?)"); } @@ -229,13 +229,13 @@ public class TestToInitializer { @Test public void testNonExistingStageTable() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - ToJobConfiguration jobConf = new ToJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + ToJobConfiguration jobConfig = new ToJobConfiguration(); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.toJobConfig.tableName = schemalessTableName; - jobConf.toJobConfig.stageTableName = stageTableName; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.toJobConfig.tableName = schemalessTableName; + jobConfig.toJobConfig.stageTableName = stageTableName; MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @@ -243,7 +243,7 @@ public class TestToInitializer { @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcToInitializer(); try { - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); fail("Initialization should fail for non-existing stage table."); } catch(SqoopException se) { //expected @@ -253,15 +253,15 @@ public class TestToInitializer { @Test @SuppressWarnings("unchecked") public void testNonEmptyStageTable() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - ToJobConfiguration jobConf = new ToJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + ToJobConfiguration jobConfig = new ToJobConfiguration(); String fullStageTableName = executor.delimitIdentifier(stageTableName); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.toJobConfig.tableName = schemalessTableName; - jobConf.toJobConfig.stageTableName = stageTableName; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.toJobConfig.tableName = schemalessTableName; + jobConfig.toJobConfig.stageTableName = stageTableName; createTable(fullStageTableName); executor.executeUpdate("INSERT INTO " + fullStageTableName + " VALUES(1, 1.1, 'one')"); @@ -271,7 +271,7 @@ public class TestToInitializer { @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcToInitializer(); try { - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); fail("Initialization should fail for non-empty stage table."); } catch(SqoopException se) { //expected @@ -280,17 +280,17 @@ public class TestToInitializer { @Test public void testClearStageTableValidation() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - ToJobConfiguration jobConf = new ToJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + ToJobConfiguration jobConfig = new ToJobConfiguration(); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; //specifying clear stage table flag without specifying name of // the stage table - jobConf.toJobConfig.tableName = schemalessTableName; - jobConf.toJobConfig.clearStageTable = false; - ValidationRunner validationRunner = new ValidationRunner(); - ValidationResult result = validationRunner.validate(jobConf); + jobConfig.toJobConfig.tableName = schemalessTableName; + jobConfig.toJobConfig.clearStageTable = false; + ConfigValidationRunner validationRunner = new ConfigValidationRunner(); + ConfigValidationResult result = validationRunner.validate(jobConfig); assertEquals("User should not specify clear stage table flag without " + "specifying name of the stage table", Status.UNACCEPTABLE, @@ -298,8 +298,8 @@ public class TestToInitializer { assertTrue(result.getMessages().containsKey( "toJobConfig")); - jobConf.toJobConfig.clearStageTable = true; - result = validationRunner.validate(jobConf); + jobConfig.toJobConfig.clearStageTable = true; + result = validationRunner.validate(jobConfig); assertEquals("User should not specify clear stage table flag without " + "specifying name of the stage table", Status.UNACCEPTABLE, @@ -310,17 +310,17 @@ public class TestToInitializer { @Test public void testStageTableWithoutTable() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - ToJobConfiguration jobConf = new ToJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + ToJobConfiguration jobConfig = new ToJobConfiguration(); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; //specifying stage table without specifying table name - jobConf.toJobConfig.stageTableName = stageTableName; - jobConf.toJobConfig.sql = ""; + jobConfig.toJobConfig.stageTableName = stageTableName; + jobConfig.toJobConfig.sql = ""; - ValidationRunner validationRunner = new ValidationRunner(); - ValidationResult result = validationRunner.validate(jobConf); + ConfigValidationRunner validationRunner = new ConfigValidationRunner(); + ConfigValidationResult result = validationRunner.validate(jobConfig); assertEquals("Stage table name cannot be specified without specifying " + "table name", Status.UNACCEPTABLE, result.getStatus()); assertTrue(result.getMessages().containsKey( @@ -330,16 +330,16 @@ public class TestToInitializer { @Test @SuppressWarnings("unchecked") public void testClearStageTable() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - ToJobConfiguration jobConf = new ToJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + ToJobConfiguration jobConfig = new ToJobConfiguration(); String fullStageTableName = executor.delimitIdentifier(stageTableName); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.toJobConfig.tableName = schemalessTableName; - jobConf.toJobConfig.stageTableName = stageTableName; - jobConf.toJobConfig.clearStageTable = true; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.toJobConfig.tableName = schemalessTableName; + jobConfig.toJobConfig.stageTableName = stageTableName; + jobConfig.toJobConfig.clearStageTable = true; createTable(fullStageTableName); executor.executeUpdate("INSERT INTO " + fullStageTableName + " VALUES(1, 1.1, 'one')"); @@ -348,7 +348,7 @@ public class TestToInitializer { @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcToInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); assertEquals("Stage table should have been cleared", 0, executor.getTableRowCount(stageTableName)); } @@ -356,22 +356,22 @@ public class TestToInitializer { @Test @SuppressWarnings("unchecked") public void testStageTable() throws Exception { - LinkConfiguration connConf = new LinkConfiguration(); - ToJobConfiguration jobConf = new ToJobConfiguration(); + LinkConfiguration linkConfig = new LinkConfiguration(); + ToJobConfiguration jobConfig = new ToJobConfiguration(); String fullStageTableName = executor.delimitIdentifier(stageTableName); - connConf.link.jdbcDriver = GenericJdbcTestConstants.DRIVER; - connConf.link.connectionString = GenericJdbcTestConstants.URL; - jobConf.toJobConfig.tableName = schemalessTableName; - jobConf.toJobConfig.stageTableName = stageTableName; + linkConfig.linkConfig.jdbcDriver = GenericJdbcTestConstants.DRIVER; + linkConfig.linkConfig.connectionString = GenericJdbcTestConstants.URL; + jobConfig.toJobConfig.tableName = schemalessTableName; + jobConfig.toJobConfig.stageTableName = stageTableName; createTable(fullStageTableName); MutableContext context = new MutableMapContext(); InitializerContext initializerContext = new InitializerContext(context); @SuppressWarnings("rawtypes") Initializer initializer = new GenericJdbcToInitializer(); - initializer.initialize(initializerContext, connConf, jobConf); + initializer.initialize(initializerContext, linkConfig, jobConfig); verifyResult(context, "INSERT INTO " + fullStageTableName + " VALUES (?,?,?)"); http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsConfigUpgrader.java ---------------------------------------------------------------------- diff --git a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsConfigUpgrader.java b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsConfigUpgrader.java index 47b186c..b17aa21 100644 --- a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsConfigUpgrader.java +++ b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsConfigUpgrader.java @@ -18,21 +18,20 @@ */ package org.apache.sqoop.connector.hdfs; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.apache.log4j.Logger; import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.connector.spi.RepositoryUpgrader; -import org.apache.sqoop.model.MConnectionForms; -import org.apache.sqoop.model.MForm; +import org.apache.sqoop.model.MConfigList; +import org.apache.sqoop.model.MConfig; import org.apache.sqoop.model.MInput; -import org.apache.sqoop.model.MJobForms; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.apache.sqoop.model.MLinkConfig; public class HdfsConfigUpgrader extends RepositoryUpgrader { - private static final Logger LOG = - Logger.getLogger(HdfsConfigUpgrader.class); + private static final Logger LOG = Logger.getLogger(HdfsConfigUpgrader.class); /* * For now, there is no real upgrade. So copy all data over, @@ -41,37 +40,36 @@ public class HdfsConfigUpgrader extends RepositoryUpgrader { */ @Override - public void upgrade(MConnectionForms original, - MConnectionForms upgradeTarget) { - doUpgrade(original.getForms(), upgradeTarget.getForms()); + public void upgrade(MLinkConfig original, MLinkConfig upgradeTarget) { + doUpgrade(original.getConfigs(), upgradeTarget.getConfigs()); } @Override - public void upgrade(MJobForms original, MJobForms upgradeTarget) { - doUpgrade(original.getForms(), upgradeTarget.getForms()); + public void upgrade(MConfigList original, MConfigList upgradeTarget) { + doUpgrade(original.getConfigs(), upgradeTarget.getConfigs()); } @SuppressWarnings("unchecked") - private void doUpgrade(List<MForm> original, List<MForm> target) { - // Easier to find the form in the original forms list if we use a map. - // Since the constructor of MJobForms takes a list, + private void doUpgrade(List<MConfig> original, List<MConfig> target) { + // Easier to find the config in the original list if we use a map. + // Since the constructor takes a list, // index is not guaranteed to be the same, so we need to look for // equivalence - Map<String, MForm> formMap = new HashMap<String, MForm>(); - for (MForm form : original) { - formMap.put(form.getName(), form); + Map<String, MConfig> configMap = new HashMap<String, MConfig>(); + for (MConfig config : original) { + configMap.put(config.getName(), config); } - for (MForm form : target) { - List<MInput<?>> inputs = form.getInputs(); - MForm originalForm = formMap.get(form.getName()); - if (originalForm == null) { - LOG.warn("Form: '" + form.getName() + "' not present in old " + + for (MConfig config : target) { + List<MInput<?>> inputs = config.getInputs(); + MConfig originalConfig = configMap.get(config.getName()); + if (originalConfig == null) { + LOG.warn("Config: '" + config.getName() + "' not present in old " + "connector. So it and its inputs will not be transferred by the upgrader."); continue; } for (MInput input : inputs) { try { - MInput originalInput = originalForm.getInput(input.getName()); + MInput originalInput = originalConfig.getInput(input.getName()); input.setValue(originalInput.getValue()); } catch (SqoopException ex) { LOG.warn("Input: '" + input.getName() + "' not present in old " + http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsConnector.java ---------------------------------------------------------------------- diff --git a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsConnector.java b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsConnector.java index cd5350e..606b9fa 100644 --- a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsConnector.java +++ b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsConnector.java @@ -118,7 +118,7 @@ public class HdfsConnector extends SqoopConnector { * @return Validator object */ @Override - public Validator getValidator() { + public Validator getConfigValidator() { return hdfsValidator; } http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsExtractor.java ---------------------------------------------------------------------- diff --git a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsExtractor.java b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsExtractor.java index 436d243..2c8b6c8 100644 --- a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsExtractor.java +++ b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsExtractor.java @@ -52,8 +52,8 @@ public class HdfsExtractor extends Extractor<LinkConfiguration, FromJobConfigura @Override public void extract(ExtractorContext context, - LinkConfiguration connectionConfiguration, - FromJobConfiguration jobConfiguration, HdfsPartition partition) { + LinkConfiguration linkConfig, + FromJobConfiguration fromJobConfig, HdfsPartition partition) { conf = ((PrefixContext) context.getContext()).getConfiguration(); dataWriter = context.getDataWriter(); http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsInitializer.java ---------------------------------------------------------------------- diff --git a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsInitializer.java b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsInitializer.java index c2dc1a5..bb5e353 100644 --- a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsInitializer.java +++ b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsInitializer.java @@ -29,16 +29,16 @@ public class HdfsInitializer extends Initializer { * promoted to all other part of the workflow automatically. * * @param context Initializer context object - * @param linkConf Connector's link configuration object + * @param linkConfig Connector's link configuration object * @param jobConf Connector's job configuration object */ @Override - public void initialize(InitializerContext context, Object linkConf, Object jobConf) { + public void initialize(InitializerContext context, Object linkConfig, Object jobConf) { } @Override - public Schema getSchema(InitializerContext context, Object linkConf, Object jobConf) { + public Schema getSchema(InitializerContext context, Object linkConfig, Object jobConfig) { return new Schema("HDFS file"); } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsLoader.java ---------------------------------------------------------------------- diff --git a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsLoader.java b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsLoader.java index 4c546ba..660418d 100644 --- a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsLoader.java +++ b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsLoader.java @@ -42,19 +42,19 @@ public class HdfsLoader extends Loader<LinkConfiguration, ToJobConfiguration> { * Load data to target. * * @param context Loader context object - * @param linkConf Link configuration - * @param toJobConf Job configuration + * @param linkConfig Link configuration + * @param toJobConfig Job configuration * @throws Exception */ @Override - public void load(LoaderContext context, LinkConfiguration linkConf, ToJobConfiguration toJobConf) throws Exception { + public void load(LoaderContext context, LinkConfiguration linkConfig, ToJobConfiguration toJobConfig) throws Exception { DataReader reader = context.getDataReader(); Configuration conf = ((PrefixContext)context.getContext()).getConfiguration(); - String directoryName = toJobConf.toJobConfig.outputDirectory; - String codecname = getCompressionCodecName(toJobConf); + String directoryName = toJobConfig.toJobConfig.outputDirectory; + String codecname = getCompressionCodecName(toJobConfig); CompressionCodec codec = null; if (codecname != null) { @@ -73,12 +73,12 @@ public class HdfsLoader extends Loader<LinkConfiguration, ToJobConfiguration> { } } - String filename = directoryName + "/" + UUID.randomUUID() + getExtension(toJobConf,codec); + String filename = directoryName + "/" + UUID.randomUUID() + getExtension(toJobConfig,codec); try { Path filepath = new Path(filename); - GenericHdfsWriter filewriter = getWriter(toJobConf); + GenericHdfsWriter filewriter = getWriter(toJobConfig); filewriter.initialize(filepath,conf,codec); http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsPartitioner.java ---------------------------------------------------------------------- diff --git a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsPartitioner.java b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsPartitioner.java index 6828de8..f40459f 100644 --- a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsPartitioner.java +++ b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsPartitioner.java @@ -68,12 +68,12 @@ public class HdfsPartitioner extends Partitioner<LinkConfiguration, FromJobConfi @Override public List<Partition> getPartitions(PartitionerContext context, - LinkConfiguration linkConfiguration, FromJobConfiguration jobConfiguration) { + LinkConfiguration linkConfig, FromJobConfiguration fromJobConfig) { Configuration conf = ((PrefixContext)context.getContext()).getConfiguration(); try { - long numInputBytes = getInputSize(conf, jobConfiguration.fromJobConfig.inputDirectory); + long numInputBytes = getInputSize(conf, fromJobConfig.fromJobConfig.inputDirectory); maxSplitSize = numInputBytes / context.getMaxPartitions(); if(numInputBytes % context.getMaxPartitions() != 0 ) { @@ -118,7 +118,7 @@ public class HdfsPartitioner extends Partitioner<LinkConfiguration, FromJobConfi } // all the files in input set - String indir = jobConfiguration.fromJobConfig.inputDirectory; + String indir = fromJobConfig.fromJobConfig.inputDirectory; FileSystem fs = FileSystem.get(conf); List<Path> paths = new LinkedList<Path>(); http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsValidator.java ---------------------------------------------------------------------- diff --git a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsValidator.java b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsValidator.java index dfa3659..b995efd 100644 --- a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsValidator.java +++ b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsValidator.java @@ -19,7 +19,7 @@ package org.apache.sqoop.connector.hdfs; import org.apache.sqoop.connector.hdfs.configuration.*; import org.apache.sqoop.validation.Status; -import org.apache.sqoop.validation.Validation; +import org.apache.sqoop.validation.ConfigValidator; import org.apache.sqoop.validation.Validator; /** @@ -28,54 +28,45 @@ import org.apache.sqoop.validation.Validator; public class HdfsValidator extends Validator { @Override - public Validation validateLink(Object connectionConfiguration) { - Validation validation = new Validation(LinkConfiguration.class); - // No validation on connection object - return validation; - } - - - @Override - public Validation validateJob(Object jobConfiguration) { - //TODO: I'm pretty sure this needs to call either validateExportJob or validateImportJob, depending on context - return super.validateJob(jobConfiguration); + public ConfigValidator validateConfigForJob(Object jobConfiguration) { + return super.validateConfigForJob(jobConfiguration); } @SuppressWarnings("unused") - private Validation validateFromJob(Object jobConfiguration) { - Validation validation = new Validation(FromJobConfiguration.class); + private ConfigValidator validateFromJob(Object jobConfiguration) { + ConfigValidator validation = new ConfigValidator(FromJobConfiguration.class); FromJobConfiguration configuration = (FromJobConfiguration)jobConfiguration; - validateInputForm(validation, configuration.fromJobConfig); + validateInputConfig(validation, configuration.fromJobConfig); return validation; } @SuppressWarnings("unused") - private Validation validateToJob(Object jobConfiguration) { - Validation validation = new Validation(ToJobConfiguration.class); + private ConfigValidator validateToJob(Object jobConfiguration) { + ConfigValidator validation = new ConfigValidator(ToJobConfiguration.class); ToJobConfiguration configuration = (ToJobConfiguration)jobConfiguration; - validateOutputForm(validation, configuration.toJobConfig); + validateOutputConfig(validation, configuration.toJobConfig); return validation; } - private void validateInputForm(Validation validation, FromJobConfig input) { - if(input.inputDirectory == null || input.inputDirectory.isEmpty()) { + private void validateInputConfig(ConfigValidator validation, FromJobConfig inputConfig) { + if(inputConfig.inputDirectory == null || inputConfig.inputDirectory.isEmpty()) { validation.addMessage(Status.UNACCEPTABLE, "input", "inputDirectory", "Input directory is empty"); } } - private void validateOutputForm(Validation validation, ToJobConfig output) { - if(output.outputDirectory == null || output.outputDirectory.isEmpty()) { + private void validateOutputConfig(ConfigValidator validation, ToJobConfig outputConfig) { + if(outputConfig.outputDirectory == null || outputConfig.outputDirectory.isEmpty()) { validation.addMessage(Status.UNACCEPTABLE, "output", "outputDirectory", "Output directory is empty"); } - if(output.customCompression != null && - output.customCompression.trim().length() > 0 && - output.compression != ToCompression.CUSTOM) { + if(outputConfig.customCompression != null && + outputConfig.customCompression.trim().length() > 0 && + outputConfig.compression != ToCompression.CUSTOM) { validation.addMessage(Status.UNACCEPTABLE, "output", "compression", - "custom compression should be blank as " + output.compression + " is being used."); + "custom compression should be blank as " + outputConfig.compression + " is being used."); } - if(output.compression == ToCompression.CUSTOM && - (output.customCompression == null || - output.customCompression.trim().length() == 0) + if(outputConfig.compression == ToCompression.CUSTOM && + (outputConfig.customCompression == null || + outputConfig.customCompression.trim().length() == 0) ) { validation.addMessage(Status.UNACCEPTABLE, "output", "compression", "custom compression is blank."); http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/FromJobConfig.java ---------------------------------------------------------------------- diff --git a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/FromJobConfig.java b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/FromJobConfig.java index 2c98051..037fe59 100644 --- a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/FromJobConfig.java +++ b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/FromJobConfig.java @@ -17,13 +17,13 @@ */ package org.apache.sqoop.connector.hdfs.configuration; -import org.apache.sqoop.model.FormClass; +import org.apache.sqoop.model.ConfigClass; import org.apache.sqoop.model.Input; /** * */ -@FormClass +@ConfigClass public class FromJobConfig { @Input(size = 255) public String inputDirectory; http://git-wip-us.apache.org/repos/asf/sqoop/blob/8362c73c/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/FromJobConfiguration.java ---------------------------------------------------------------------- diff --git a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/FromJobConfiguration.java b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/FromJobConfiguration.java index f861237..618366e 100644 --- a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/FromJobConfiguration.java +++ b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/FromJobConfiguration.java @@ -18,11 +18,11 @@ package org.apache.sqoop.connector.hdfs.configuration; import org.apache.sqoop.model.ConfigurationClass; -import org.apache.sqoop.model.Form; +import org.apache.sqoop.model.Config; @ConfigurationClass public class FromJobConfiguration { - @Form public FromJobConfig fromJobConfig; + @Config public FromJobConfig fromJobConfig; public FromJobConfiguration() { fromJobConfig = new FromJobConfig();