From d68737ecfdefe110b8ac68afe349058cc6579072 Mon Sep 17 00:00:00 2001 From: Abraham Elmahrek Date: Mon, 23 Mar 2015 15:24:55 -0700 Subject: [PATCH] SQOOP-2251: Sqoop2: ErrorCodes: Move RepositoryError to core module (Jarek Jarcec Cecho via Abraham Elmahrek) --- .../main/java/org/apache/sqoop/repository/JdbcRepository.java | 2 -- .../java/org/apache/sqoop/repository/JdbcRepositoryContext.java | 1 - .../org/apache/sqoop/repository/JdbcRepositoryProvider.java | 1 - .../org/apache/sqoop/repository/JdbcRepositoryTransaction.java | 1 - core/src/main/java/org/apache/sqoop/repository/Repository.java | 1 - .../main/java/org/apache/sqoop/repository}/RepositoryError.java | 2 +- .../java/org/apache/sqoop/repository/RepositoryManager.java | 1 - .../java/org/apache/sqoop/repository/TestJdbcRepository.java | 1 - .../java/org/apache/sqoop/repository/TestRepositoryManager.java | 1 - 9 files changed, 1 insertion(+), 10 deletions(-) rename {common/src/main/java/org/apache/sqoop/error/code => core/src/main/java/org/apache/sqoop/repository}/RepositoryError.java (99%) diff --git a/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java b/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java index 052adba4..c09b77bb 100644 --- a/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java +++ b/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java @@ -23,12 +23,10 @@ import org.apache.log4j.Logger; import org.apache.sqoop.common.SqoopException; -import org.apache.sqoop.error.code.RepositoryError; import org.apache.sqoop.model.MConfig; import org.apache.sqoop.model.MConfigUpdateEntityType; import org.apache.sqoop.model.MConnector; import org.apache.sqoop.model.MDriver; -import org.apache.sqoop.model.MInput; import org.apache.sqoop.model.MJob; import org.apache.sqoop.model.MLink; import org.apache.sqoop.model.MSubmission; diff --git a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java index 99cd4ee3..0a8139aa 100644 --- a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java +++ b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.common.MapContext; -import org.apache.sqoop.error.code.RepositoryError; public final class JdbcRepositoryContext { diff --git a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java index 56b859e1..011527f3 100644 --- a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java +++ b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java @@ -35,7 +35,6 @@ import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.common.MapContext; import org.apache.sqoop.core.SqoopConfiguration; -import org.apache.sqoop.error.code.RepositoryError; import org.apache.sqoop.utils.ClassUtils; diff --git a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java index bc7c3168..86be30ff 100644 --- a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java +++ b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java @@ -26,7 +26,6 @@ import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.sqoop.common.SqoopException; -import org.apache.sqoop.error.code.RepositoryError; public class JdbcRepositoryTransaction implements RepositoryTransaction { diff --git a/core/src/main/java/org/apache/sqoop/repository/Repository.java b/core/src/main/java/org/apache/sqoop/repository/Repository.java index ceedc5d5..aa91661f 100644 --- a/core/src/main/java/org/apache/sqoop/repository/Repository.java +++ b/core/src/main/java/org/apache/sqoop/repository/Repository.java @@ -30,7 +30,6 @@ import org.apache.sqoop.connector.spi.SqoopConnector; import org.apache.sqoop.driver.Driver; import org.apache.sqoop.driver.DriverUpgrader; -import org.apache.sqoop.error.code.RepositoryError; import org.apache.sqoop.json.DriverBean; import org.apache.sqoop.model.ConfigUtils; import org.apache.sqoop.model.MConfig; diff --git a/common/src/main/java/org/apache/sqoop/error/code/RepositoryError.java b/core/src/main/java/org/apache/sqoop/repository/RepositoryError.java similarity index 99% rename from common/src/main/java/org/apache/sqoop/error/code/RepositoryError.java rename to core/src/main/java/org/apache/sqoop/repository/RepositoryError.java index fb8d9c51..f684e85f 100644 --- a/common/src/main/java/org/apache/sqoop/error/code/RepositoryError.java +++ b/core/src/main/java/org/apache/sqoop/repository/RepositoryError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.error.code; +package org.apache.sqoop.repository; import org.apache.sqoop.common.ErrorCode; diff --git a/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java b/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java index 8015216a..121f388d 100644 --- a/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java +++ b/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java @@ -25,7 +25,6 @@ import org.apache.sqoop.core.Reconfigurable; import org.apache.sqoop.core.SqoopConfiguration; import org.apache.sqoop.core.SqoopConfiguration.CoreConfigurationListener; -import org.apache.sqoop.error.code.RepositoryError; import org.apache.sqoop.utils.ClassUtils; public class RepositoryManager implements Reconfigurable { diff --git a/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java b/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java index 1c97c321..9b153fc5 100644 --- a/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java +++ b/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java @@ -47,7 +47,6 @@ import org.apache.sqoop.connector.spi.SqoopConnector; import org.apache.sqoop.driver.Driver; import org.apache.sqoop.driver.DriverUpgrader; -import org.apache.sqoop.error.code.RepositoryError; import org.apache.sqoop.json.DriverBean; import org.apache.sqoop.model.ConfigUtils; import org.apache.sqoop.model.ConfigurationClass; diff --git a/core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java b/core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java index ba535529..95b868a9 100644 --- a/core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java +++ b/core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java @@ -24,7 +24,6 @@ import org.apache.sqoop.core.PropertiesConfigurationProvider; import org.apache.sqoop.core.SqoopConfiguration; import org.apache.sqoop.core.TestUtils; -import org.apache.sqoop.error.code.RepositoryError; import org.testng.Assert; import org.testng.annotations.Test;