From f7efa38005525e2fb22ce1af0323bf265d719c00 Mon Sep 17 00:00:00 2001 From: Abraham Elmahrek Date: Fri, 30 Jan 2015 13:16:24 -0800 Subject: [PATCH] SQOOP-2054: Sqoop2: Client cannot understand server exceptions (Richard Zhou via Abraham Elmahrek) --- .../sqoop/error/code}/AVROIntermediateDataFormatError.java | 2 +- .../sqoop/error/code}/CSVIntermediateDataFormatError.java | 2 +- .../org/apache/sqoop/error/code}/CommonRepositoryError.java | 2 +- .../java/org/apache/sqoop/error/code}/ConfigurableError.java | 2 +- .../java/org/apache/sqoop/error/code}/DerbyRepoError.java | 2 +- .../apache/sqoop/error/code}/GenericJdbcConnectorError.java | 2 +- .../java/org/apache/sqoop/error/code}/HdfsConnectorError.java | 2 +- .../apache/sqoop/error/code}/IntermediateDataFormatError.java | 2 +- .../sqoop/error/code}/JSONIntermediateDataFormatError.java | 2 +- .../org/apache/sqoop/error/code}/KafkaConnectorErrors.java | 2 +- .../java/org/apache/sqoop/error/code}/KiteConnectorError.java | 2 +- .../java/org/apache/sqoop/error/code}/MRExecutionError.java | 2 +- .../apache/sqoop/error/code}/MapreduceSubmissionError.java | 2 +- .../main/java/org/apache/sqoop/error/code}/MatcherError.java | 2 +- .../org/apache/sqoop/error/code}/PostgresqlRepoError.java | 2 +- .../main/java/org/apache/sqoop/error/code}/ServerError.java | 2 +- .../org/apache/sqoop/connector/jdbc/GenericJdbcExecutor.java | 1 + .../org/apache/sqoop/connector/jdbc/GenericJdbcExtractor.java | 1 + .../sqoop/connector/jdbc/GenericJdbcFromInitializer.java | 3 +-- .../apache/sqoop/connector/jdbc/GenericJdbcPartitioner.java | 1 + .../apache/sqoop/connector/jdbc/GenericJdbcToInitializer.java | 3 +-- .../java/org/apache/sqoop/connector/hdfs/HdfsConnector.java | 1 + .../java/org/apache/sqoop/connector/hdfs/HdfsExtractor.java | 1 + .../main/java/org/apache/sqoop/connector/hdfs/HdfsLoader.java | 1 + .../java/org/apache/sqoop/connector/hdfs/HdfsPartitioner.java | 1 + .../java/org/apache/sqoop/connector/kafka/KafkaLoader.java | 1 + .../org/apache/sqoop/connector/kite/KiteDatasetExecutor.java | 1 + .../org/apache/sqoop/connector/kite/KiteFromInitializer.java | 1 + .../org/apache/sqoop/connector/kite/KiteToInitializer.java | 1 + .../org/apache/sqoop/connector/common/SqoopAvroUtils.java | 2 +- .../java/org/apache/sqoop/connector/common/SqoopIDFUtils.java | 4 ++-- .../sqoop/connector/idf/AVROIntermediateDataFormat.java | 1 + .../apache/sqoop/connector/idf/CSVIntermediateDataFormat.java | 1 + .../apache/sqoop/connector/idf/IntermediateDataFormat.java | 1 + .../sqoop/connector/idf/JSONIntermediateDataFormat.java | 2 ++ .../sqoop/connector/spi/ConnectorConfigurableUpgrader.java | 2 +- .../main/java/org/apache/sqoop/job/mr/SqoopInputFormat.java | 2 +- .../src/main/java/org/apache/sqoop/job/mr/SqoopMapper.java | 2 +- .../apache/sqoop/job/mr/SqoopOutputFormatLoadExecutor.java | 2 +- .../src/main/java/org/apache/sqoop/job/mr/SqoopSplit.java | 2 +- .../sqoop/repository/common/CommonRepositoryHandler.java | 1 + .../apache/sqoop/repository/derby/DerbyRepositoryHandler.java | 1 + .../org/apache/sqoop/repository/derby/TestJobHandling.java | 2 +- .../org/apache/sqoop/repository/derby/TestLinkHandling.java | 2 +- .../repository/postgresql/PostgresqlRepositoryHandler.java | 1 + .../org/apache/sqoop/handler/ConnectorRequestHandler.java | 2 +- .../java/org/apache/sqoop/handler/DriverRequestHandler.java | 2 +- .../src/main/java/org/apache/sqoop/handler/HandlerUtils.java | 2 +- .../main/java/org/apache/sqoop/handler/JobRequestHandler.java | 2 +- .../java/org/apache/sqoop/handler/LinkRequestHandler.java | 2 +- .../org/apache/sqoop/handler/SubmissionRequestHandler.java | 2 +- .../java/org/apache/sqoop/handler/VersionRequestHandler.java | 2 +- .../src/main/java/org/apache/sqoop/server/RequestContext.java | 2 +- .../sqoop/submission/mapreduce/MapreduceSubmissionEngine.java | 1 + 54 files changed, 56 insertions(+), 38 deletions(-) rename {connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf => common/src/main/java/org/apache/sqoop/error/code}/AVROIntermediateDataFormatError.java (97%) rename {connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf => common/src/main/java/org/apache/sqoop/error/code}/CSVIntermediateDataFormatError.java (98%) rename {repository/repository-common/src/main/java/org/apache/sqoop/repository/common => common/src/main/java/org/apache/sqoop/error/code}/CommonRepositoryError.java (99%) rename {connector/connector-sdk/src/main/java/org/apache/sqoop/configurable => common/src/main/java/org/apache/sqoop/error/code}/ConfigurableError.java (97%) rename {repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby => common/src/main/java/org/apache/sqoop/error/code}/DerbyRepoError.java (98%) rename {connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc => common/src/main/java/org/apache/sqoop/error/code}/GenericJdbcConnectorError.java (98%) rename {connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs => common/src/main/java/org/apache/sqoop/error/code}/HdfsConnectorError.java (97%) rename {connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf => common/src/main/java/org/apache/sqoop/error/code}/IntermediateDataFormatError.java (97%) rename {connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf => common/src/main/java/org/apache/sqoop/error/code}/JSONIntermediateDataFormatError.java (97%) rename {connector/connector-kafka/src/main/java/org/apache/sqoop/connector/kafka => common/src/main/java/org/apache/sqoop/error/code}/KafkaConnectorErrors.java (96%) rename {connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite => common/src/main/java/org/apache/sqoop/error/code}/KiteConnectorError.java (97%) rename {execution/mapreduce/src/main/java/org/apache/sqoop/job => common/src/main/java/org/apache/sqoop/error/code}/MRExecutionError.java (98%) rename {submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce => common/src/main/java/org/apache/sqoop/error/code}/MapreduceSubmissionError.java (96%) rename {connector/connector-sdk/src/main/java/org/apache/sqoop/connector/matcher => common/src/main/java/org/apache/sqoop/error/code}/MatcherError.java (96%) rename {repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql => common/src/main/java/org/apache/sqoop/error/code}/PostgresqlRepoError.java (96%) rename {server/src/main/java/org/apache/sqoop/server/common => common/src/main/java/org/apache/sqoop/error/code}/ServerError.java (97%) diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/AVROIntermediateDataFormatError.java b/common/src/main/java/org/apache/sqoop/error/code/AVROIntermediateDataFormatError.java similarity index 97% rename from connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/AVROIntermediateDataFormatError.java rename to common/src/main/java/org/apache/sqoop/error/code/AVROIntermediateDataFormatError.java index fd1b7d35..d4ca1932 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/AVROIntermediateDataFormatError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/AVROIntermediateDataFormatError.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sqoop.connector.idf; +package org.apache.sqoop.error.code; import org.apache.sqoop.classification.InterfaceAudience; import org.apache.sqoop.classification.InterfaceStability; diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/CSVIntermediateDataFormatError.java b/common/src/main/java/org/apache/sqoop/error/code/CSVIntermediateDataFormatError.java similarity index 98% rename from connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/CSVIntermediateDataFormatError.java rename to common/src/main/java/org/apache/sqoop/error/code/CSVIntermediateDataFormatError.java index 6828bb90..cb801321 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/CSVIntermediateDataFormatError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/CSVIntermediateDataFormatError.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sqoop.connector.idf; +package org.apache.sqoop.error.code; import org.apache.sqoop.classification.InterfaceAudience; import org.apache.sqoop.classification.InterfaceStability; diff --git a/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryError.java b/common/src/main/java/org/apache/sqoop/error/code/CommonRepositoryError.java similarity index 99% rename from repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryError.java rename to common/src/main/java/org/apache/sqoop/error/code/CommonRepositoryError.java index 7a7b28c6..952be3f4 100644 --- a/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/CommonRepositoryError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.repository.common; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/configurable/ConfigurableError.java b/common/src/main/java/org/apache/sqoop/error/code/ConfigurableError.java similarity index 97% rename from connector/connector-sdk/src/main/java/org/apache/sqoop/configurable/ConfigurableError.java rename to common/src/main/java/org/apache/sqoop/error/code/ConfigurableError.java index 6236870b..551fc599 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/configurable/ConfigurableError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/ConfigurableError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.configurable; +package org.apache.sqoop.error.code; import org.apache.sqoop.classification.InterfaceAudience; import org.apache.sqoop.classification.InterfaceStability; diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepoError.java b/common/src/main/java/org/apache/sqoop/error/code/DerbyRepoError.java similarity index 98% rename from repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepoError.java rename to common/src/main/java/org/apache/sqoop/error/code/DerbyRepoError.java index 6bc56740..dddc3d8d 100644 --- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepoError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/DerbyRepoError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.repository.derby; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcConnectorError.java b/common/src/main/java/org/apache/sqoop/error/code/GenericJdbcConnectorError.java similarity index 98% rename from connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcConnectorError.java rename to common/src/main/java/org/apache/sqoop/error/code/GenericJdbcConnectorError.java index 0fa4a321..03bc1049 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcConnectorError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/GenericJdbcConnectorError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.connector.jdbc; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsConnectorError.java b/common/src/main/java/org/apache/sqoop/error/code/HdfsConnectorError.java similarity index 97% rename from connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsConnectorError.java rename to common/src/main/java/org/apache/sqoop/error/code/HdfsConnectorError.java index 71f0a032..8514541f 100644 --- a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/HdfsConnectorError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/HdfsConnectorError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.connector.hdfs; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/IntermediateDataFormatError.java b/common/src/main/java/org/apache/sqoop/error/code/IntermediateDataFormatError.java similarity index 97% rename from connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/IntermediateDataFormatError.java rename to common/src/main/java/org/apache/sqoop/error/code/IntermediateDataFormatError.java index f7c9abb4..ce529a93 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/IntermediateDataFormatError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/IntermediateDataFormatError.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sqoop.connector.idf; +package org.apache.sqoop.error.code; import org.apache.sqoop.classification.InterfaceAudience; import org.apache.sqoop.classification.InterfaceStability; diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/JSONIntermediateDataFormatError.java b/common/src/main/java/org/apache/sqoop/error/code/JSONIntermediateDataFormatError.java similarity index 97% rename from connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/JSONIntermediateDataFormatError.java rename to common/src/main/java/org/apache/sqoop/error/code/JSONIntermediateDataFormatError.java index 0c29a8fe..db8d0c7f 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/JSONIntermediateDataFormatError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/JSONIntermediateDataFormatError.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.sqoop.connector.idf; +package org.apache.sqoop.error.code; import org.apache.sqoop.classification.InterfaceAudience; import org.apache.sqoop.classification.InterfaceStability; diff --git a/connector/connector-kafka/src/main/java/org/apache/sqoop/connector/kafka/KafkaConnectorErrors.java b/common/src/main/java/org/apache/sqoop/error/code/KafkaConnectorErrors.java similarity index 96% rename from connector/connector-kafka/src/main/java/org/apache/sqoop/connector/kafka/KafkaConnectorErrors.java rename to common/src/main/java/org/apache/sqoop/error/code/KafkaConnectorErrors.java index f94efea6..436b852b 100644 --- a/connector/connector-kafka/src/main/java/org/apache/sqoop/connector/kafka/KafkaConnectorErrors.java +++ b/common/src/main/java/org/apache/sqoop/error/code/KafkaConnectorErrors.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.connector.kafka; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteConnectorError.java b/common/src/main/java/org/apache/sqoop/error/code/KiteConnectorError.java similarity index 97% rename from connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteConnectorError.java rename to common/src/main/java/org/apache/sqoop/error/code/KiteConnectorError.java index 5775fcf6..7db9904a 100644 --- a/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteConnectorError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/KiteConnectorError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.connector.kite; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/execution/mapreduce/src/main/java/org/apache/sqoop/job/MRExecutionError.java b/common/src/main/java/org/apache/sqoop/error/code/MRExecutionError.java similarity index 98% rename from execution/mapreduce/src/main/java/org/apache/sqoop/job/MRExecutionError.java rename to common/src/main/java/org/apache/sqoop/error/code/MRExecutionError.java index e70b7e23..21e5c823 100644 --- a/execution/mapreduce/src/main/java/org/apache/sqoop/job/MRExecutionError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/MRExecutionError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.job; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionError.java b/common/src/main/java/org/apache/sqoop/error/code/MapreduceSubmissionError.java similarity index 96% rename from submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionError.java rename to common/src/main/java/org/apache/sqoop/error/code/MapreduceSubmissionError.java index 4af95b07..0a38bbae 100644 --- a/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/MapreduceSubmissionError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.submission.mapreduce; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/matcher/MatcherError.java b/common/src/main/java/org/apache/sqoop/error/code/MatcherError.java similarity index 96% rename from connector/connector-sdk/src/main/java/org/apache/sqoop/connector/matcher/MatcherError.java rename to common/src/main/java/org/apache/sqoop/error/code/MatcherError.java index 18693c27..5269c565 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/matcher/MatcherError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/MatcherError.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sqoop.connector.matcher; +package org.apache.sqoop.error.code; import org.apache.sqoop.classification.InterfaceAudience; import org.apache.sqoop.classification.InterfaceStability; diff --git a/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlRepoError.java b/common/src/main/java/org/apache/sqoop/error/code/PostgresqlRepoError.java similarity index 96% rename from repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlRepoError.java rename to common/src/main/java/org/apache/sqoop/error/code/PostgresqlRepoError.java index 19ee505c..29b83429 100644 --- a/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlRepoError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/PostgresqlRepoError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.repository.postgresql; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/server/src/main/java/org/apache/sqoop/server/common/ServerError.java b/common/src/main/java/org/apache/sqoop/error/code/ServerError.java similarity index 97% rename from server/src/main/java/org/apache/sqoop/server/common/ServerError.java rename to common/src/main/java/org/apache/sqoop/error/code/ServerError.java index c68ab57d..86cca7dc 100644 --- a/server/src/main/java/org/apache/sqoop/server/common/ServerError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/ServerError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.server.common; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutor.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutor.java index e94a19be..5e7e4e60 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutor.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutor.java @@ -28,6 +28,7 @@ import org.apache.log4j.Logger; import org.apache.sqoop.common.SqoopException; +import org.apache.sqoop.error.code.GenericJdbcConnectorError; public class GenericJdbcExecutor { diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExtractor.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExtractor.java index a3499564..3287e163 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExtractor.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExtractor.java @@ -25,6 +25,7 @@ import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.connector.jdbc.configuration.FromJobConfiguration; import org.apache.sqoop.connector.jdbc.configuration.LinkConfiguration; +import org.apache.sqoop.error.code.GenericJdbcConnectorError; import org.apache.sqoop.job.etl.Extractor; import org.apache.sqoop.job.etl.ExtractorContext; import org.apache.sqoop.schema.Schema; diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java index 1b30fb4a..1ecd152d 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java @@ -20,8 +20,6 @@ import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; -import java.util.LinkedList; -import java.util.List; import java.util.Set; import org.apache.commons.lang.StringUtils; @@ -31,6 +29,7 @@ import org.apache.sqoop.connector.jdbc.configuration.FromJobConfiguration; import org.apache.sqoop.connector.jdbc.configuration.LinkConfiguration; import org.apache.sqoop.connector.jdbc.util.SqlTypesUtils; +import org.apache.sqoop.error.code.GenericJdbcConnectorError; import org.apache.sqoop.job.Constants; import org.apache.sqoop.job.etl.Initializer; import org.apache.sqoop.job.etl.InitializerContext; diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcPartitioner.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcPartitioner.java index b68d8d0b..23b57c0f 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcPartitioner.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcPartitioner.java @@ -30,6 +30,7 @@ import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.connector.jdbc.configuration.LinkConfiguration; import org.apache.sqoop.connector.jdbc.configuration.FromJobConfiguration; +import org.apache.sqoop.error.code.GenericJdbcConnectorError; import org.apache.sqoop.job.etl.Partition; import org.apache.sqoop.job.etl.Partitioner; import org.apache.sqoop.job.etl.PartitionerContext; diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToInitializer.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToInitializer.java index 5e6f983a..400c0f28 100644 --- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToInitializer.java +++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToInitializer.java @@ -20,8 +20,6 @@ import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; -import java.util.LinkedList; -import java.util.List; import java.util.Set; import org.apache.commons.lang.StringUtils; @@ -31,6 +29,7 @@ import org.apache.sqoop.connector.jdbc.configuration.LinkConfiguration; import org.apache.sqoop.connector.jdbc.configuration.ToJobConfiguration; import org.apache.sqoop.connector.jdbc.util.SqlTypesUtils; +import org.apache.sqoop.error.code.GenericJdbcConnectorError; import org.apache.sqoop.job.etl.Initializer; import org.apache.sqoop.job.etl.InitializerContext; import org.apache.sqoop.schema.Schema; 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 f70142d2..2d5ba58f 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 @@ -29,6 +29,7 @@ import org.apache.sqoop.connector.hdfs.configuration.ToJobConfiguration; import org.apache.sqoop.connector.spi.ConnectorConfigurableUpgrader; import org.apache.sqoop.connector.spi.SqoopConnector; +import org.apache.sqoop.error.code.HdfsConnectorError; import org.apache.sqoop.job.etl.From; import org.apache.sqoop.job.etl.To; 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 9f3367b4..f70d56b7 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 @@ -34,6 +34,7 @@ import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.connector.hdfs.configuration.FromJobConfiguration; import org.apache.sqoop.connector.hdfs.configuration.LinkConfiguration; +import org.apache.sqoop.error.code.HdfsConnectorError; import org.apache.sqoop.etl.io.DataWriter; import org.apache.sqoop.job.etl.Extractor; import org.apache.sqoop.job.etl.ExtractorContext; 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 556c1127..bdee8780 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 @@ -32,6 +32,7 @@ import org.apache.sqoop.connector.hdfs.hdfsWriter.GenericHdfsWriter; import org.apache.sqoop.connector.hdfs.hdfsWriter.HdfsSequenceWriter; import org.apache.sqoop.connector.hdfs.hdfsWriter.HdfsTextWriter; +import org.apache.sqoop.error.code.HdfsConnectorError; import org.apache.sqoop.etl.io.DataReader; import org.apache.sqoop.job.etl.Loader; import org.apache.sqoop.job.etl.LoaderContext; 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 181528cc..78fd60ab 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 @@ -42,6 +42,7 @@ import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.connector.hdfs.configuration.FromJobConfiguration; import org.apache.sqoop.connector.hdfs.configuration.LinkConfiguration; +import org.apache.sqoop.error.code.HdfsConnectorError; import org.apache.sqoop.job.etl.Partition; import org.apache.sqoop.job.etl.Partitioner; import org.apache.sqoop.job.etl.PartitionerContext; diff --git a/connector/connector-kafka/src/main/java/org/apache/sqoop/connector/kafka/KafkaLoader.java b/connector/connector-kafka/src/main/java/org/apache/sqoop/connector/kafka/KafkaLoader.java index 1c08f602..ad9ec347 100644 --- a/connector/connector-kafka/src/main/java/org/apache/sqoop/connector/kafka/KafkaLoader.java +++ b/connector/connector-kafka/src/main/java/org/apache/sqoop/connector/kafka/KafkaLoader.java @@ -24,6 +24,7 @@ import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.connector.kafka.configuration.ToJobConfiguration; import org.apache.sqoop.connector.kafka.configuration.LinkConfiguration; +import org.apache.sqoop.error.code.KafkaConnectorErrors; import org.apache.sqoop.job.etl.Loader; import org.apache.sqoop.job.etl.LoaderContext; diff --git a/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteDatasetExecutor.java b/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteDatasetExecutor.java index e4514b57..cf8b627b 100644 --- a/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteDatasetExecutor.java +++ b/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteDatasetExecutor.java @@ -25,6 +25,7 @@ import org.apache.sqoop.connector.common.FileFormat; import org.apache.sqoop.connector.common.AvroDataTypeUtil; import org.apache.sqoop.connector.kite.util.KiteDataTypeUtil; +import org.apache.sqoop.error.code.KiteConnectorError; import org.kitesdk.data.Dataset; import org.kitesdk.data.DatasetDescriptor; import org.kitesdk.data.DatasetReader; diff --git a/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteFromInitializer.java b/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteFromInitializer.java index 2f82eaa7..292510a2 100644 --- a/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteFromInitializer.java +++ b/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteFromInitializer.java @@ -22,6 +22,7 @@ import org.apache.sqoop.connector.kite.configuration.FromJobConfiguration; import org.apache.sqoop.connector.kite.configuration.LinkConfiguration; import org.apache.sqoop.connector.common.AvroDataTypeUtil; +import org.apache.sqoop.error.code.KiteConnectorError; import org.apache.sqoop.job.etl.Initializer; import org.apache.sqoop.job.etl.InitializerContext; import org.apache.sqoop.schema.Schema; diff --git a/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteToInitializer.java b/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteToInitializer.java index ef94d48b..a9cff77b 100644 --- a/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteToInitializer.java +++ b/connector/connector-kite/src/main/java/org/apache/sqoop/connector/kite/KiteToInitializer.java @@ -23,6 +23,7 @@ import org.apache.sqoop.connector.kite.configuration.ConfigUtil; import org.apache.sqoop.connector.kite.configuration.LinkConfiguration; import org.apache.sqoop.connector.kite.configuration.ToJobConfiguration; +import org.apache.sqoop.error.code.KiteConnectorError; import org.apache.sqoop.job.etl.Initializer; import org.apache.sqoop.job.etl.InitializerContext; import org.apache.sqoop.schema.NullSchema; diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/common/SqoopAvroUtils.java b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/common/SqoopAvroUtils.java index 5e6f238d..857271a1 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/common/SqoopAvroUtils.java +++ b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/common/SqoopAvroUtils.java @@ -21,7 +21,7 @@ import org.apache.sqoop.classification.InterfaceAudience; import org.apache.sqoop.classification.InterfaceStability; import org.apache.sqoop.common.SqoopException; -import org.apache.sqoop.connector.idf.IntermediateDataFormatError; +import org.apache.sqoop.error.code.IntermediateDataFormatError; import org.apache.sqoop.schema.type.AbstractComplexListType; import org.apache.sqoop.schema.type.Column; import org.apache.sqoop.schema.type.FixedPoint; diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/common/SqoopIDFUtils.java b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/common/SqoopIDFUtils.java index c5eb6a38..71641eda 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/common/SqoopIDFUtils.java +++ b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/common/SqoopIDFUtils.java @@ -20,8 +20,8 @@ import org.apache.sqoop.classification.InterfaceAudience; import org.apache.sqoop.classification.InterfaceStability; import org.apache.sqoop.common.SqoopException; -import org.apache.sqoop.connector.idf.CSVIntermediateDataFormatError; -import org.apache.sqoop.connector.idf.IntermediateDataFormatError; +import org.apache.sqoop.error.code.CSVIntermediateDataFormatError; +import org.apache.sqoop.error.code.IntermediateDataFormatError; import org.apache.sqoop.schema.type.AbstractComplexListType; import org.apache.sqoop.schema.type.Column; import org.apache.sqoop.schema.type.ColumnType; diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/AVROIntermediateDataFormat.java b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/AVROIntermediateDataFormat.java index 33505999..fef82026 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/AVROIntermediateDataFormat.java +++ b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/AVROIntermediateDataFormat.java @@ -36,6 +36,7 @@ import org.apache.sqoop.classification.InterfaceAudience; import org.apache.sqoop.classification.InterfaceStability; import org.apache.sqoop.common.SqoopException; +import org.apache.sqoop.error.code.IntermediateDataFormatError; import org.apache.sqoop.schema.type.Column; import org.apache.sqoop.utils.ClassUtils; import org.joda.time.LocalDate; diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/CSVIntermediateDataFormat.java b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/CSVIntermediateDataFormat.java index b716e793..c233fb25 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/CSVIntermediateDataFormat.java +++ b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/CSVIntermediateDataFormat.java @@ -24,6 +24,7 @@ import org.apache.sqoop.classification.InterfaceStability; import org.apache.log4j.Logger; import org.apache.sqoop.common.SqoopException; +import org.apache.sqoop.error.code.IntermediateDataFormatError; import org.apache.sqoop.schema.Schema; import org.apache.sqoop.schema.type.AbstractComplexListType; import org.apache.sqoop.schema.type.Column; diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/IntermediateDataFormat.java b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/IntermediateDataFormat.java index 8bcf8c30..f4cd044c 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/IntermediateDataFormat.java +++ b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/IntermediateDataFormat.java @@ -21,6 +21,7 @@ import org.apache.sqoop.classification.InterfaceAudience; import org.apache.sqoop.classification.InterfaceStability; import org.apache.sqoop.common.SqoopException; +import org.apache.sqoop.error.code.IntermediateDataFormatError; import org.apache.sqoop.schema.Schema; import org.apache.sqoop.utils.ClassUtils; import org.joda.time.DateTime; diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/JSONIntermediateDataFormat.java b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/JSONIntermediateDataFormat.java index 4c67c1ab..0fac41aa 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/JSONIntermediateDataFormat.java +++ b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/idf/JSONIntermediateDataFormat.java @@ -24,6 +24,8 @@ import org.apache.sqoop.classification.InterfaceAudience; import org.apache.sqoop.classification.InterfaceStability; import org.apache.sqoop.common.SqoopException; +import org.apache.sqoop.error.code.IntermediateDataFormatError; +import org.apache.sqoop.error.code.JSONIntermediateDataFormatError; import org.apache.sqoop.schema.Schema; import org.apache.sqoop.schema.type.Column; import org.apache.sqoop.utils.ClassUtils; diff --git a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/spi/ConnectorConfigurableUpgrader.java b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/spi/ConnectorConfigurableUpgrader.java index 55f8edbe..b5aa7b81 100644 --- a/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/spi/ConnectorConfigurableUpgrader.java +++ b/connector/connector-sdk/src/main/java/org/apache/sqoop/connector/spi/ConnectorConfigurableUpgrader.java @@ -21,7 +21,7 @@ import org.apache.sqoop.classification.InterfaceAudience; import org.apache.sqoop.classification.InterfaceStability; import org.apache.sqoop.common.SqoopException; -import org.apache.sqoop.configurable.ConfigurableError; +import org.apache.sqoop.error.code.ConfigurableError; import org.apache.sqoop.model.MFromConfig; import org.apache.sqoop.model.MLinkConfig; import org.apache.sqoop.model.MToConfig; diff --git a/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopInputFormat.java b/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopInputFormat.java index a562e020..db31ca40 100644 --- a/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopInputFormat.java +++ b/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopInputFormat.java @@ -32,7 +32,7 @@ import org.apache.sqoop.common.Direction; import org.apache.sqoop.common.PrefixContext; import org.apache.sqoop.common.SqoopException; -import org.apache.sqoop.job.MRExecutionError; +import org.apache.sqoop.error.code.MRExecutionError; import org.apache.sqoop.job.MRJobConstants; import org.apache.sqoop.job.etl.Partition; import org.apache.sqoop.job.etl.Partitioner; diff --git a/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopMapper.java b/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopMapper.java index dee00118..d6fe6afb 100644 --- a/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopMapper.java +++ b/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopMapper.java @@ -32,7 +32,7 @@ import org.apache.sqoop.connector.matcher.Matcher; import org.apache.sqoop.connector.matcher.MatcherFactory; import org.apache.sqoop.job.MRJobConstants; -import org.apache.sqoop.job.MRExecutionError; +import org.apache.sqoop.error.code.MRExecutionError; import org.apache.sqoop.common.PrefixContext; import org.apache.sqoop.job.etl.Extractor; import org.apache.sqoop.job.etl.ExtractorContext; diff --git a/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopOutputFormatLoadExecutor.java b/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopOutputFormatLoadExecutor.java index 58a9eed6..fc185867 100644 --- a/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopOutputFormatLoadExecutor.java +++ b/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopOutputFormatLoadExecutor.java @@ -37,7 +37,7 @@ import org.apache.sqoop.connector.matcher.Matcher; import org.apache.sqoop.connector.matcher.MatcherFactory; import org.apache.sqoop.job.MRJobConstants; -import org.apache.sqoop.job.MRExecutionError; +import org.apache.sqoop.error.code.MRExecutionError; import org.apache.sqoop.common.PrefixContext; import org.apache.sqoop.job.etl.Loader; import org.apache.sqoop.job.etl.LoaderContext; diff --git a/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopSplit.java b/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopSplit.java index c2f57563..b81f4d69 100644 --- a/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopSplit.java +++ b/execution/mapreduce/src/main/java/org/apache/sqoop/job/mr/SqoopSplit.java @@ -24,7 +24,7 @@ import org.apache.hadoop.io.Writable; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.sqoop.common.SqoopException; -import org.apache.sqoop.job.MRExecutionError; +import org.apache.sqoop.error.code.MRExecutionError; import org.apache.sqoop.job.etl.Partition; import org.apache.sqoop.utils.ClassUtils; diff --git a/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java b/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java index 5c9247ab..4feaee60 100644 --- a/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java +++ b/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java @@ -24,6 +24,7 @@ import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.common.SupportedDirections; import org.apache.sqoop.driver.Driver; +import org.apache.sqoop.error.code.CommonRepositoryError; import org.apache.sqoop.model.SubmissionError; import org.apache.sqoop.model.MBooleanInput; import org.apache.sqoop.model.MConfig; diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java index 3bef3c54..2f05fcb7 100644 --- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java +++ b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java @@ -44,6 +44,7 @@ import org.apache.sqoop.connector.ConnectorHandler; import org.apache.sqoop.connector.ConnectorManagerUtils; import org.apache.sqoop.driver.Driver; +import org.apache.sqoop.error.code.DerbyRepoError; import org.apache.sqoop.model.MConfigType; import org.apache.sqoop.model.MConfigurableType; import org.apache.sqoop.model.MDriver; diff --git a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestJobHandling.java b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestJobHandling.java index 458450bd..6a248e95 100644 --- a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestJobHandling.java +++ b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestJobHandling.java @@ -36,7 +36,7 @@ import org.apache.sqoop.model.MJob; import org.apache.sqoop.model.MMapInput; import org.apache.sqoop.model.MStringInput; -import org.apache.sqoop.repository.common.CommonRepositoryError; +import org.apache.sqoop.error.code.CommonRepositoryError; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestLinkHandling.java b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestLinkHandling.java index 5602c7c7..523464b3 100644 --- a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestLinkHandling.java +++ b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestLinkHandling.java @@ -31,7 +31,7 @@ import org.apache.sqoop.model.MLink; import org.apache.sqoop.model.MMapInput; import org.apache.sqoop.model.MStringInput; -import org.apache.sqoop.repository.common.CommonRepositoryError; +import org.apache.sqoop.error.code.CommonRepositoryError; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlRepositoryHandler.java b/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlRepositoryHandler.java index 4013d22c..85af9a49 100644 --- a/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlRepositoryHandler.java +++ b/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlRepositoryHandler.java @@ -23,6 +23,7 @@ import org.apache.log4j.Logger; import org.apache.sqoop.common.Direction; import org.apache.sqoop.common.SqoopException; +import org.apache.sqoop.error.code.PostgresqlRepoError; import org.apache.sqoop.repository.JdbcRepositoryContext; import org.apache.sqoop.repository.common.CommonRepoConstants; import org.apache.sqoop.repository.common.CommonRepositoryHandler; diff --git a/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java index ccf928eb..9a5d14bd 100644 --- a/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java @@ -35,7 +35,7 @@ import org.apache.sqoop.server.RequestContext; import org.apache.sqoop.server.RequestContext.Method; import org.apache.sqoop.server.RequestHandler; -import org.apache.sqoop.server.common.ServerError; +import org.apache.sqoop.error.code.ServerError; public class ConnectorRequestHandler implements RequestHandler { diff --git a/server/src/main/java/org/apache/sqoop/handler/DriverRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/DriverRequestHandler.java index 81efb896..2409df46 100644 --- a/server/src/main/java/org/apache/sqoop/handler/DriverRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/DriverRequestHandler.java @@ -26,7 +26,7 @@ import org.apache.sqoop.server.RequestContext; import org.apache.sqoop.server.RequestHandler; import org.apache.sqoop.server.RequestContext.Method; -import org.apache.sqoop.server.common.ServerError; +import org.apache.sqoop.error.code.ServerError; public class DriverRequestHandler implements RequestHandler { diff --git a/server/src/main/java/org/apache/sqoop/handler/HandlerUtils.java b/server/src/main/java/org/apache/sqoop/handler/HandlerUtils.java index 93ff60b0..7579b44d 100644 --- a/server/src/main/java/org/apache/sqoop/handler/HandlerUtils.java +++ b/server/src/main/java/org/apache/sqoop/handler/HandlerUtils.java @@ -20,7 +20,7 @@ import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.connector.ConnectorManager; import org.apache.sqoop.repository.Repository; -import org.apache.sqoop.server.common.ServerError; +import org.apache.sqoop.error.code.ServerError; public class HandlerUtils { diff --git a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java index f4482cee..7a6ee2b6 100644 --- a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java @@ -48,7 +48,7 @@ import org.apache.sqoop.request.HttpEventContext; import org.apache.sqoop.server.RequestContext; import org.apache.sqoop.server.RequestHandler; -import org.apache.sqoop.server.common.ServerError; +import org.apache.sqoop.error.code.ServerError; import org.apache.sqoop.validation.ConfigValidationResult; import org.apache.sqoop.validation.Status; import org.json.simple.JSONObject; diff --git a/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java index 74fa321a..026d9ee5 100644 --- a/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java @@ -40,7 +40,7 @@ import org.apache.sqoop.repository.RepositoryManager; import org.apache.sqoop.server.RequestContext; import org.apache.sqoop.server.RequestHandler; -import org.apache.sqoop.server.common.ServerError; +import org.apache.sqoop.error.code.ServerError; import org.apache.sqoop.validation.ConfigValidationResult; import org.json.simple.JSONObject; diff --git a/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java index a0b29c86..5c788ce0 100644 --- a/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java @@ -30,7 +30,7 @@ import org.apache.sqoop.server.RequestContext; import org.apache.sqoop.server.RequestContext.Method; import org.apache.sqoop.server.RequestHandler; -import org.apache.sqoop.server.common.ServerError; +import org.apache.sqoop.error.code.ServerError; public class SubmissionRequestHandler implements RequestHandler { diff --git a/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java index 2eaa0ac2..f78d7a5a 100644 --- a/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java @@ -26,7 +26,7 @@ import org.apache.sqoop.server.RequestContext; import org.apache.sqoop.server.RequestContext.Method; import org.apache.sqoop.server.RequestHandler; -import org.apache.sqoop.server.common.ServerError; +import org.apache.sqoop.error.code.ServerError; /** * Version request handler is supporting following resources: * diff --git a/server/src/main/java/org/apache/sqoop/server/RequestContext.java b/server/src/main/java/org/apache/sqoop/server/RequestContext.java index 5324a0a0..c661b713 100644 --- a/server/src/main/java/org/apache/sqoop/server/RequestContext.java +++ b/server/src/main/java/org/apache/sqoop/server/RequestContext.java @@ -21,7 +21,7 @@ import org.apache.hadoop.security.token.delegation.web.HttpUserGroupInformation; import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.security.AuthenticationManager; -import org.apache.sqoop.server.common.ServerError; +import org.apache.sqoop.error.code.ServerError; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java b/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java index d15bcfca..f2493182 100644 --- a/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java +++ b/submission/mapreduce/src/main/java/org/apache/sqoop/submission/mapreduce/MapreduceSubmissionEngine.java @@ -39,6 +39,7 @@ import org.apache.sqoop.common.MapContext; import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.driver.SubmissionEngine; +import org.apache.sqoop.error.code.MapreduceSubmissionError; import org.apache.sqoop.execution.mapreduce.MRJobRequest; import org.apache.sqoop.execution.mapreduce.MapreduceExecutionEngine; import org.apache.sqoop.driver.JobRequest;