Repository: sqoop Updated Branches: refs/heads/sqoop2 486af80f4 -> 015bb94d4
SQOOP-1874: Sqoop2: ConfigurableError should be in the configurable package (Veena Basavaraj via Abraham Elmahrek) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/015bb94d Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/015bb94d Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/015bb94d Branch: refs/heads/sqoop2 Commit: 015bb94d4e5a7f3a4ac3301e77ca51658afbff65 Parents: 486af80 Author: Abraham Elmahrek <[email protected]> Authored: Wed Dec 10 16:56:06 2014 -0600 Committer: Abraham Elmahrek <[email protected]> Committed: Wed Dec 10 16:56:06 2014 -0600 ---------------------------------------------------------------------- .../sqoop/configurable/ConfigurableError.java | 43 ++++++++++++++++++++ .../sqoop/connector/ConfigurableError.java | 43 -------------------- .../spi/ConnectorConfigurableUpgrader.java | 2 +- 3 files changed, 44 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/015bb94d/spi/src/main/java/org/apache/sqoop/configurable/ConfigurableError.java ---------------------------------------------------------------------- diff --git a/spi/src/main/java/org/apache/sqoop/configurable/ConfigurableError.java b/spi/src/main/java/org/apache/sqoop/configurable/ConfigurableError.java new file mode 100644 index 0000000..83ed4a5 --- /dev/null +++ b/spi/src/main/java/org/apache/sqoop/configurable/ConfigurableError.java @@ -0,0 +1,43 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sqoop.configurable; + +import org.apache.sqoop.common.ErrorCode; + +public enum ConfigurableError implements ErrorCode { + + /** An unknown error has occurred. */ + CONFIGURABLE_0001("Link object upgrade called, but no upgrade routine provided for LINK config"), + CONFIGURABLE_0002("Job object upgrade called, but no upgrade routine provided for FROM job config"), + CONFIGURABLE_0003("Job object upgrade called, but no upgrade routine provided for TO job config"), + ; + private final String message; + + private ConfigurableError(String message) { + this.message = message; + } + + public String getCode() { + return name(); + } + + public String getMessage() { + return message; + } +} + http://git-wip-us.apache.org/repos/asf/sqoop/blob/015bb94d/spi/src/main/java/org/apache/sqoop/connector/ConfigurableError.java ---------------------------------------------------------------------- diff --git a/spi/src/main/java/org/apache/sqoop/connector/ConfigurableError.java b/spi/src/main/java/org/apache/sqoop/connector/ConfigurableError.java deleted file mode 100644 index 4d34691..0000000 --- a/spi/src/main/java/org/apache/sqoop/connector/ConfigurableError.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sqoop.connector; - -import org.apache.sqoop.common.ErrorCode; - -public enum ConfigurableError implements ErrorCode { - - /** An unknown error has occurred. */ - CONFIGURABLE_0001("Link object upgrade called, but no upgrade routine provided for LINK config"), - CONFIGURABLE_0002("Job object upgrade called, but no upgrade routine provided for FROM job config"), - CONFIGURABLE_0003("Job object upgrade called, but no upgrade routine provided for TO job config"), - ; - private final String message; - - private ConfigurableError(String message) { - this.message = message; - } - - public String getCode() { - return name(); - } - - public String getMessage() { - return message; - } -} - http://git-wip-us.apache.org/repos/asf/sqoop/blob/015bb94d/spi/src/main/java/org/apache/sqoop/connector/spi/ConnectorConfigurableUpgrader.java ---------------------------------------------------------------------- diff --git a/spi/src/main/java/org/apache/sqoop/connector/spi/ConnectorConfigurableUpgrader.java b/spi/src/main/java/org/apache/sqoop/connector/spi/ConnectorConfigurableUpgrader.java index a112309..b5e0c0d 100644 --- a/spi/src/main/java/org/apache/sqoop/connector/spi/ConnectorConfigurableUpgrader.java +++ b/spi/src/main/java/org/apache/sqoop/connector/spi/ConnectorConfigurableUpgrader.java @@ -19,7 +19,7 @@ package org.apache.sqoop.connector.spi; import org.apache.sqoop.common.SqoopException; -import org.apache.sqoop.connector.ConfigurableError; +import org.apache.sqoop.configurable.ConfigurableError; import org.apache.sqoop.model.MFromConfig; import org.apache.sqoop.model.MLinkConfig; import org.apache.sqoop.model.MToConfig;
