SQOOP-2172: Sqoop2: Move ErrorCode's sub-class from sqoop-core to sqoop-common

(Richard Zhou via Abraham Elmahrek)

common/src/main/java/org/apache/sqoop/error/code/AuditLoggerError.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sqoop.audit;
+package org.apache.sqoop.error.code;
 
 import org.apache.sqoop.common.ErrorCode;
 

common/src/main/java/org/apache/sqoop/error/code/ConnectorError.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sqoop.connector;
+package org.apache.sqoop.error.code;
 
 import org.apache.sqoop.common.ErrorCode;
 

common/src/main/java/org/apache/sqoop/error/code/CoreError.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sqoop.core;
+package org.apache.sqoop.error.code;
 
 import org.apache.sqoop.common.ErrorCode;
 

common/src/main/java/org/apache/sqoop/error/code/DriverError.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sqoop.driver;
+package org.apache.sqoop.error.code;
 
 import org.apache.sqoop.common.ErrorCode;
 

common/src/main/java/org/apache/sqoop/error/code/RepositoryError.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sqoop.repository;
+package org.apache.sqoop.error.code;
 
 import org.apache.sqoop.common.ErrorCode;
 

common/src/main/java/org/apache/sqoop/error/code/SecurityError.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sqoop.security;
+package org.apache.sqoop.error.code;
 
 import org.apache.sqoop.common.ErrorCode;
 

core/src/main/java/org/apache/sqoop/audit/AuditLoggerManager.java

@@ -23,6 +23,7 @@
 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.AuditLoggerError;
 import org.apache.sqoop.utils.ClassUtils;
 
 import java.util.ArrayList;

core/src/main/java/org/apache/sqoop/audit/FileAuditLogger.java

