Refacrtored the code in database-commons to resolve a package name conflict with hydrator-common (#357)

Author: MrRahulSharma

aurora-mysql-plugin/pom.xml

@@ -99,8 +99,8 @@
           <instructions>
             <_exportcontents>
               io.cdap.plugin.auroradb.mysql.*;
-              io.cdap.plugin.db.batch.source.*;
-              io.cdap.plugin.db.batch.sink.*;
+              io.cdap.plugin.db.source.*;
+              io.cdap.plugin.db.sink.*;
               org.apache.commons.lang;
               org.apache.commons.logging.*;
               org.codehaus.jackson.*

aurora-mysql-plugin/src/main/java/io/cdap/plugin/auroradb/mysql/AuroraMysqlAction.java

@@ -21,8 +21,8 @@
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.cdap.api.annotation.Plugin;
 import io.cdap.cdap.etl.api.action.Action;
-import io.cdap.plugin.db.batch.action.AbstractDBAction;
-import io.cdap.plugin.db.batch.config.DBSpecificQueryConfig;
+import io.cdap.plugin.db.action.AbstractDBAction;
+import io.cdap.plugin.db.config.DBSpecificQueryConfig;
 
 import java.util.Map;
 import javax.annotation.Nullable;

aurora-mysql-plugin/src/main/java/io/cdap/plugin/auroradb/mysql/AuroraMysqlPostAction.java

@@ -21,8 +21,8 @@
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.cdap.api.annotation.Plugin;
 import io.cdap.cdap.etl.api.batch.PostAction;
-import io.cdap.plugin.db.batch.action.AbstractQueryAction;
-import io.cdap.plugin.db.batch.config.DBSpecificQueryActionConfig;
+import io.cdap.plugin.db.action.AbstractQueryAction;
+import io.cdap.plugin.db.config.DBSpecificQueryActionConfig;
 
 import java.util.Map;
 import javax.annotation.Nullable;

aurora-mysql-plugin/src/main/java/io/cdap/plugin/auroradb/mysql/AuroraMysqlSink.java

@@ -21,8 +21,8 @@
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.cdap.api.annotation.Plugin;
 import io.cdap.cdap.etl.api.batch.BatchSink;
-import io.cdap.plugin.db.batch.config.DBSpecificSinkConfig;
-import io.cdap.plugin.db.batch.sink.AbstractDBSink;
+import io.cdap.plugin.db.config.DBSpecificSinkConfig;
+import io.cdap.plugin.db.sink.AbstractDBSink;
 
 import java.util.Map;
 import javax.annotation.Nullable;

aurora-mysql-plugin/src/main/java/io/cdap/plugin/auroradb/mysql/AuroraMysqlSource.java

@@ -21,8 +21,8 @@
 import io.cdap.cdap.api.annotation.Name;
 import io.cdap.cdap.api.annotation.Plugin;
 import io.cdap.cdap.etl.api.batch.BatchSource;
-import io.cdap.plugin.db.batch.config.DBSpecificSourceConfig;
-import io.cdap.plugin.db.batch.source.AbstractDBSource;
+import io.cdap.plugin.db.config.DBSpecificSourceConfig;
+import io.cdap.plugin.db.source.AbstractDBSource;
 
 import java.util.Map;
 import javax.annotation.Nullable;

aurora-mysql-plugin/src/test/java/io/cdap/plugin/aurora/mysql/AuroraAuroraMysqlActionTestRun.java

@@ -28,7 +28,7 @@
 import io.cdap.cdap.proto.id.NamespaceId;
 import io.cdap.cdap.test.ApplicationManager;
 import io.cdap.plugin.auroradb.mysql.AuroraMysqlConstants;
-import io.cdap.plugin.db.batch.action.QueryConfig;
+import io.cdap.plugin.db.action.QueryConfig;
 import org.junit.Assert;
 import org.junit.Test;
 

aurora-mysql-plugin/src/test/java/io/cdap/plugin/aurora/mysql/AuroraMysqlPluginTestBase.java

@@ -31,8 +31,8 @@
 import io.cdap.plugin.db.ConnectionConfig;
 import io.cdap.plugin.db.DBRecord;
 import io.cdap.plugin.db.batch.DatabasePluginTestBase;
-import io.cdap.plugin.db.batch.sink.ETLDBOutputFormat;
-import io.cdap.plugin.db.batch.source.DataDrivenETLDBInputFormat;
+import io.cdap.plugin.db.sink.ETLDBOutputFormat;
+import io.cdap.plugin.db.source.DataDrivenETLDBInputFormat;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.slf4j.Logger;

aurora-mysql-plugin/src/test/java/io/cdap/plugin/aurora/mysql/AuroraMysqlPostActionTestRun.java

@@ -30,8 +30,8 @@
 import io.cdap.plugin.auroradb.mysql.AuroraMysqlConstants;
 import io.cdap.plugin.common.batch.action.Condition;
 import io.cdap.plugin.db.ConnectionConfig;
-import io.cdap.plugin.db.batch.action.QueryActionConfig;
-import io.cdap.plugin.db.batch.action.QueryConfig;
+import io.cdap.plugin.db.action.QueryActionConfig;
+import io.cdap.plugin.db.action.QueryConfig;
 import org.junit.Assert;
 import org.junit.Test;
 

aurora-mysql-plugin/src/test/java/io/cdap/plugin/aurora/mysql/AuroraMysqlSinkTestRun.java

@@ -29,7 +29,7 @@
 import io.cdap.cdap.test.DataSetManager;
 import io.cdap.plugin.auroradb.mysql.AuroraMysqlConstants;
 import io.cdap.plugin.common.Constants;
-import io.cdap.plugin.db.batch.sink.AbstractDBSink;
+import io.cdap.plugin.db.sink.AbstractDBSink;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

aurora-mysql-plugin/src/test/java/io/cdap/plugin/aurora/mysql/AuroraMysqlSourceTestRun.java

@@ -33,7 +33,7 @@
 import io.cdap.plugin.auroradb.mysql.AuroraMysqlConstants;
 import io.cdap.plugin.common.Constants;
 import io.cdap.plugin.db.ConnectionConfig;
-import io.cdap.plugin.db.batch.source.AbstractDBSource;
+import io.cdap.plugin.db.source.AbstractDBSource;
 import org.junit.Assert;
 import org.junit.Test;