Repository: sqoop Updated Branches: refs/heads/SQOOP-1367 a41ce9e51 -> 5f04f5307
SQOOP-1447: Sqoop2: From/To: Change DirectionError messages (Abraham Elmahrek via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/5f04f530 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/5f04f530 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/5f04f530 Branch: refs/heads/SQOOP-1367 Commit: 5f04f5307c20c76f69bd8a5a91314511672a978f Parents: a41ce9e Author: Jarek Jarcec Cecho <[email protected]> Authored: Mon Aug 18 19:20:09 2014 -0700 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Mon Aug 18 19:20:09 2014 -0700 ---------------------------------------------------------------------- .../org/apache/sqoop/common/DirectionError.java | 2 +- .../org/apache/sqoop/json/JobValidationBean.java | 2 +- .../java/org/apache/sqoop/model/MConnector.java | 2 +- .../main/java/org/apache/sqoop/model/MJob.java | 6 +++--- .../apache/sqoop/framework/SubmissionRequest.java | 18 +++++++++--------- .../repository/derby/DerbyRepositoryHandler.java | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/5f04f530/common/src/main/java/org/apache/sqoop/common/DirectionError.java ---------------------------------------------------------------------- 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 d8d076c..288c954 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 @@ package org.apache.sqoop.common; public enum DirectionError implements ErrorCode { /** An unknown error has occurred. */ - CONNECTOR_TYPE_0000("Unknown connector type") + DIRECTION_0000("Unknown direction") ; http://git-wip-us.apache.org/repos/asf/sqoop/blob/5f04f530/common/src/main/java/org/apache/sqoop/json/JobValidationBean.java ---------------------------------------------------------------------- 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 eb1d741..34c0a4b 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 class JobValidationBean implements JsonBean { return toConnectorValidation; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/5f04f530/common/src/main/java/org/apache/sqoop/model/MConnector.java ---------------------------------------------------------------------- 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 3c95da9..335a0cc 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 final class MConnector extends MPersistableEntity implements MClonable { return toJobForms; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/5f04f530/common/src/main/java/org/apache/sqoop/model/MJob.java ---------------------------------------------------------------------- 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 813e8c1..3835113 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 class MJob extends MAccountableEntity implements MClonable { 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 class MJob extends MAccountableEntity implements MClonable { 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 class MJob extends MAccountableEntity implements MClonable { return toConnectorPart; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/5f04f530/core/src/main/java/org/apache/sqoop/framework/SubmissionRequest.java ---------------------------------------------------------------------- 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 30dc5b2..be6099e 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 class SubmissionRequest { 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 class SubmissionRequest { 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 class SubmissionRequest { 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 class SubmissionRequest { 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 class SubmissionRequest { 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 class SubmissionRequest { 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 class SubmissionRequest { 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 class SubmissionRequest { 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 class SubmissionRequest { return toConnectorContext; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/5f04f530/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java ---------------------------------------------------------------------- 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 3af84d7..f355ceb 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 class DerbyRepositoryHandler extends JdbcRepositoryHandler { break; default: - throw new SqoopException(DirectionError.CONNECTOR_TYPE_0000, "Connector type: " + type); + throw new SqoopException(DirectionError.DIRECTION_0000, "Direction: " + type); } if (jobForms.size() != formIndex) {
