From b69f4aca3b55ba556e97cb38d53ecc67f756e287 Mon Sep 17 00:00:00 2001 From: Jarek Jarcec Cecho Date: Mon, 18 Aug 2014 19:20:09 -0700 Subject: [PATCH] SQOOP-1447: Sqoop2: From/To: Change DirectionError messages (Abraham Elmahrek via Jarek Jarcec Cecho) --- .../apache/sqoop/common/DirectionError.java | 2 +- .../apache/sqoop/json/JobValidationBean.java | 2 +- .../org/apache/sqoop/model/MConnector.java | 2 +- .../main/java/org/apache/sqoop/model/MJob.java | 6 +++--- .../sqoop/framework/SubmissionRequest.java | 18 +++++++++--------- .../derby/DerbyRepositoryHandler.java | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/common/src/main/java/org/apache/sqoop/common/DirectionError.java b/common/src/main/java/org/apache/sqoop/common/DirectionError.java index d8d076ca..288c9544 100644 --- a/common/src/main/java/org/apache/sqoop/common/DirectionError.java +++ b/common/src/main/java/org/apache/sqoop/common/DirectionError.java @@ -20,7 +20,7 @@ public enum DirectionError implements ErrorCode { /** An unknown error has occurred. */ - CONNECTOR_TYPE_0000("Unknown connector type") + DIRECTION_0000("Unknown direction") ; diff --git a/common/src/main/java/org/apache/sqoop/json/JobValidationBean.java b/common/src/main/java/org/apache/sqoop/json/JobValidationBean.java index eb1d7415..34c0a4b2 100644 --- a/common/src/main/java/org/apache/sqoop/json/JobValidationBean.java +++ b/common/src/main/java/org/apache/sqoop/json/JobValidationBean.java @@ -72,7 +72,7 @@ public Validation getConnectorValidation(Direction type) { return toConnectorValidation; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } diff --git a/common/src/main/java/org/apache/sqoop/model/MConnector.java b/common/src/main/java/org/apache/sqoop/model/MConnector.java index 3c95da96..335a0cc1 100644 --- a/common/src/main/java/org/apache/sqoop/model/MConnector.java +++ b/common/src/main/java/org/apache/sqoop/model/MConnector.java @@ -128,7 +128,7 @@ public MJobForms getJobForms(Direction type) { return toJobForms; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } diff --git a/common/src/main/java/org/apache/sqoop/model/MJob.java b/common/src/main/java/org/apache/sqoop/model/MJob.java index 813e8c18..3835113f 100644 --- a/common/src/main/java/org/apache/sqoop/model/MJob.java +++ b/common/src/main/java/org/apache/sqoop/model/MJob.java @@ -142,7 +142,7 @@ public long getConnectionId(Direction type) { return toConnectionId; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } @@ -155,7 +155,7 @@ public long getConnectorId(Direction type) { return toConnectorId; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } @@ -168,7 +168,7 @@ public MJobForms getConnectorPart(Direction type) { return toConnectorPart; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } diff --git a/core/src/main/java/org/apache/sqoop/framework/SubmissionRequest.java b/core/src/main/java/org/apache/sqoop/framework/SubmissionRequest.java index 30dc5b2c..be6099ec 100644 --- a/core/src/main/java/org/apache/sqoop/framework/SubmissionRequest.java +++ b/core/src/main/java/org/apache/sqoop/framework/SubmissionRequest.java @@ -168,7 +168,7 @@ public SqoopConnector getConnector(Direction type) { return toConnector; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } @@ -181,7 +181,7 @@ public void setConnector(Direction type, SqoopConnector connector) { toConnector = connector; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } @@ -230,7 +230,7 @@ public Object getConnectorConnectionConfig(Direction type) { return toConnectorConnectionConfig; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } @@ -243,7 +243,7 @@ public void setConnectorConnectionConfig(Direction type, Object config) { toConnectorConnectionConfig = config; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } @@ -256,7 +256,7 @@ public Object getConnectorJobConfig(Direction type) { return toConnectorJobConfig; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } @@ -269,7 +269,7 @@ public void setConnectorJobConfig(Direction type, Object config) { toConnectorJobConfig = config; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } @@ -282,7 +282,7 @@ public Object getFrameworkConnectionConfig(Direction type) { return toFrameworkConnectionConfig; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } @@ -295,7 +295,7 @@ public void setFrameworkConnectionConfig(Direction type, Object config) { toFrameworkConnectionConfig = config; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } @@ -316,7 +316,7 @@ public MutableMapContext getConnectorContext(Direction type) { return toConnectorContext; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } 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 3af84d71..f355ceb6 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 @@ -2167,7 +2167,7 @@ public void loadConnectorForms(List connectionForms, break; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } if (jobForms.size() != formIndex) {