@@ -23,6 +23,7 @@
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.sqoop.common.SqoopException;
+import org.apache.sqoop.error.code.AuditLoggerError;
 
 public class FileAuditLogger extends AuditLogger {
 

core/src/main/java/org/apache/sqoop/connector/ConnectorHandler.java

@@ -26,6 +26,7 @@
 import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.connector.spi.SqoopConnector;
 import org.apache.sqoop.core.ConfigurationConstants;
+import org.apache.sqoop.error.code.ConnectorError;
 import org.apache.sqoop.model.ConfigUtils;
 import org.apache.sqoop.model.MConnector;
 import org.apache.sqoop.model.MFromConfig;

core/src/main/java/org/apache/sqoop/connector/ConnectorManager.java

@@ -35,6 +35,7 @@
 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.ConnectorError;
 import org.apache.sqoop.model.MConnector;
 import org.apache.sqoop.repository.Repository;
 import org.apache.sqoop.repository.RepositoryManager;

core/src/main/java/org/apache/sqoop/connector/ConnectorManagerUtils.java

@@ -20,6 +20,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.core.ConfigurationConstants;
+import org.apache.sqoop.error.code.ConnectorError;
 
 import java.io.File;
 import java.io.IOException;

core/src/main/java/org/apache/sqoop/core/PropertiesConfigurationProvider.java

@@ -31,6 +31,8 @@
 
 import org.apache.log4j.Logger;
 import org.apache.sqoop.common.SqoopException;
+import org.apache.sqoop.error.code.CoreError;
+
 import static org.apache.sqoop.core.ConfigurationConstants.PROPERTIES_PROVIDER_SLEEP;
 
 public class PropertiesConfigurationProvider implements ConfigurationProvider {

core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java

@@ -28,6 +28,7 @@
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.sqoop.common.MapContext;
 import org.apache.sqoop.common.SqoopException;
+import org.apache.sqoop.error.code.CoreError;
 
 /**
  * Configuration manager that loads Sqoop configuration.

core/src/main/java/org/apache/sqoop/driver/JobManager.java

@@ -31,6 +31,7 @@
 import org.apache.sqoop.core.SqoopConfiguration;
 import org.apache.sqoop.core.SqoopConfiguration.CoreConfigurationListener;
 import org.apache.sqoop.driver.configuration.JobConfiguration;
+import org.apache.sqoop.error.code.DriverError;
 import org.apache.sqoop.job.etl.Destroyer;
 import org.apache.sqoop.job.etl.DestroyerContext;
 import org.apache.sqoop.job.etl.Initializer;

core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java

@@ -23,6 +23,7 @@
 
 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;

core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java

@@ -25,6 +25,7 @@
 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 {

core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java

@@ -35,6 +35,7 @@
 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;
 
 

core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java

@@ -26,6 +26,7 @@
 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 {
 

core/src/main/java/org/apache/sqoop/repository/Repository.java

@@ -30,6 +30,7 @@
 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;

core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java

@@ -25,6 +25,7 @@
 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 {

core/src/main/java/org/apache/sqoop/security/SecurityFactory.java

@@ -18,6 +18,7 @@
 package org.apache.sqoop.security;
 
 import org.apache.sqoop.common.SqoopException;
+import org.apache.sqoop.error.code.SecurityError;
 import org.apache.sqoop.utils.ClassUtils;
 
 /**

core/src/test/java/org/apache/sqoop/core/TestSqoopConfiguration.java

@@ -20,6 +20,7 @@
 import java.util.Properties;
 
 import org.apache.sqoop.common.SqoopException;
+import org.apache.sqoop.error.code.CoreError;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

core/src/test/java/org/apache/sqoop/driver/TestJobManager.java

@@ -31,6 +31,7 @@
 import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.connector.ConnectorManager;
 import org.apache.sqoop.connector.spi.SqoopConnector;
+import org.apache.sqoop.error.code.DriverError;
 import org.apache.sqoop.model.MJob;
 import org.apache.sqoop.model.MLink;
 import org.apache.sqoop.model.MSubmission;

core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java

@@ -47,6 +47,7 @@
 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;

core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java

@@ -24,6 +24,7 @@
 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;
 

security/src/main/java/org/apache/sqoop/security/Authentication/KerberosAuthenticationHandler.java

@@ -26,7 +26,7 @@
 import org.apache.sqoop.core.SqoopConfiguration;
 import org.apache.sqoop.security.AuthenticationHandler;
 import org.apache.sqoop.security.SecurityConstants;
-import org.apache.sqoop.security.SecurityError;
+import org.apache.sqoop.error.code.SecurityError;
 
 import java.io.IOException;
 

security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthenticationProvider.java

@@ -22,7 +22,7 @@
 import org.apache.hadoop.security.token.delegation.web.HttpUserGroupInformation;
 import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.security.AuthenticationProvider;
-import org.apache.sqoop.security.SecurityError;
+import org.apache.sqoop.error.code.SecurityError;
 
 public class DefaultAuthenticationProvider extends AuthenticationProvider {
 

server/src/main/java/org/apache/sqoop/filter/SqoopAuthenticationFilter.java

@@ -29,7 +29,7 @@
 import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.core.SqoopConfiguration;
 import org.apache.sqoop.security.SecurityConstants;
-import org.apache.sqoop.security.SecurityError;
+import org.apache.sqoop.error.code.SecurityError;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;

server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java

@@ -28,7 +28,7 @@
 import org.apache.sqoop.model.MRole;
 import org.apache.sqoop.security.AuthorizationHandler;
 import org.apache.sqoop.security.AuthorizationManager;
-import org.apache.sqoop.security.SecurityError;
+import org.apache.sqoop.error.code.SecurityError;
 import org.apache.sqoop.server.RequestContext;
 import org.apache.sqoop.server.RequestHandler;
 import org.json.simple.JSONObject;

server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java

@@ -30,7 +30,7 @@
 import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.common.SqoopProtocolConstants;
 import org.apache.sqoop.common.SqoopResponseCode;
-import org.apache.sqoop.core.CoreError;
+import org.apache.sqoop.error.code.CoreError;
 import org.apache.sqoop.json.JsonBean;
 
 @SuppressWarnings("serial")

test/src/test/java/org/apache/sqoop/integration/server/SubmissionWithDisabledModelObjectsTest.java

@@ -21,7 +21,7 @@
 import org.apache.sqoop.common.Direction;
 import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.connector.hdfs.configuration.ToFormat;
-import org.apache.sqoop.driver.DriverError;
+import org.apache.sqoop.error.code.DriverError;
 import org.apache.sqoop.model.MLink;
 import org.apache.sqoop.model.MConfigList;
 import org.apache.sqoop.model.MJob;