Merge pull request ibm-messaging#23 from ibm-messaging/22-simplify-pa…

…ckage-structure flattened packages
airazabal · Apr 20, 2020 · 9817430 · 9817430
2 parents f3cda0a + 82e82eb
commit 9817430
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 27 deletions.
diff --git a/...connect/jdbcsink/sink/JDBCSinkConfig.java → ...eams/connect/jdbcsink/JDBCSinkConfig.java b/...connect/jdbcsink/sink/JDBCSinkConfig.java → ...eams/connect/jdbcsink/JDBCSinkConfig.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.ibm.eventstreams.connect.jdbcsink.sink;
+package com.ibm.eventstreams.connect.jdbcsink;
 
 import org.apache.kafka.common.config.AbstractConfig;
 import org.apache.kafka.common.config.ConfigDef;

diff --git a/src/main/java/com/ibm/eventstreams/connect/jdbcsink/JDBCSinkConnector.java b/src/main/java/com/ibm/eventstreams/connect/jdbcsink/JDBCSinkConnector.java
@@ -18,8 +18,6 @@
 
 package com.ibm.eventstreams.connect.jdbcsink;
 
-import com.ibm.eventstreams.connect.jdbcsink.sink.JDBCSinkConfig;
-import com.ibm.eventstreams.connect.jdbcsink.sink.JDBCSinkTask;
 import org.apache.kafka.common.config.Config;
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.connect.connector.Task;

diff --git a/...s/connect/jdbcsink/sink/JDBCSinkTask.java → ...treams/connect/jdbcsink/JDBCSinkTask.java b/...s/connect/jdbcsink/sink/JDBCSinkTask.java → ...treams/connect/jdbcsink/JDBCSinkTask.java
@@ -16,10 +16,10 @@
  *
  */
 
-package com.ibm.eventstreams.connect.jdbcsink.sink;
+package com.ibm.eventstreams.connect.jdbcsink;
 
-import com.ibm.eventstreams.connect.jdbcsink.sink.datasource.database.DatabaseFactory;
-import com.ibm.eventstreams.connect.jdbcsink.sink.datasource.database.IDatabase;
+import com.ibm.eventstreams.connect.jdbcsink.database.DatabaseFactory;
+import com.ibm.eventstreams.connect.jdbcsink.database.IDatabase;
 import org.apache.kafka.clients.consumer.OffsetAndMetadata;
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.connect.connector.Connector;

diff --git a/.../datasource/database/DatabaseFactory.java → ...ct/jdbcsink/database/DatabaseFactory.java b/.../datasource/database/DatabaseFactory.java → ...ct/jdbcsink/database/DatabaseFactory.java
@@ -16,12 +16,12 @@
  *
  */
 
-package com.ibm.eventstreams.connect.jdbcsink.sink.datasource.database;
+package com.ibm.eventstreams.connect.jdbcsink.database;
 
-import com.ibm.eventstreams.connect.jdbcsink.sink.JDBCSinkConfig;
-import com.ibm.eventstreams.connect.jdbcsink.sink.JDBCSinkTask;
-import com.ibm.eventstreams.connect.jdbcsink.sink.datasource.IDataSource;
-import com.ibm.eventstreams.connect.jdbcsink.sink.datasource.PooledDataSource;
+import com.ibm.eventstreams.connect.jdbcsink.JDBCSinkConfig;
+import com.ibm.eventstreams.connect.jdbcsink.JDBCSinkTask;
+import com.ibm.eventstreams.connect.jdbcsink.database.datasource.IDataSource;
+import com.ibm.eventstreams.connect.jdbcsink.database.datasource.PooledDataSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...tabase/DatabaseNotSupportedException.java → ...tabase/DatabaseNotSupportedException.java b/...tabase/DatabaseNotSupportedException.java → ...tabase/DatabaseNotSupportedException.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.ibm.eventstreams.connect.jdbcsink.sink.datasource.database;
+package com.ibm.eventstreams.connect.jdbcsink.database;
 
 public class DatabaseNotSupportedException extends RuntimeException {
     public DatabaseNotSupportedException(String message){

diff --git a/...ink/datasource/database/DatabaseType.java → ...nnect/jdbcsink/database/DatabaseType.java b/...ink/datasource/database/DatabaseType.java → ...nnect/jdbcsink/database/DatabaseType.java
@@ -16,10 +16,10 @@
  *
  */
 
-package com.ibm.eventstreams.connect.jdbcsink.sink.datasource.database;
+package com.ibm.eventstreams.connect.jdbcsink.database;
 
 import com.ibm.eventstreams.connect.jdbcsink.JDBCSinkConnector;
-import com.ibm.eventstreams.connect.jdbcsink.sink.datasource.IDataSource;
+import com.ibm.eventstreams.connect.jdbcsink.database.datasource.IDataSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...k/sink/datasource/database/IDatabase.java → .../connect/jdbcsink/database/IDatabase.java b/...k/sink/datasource/database/IDatabase.java → .../connect/jdbcsink/database/IDatabase.java
@@ -16,10 +16,9 @@
  *
  */
 
-package com.ibm.eventstreams.connect.jdbcsink.sink.datasource.database;
+package com.ibm.eventstreams.connect.jdbcsink.database;
 
-import com.ibm.eventstreams.connect.jdbcsink.sink.datasource.IDataSource;
-import com.ibm.eventstreams.connect.jdbcsink.sink.datasource.database.writer.IDatabaseWriter;
+import com.ibm.eventstreams.connect.jdbcsink.database.writer.IDatabaseWriter;
 
 public interface IDatabase {
     IDatabaseWriter getWriter();

diff --git a/...tasource/database/RelationalDatabase.java → ...jdbcsink/database/RelationalDatabase.java b/...tasource/database/RelationalDatabase.java → ...jdbcsink/database/RelationalDatabase.java
@@ -16,11 +16,11 @@
  *
  */
 
-package com.ibm.eventstreams.connect.jdbcsink.sink.datasource.database;
+package com.ibm.eventstreams.connect.jdbcsink.database;
 
-import com.ibm.eventstreams.connect.jdbcsink.sink.datasource.IDataSource;
-import com.ibm.eventstreams.connect.jdbcsink.sink.datasource.database.writer.IDatabaseWriter;
-import com.ibm.eventstreams.connect.jdbcsink.sink.datasource.database.writer.JDBCWriter;
+import com.ibm.eventstreams.connect.jdbcsink.database.datasource.IDataSource;
+import com.ibm.eventstreams.connect.jdbcsink.database.writer.IDatabaseWriter;
+import com.ibm.eventstreams.connect.jdbcsink.database.writer.JDBCWriter;
 
 public class RelationalDatabase implements IDatabase {
 

diff --git a/...jdbcsink/sink/datasource/IDataSource.java → ...sink/database/datasource/IDataSource.java b/...jdbcsink/sink/datasource/IDataSource.java → ...sink/database/datasource/IDataSource.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.ibm.eventstreams.connect.jdbcsink.sink.datasource;
+package com.ibm.eventstreams.connect.jdbcsink.database.datasource;
 
 import java.sql.Connection;
 import java.sql.SQLException;

diff --git a/...ink/sink/datasource/PooledDataSource.java → ...database/datasource/PooledDataSource.java b/...ink/sink/datasource/PooledDataSource.java → ...database/datasource/PooledDataSource.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.ibm.eventstreams.connect.jdbcsink.sink.datasource;
+package com.ibm.eventstreams.connect.jdbcsink.database.datasource;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 

diff --git a/...urce/database/writer/IDatabaseWriter.java → ...sink/database/writer/IDatabaseWriter.java b/...urce/database/writer/IDatabaseWriter.java → ...sink/database/writer/IDatabaseWriter.java
@@ -16,7 +16,7 @@
  *
  */
 
-package com.ibm.eventstreams.connect.jdbcsink.sink.datasource.database.writer;
+package com.ibm.eventstreams.connect.jdbcsink.database.writer;
 
 import org.apache.kafka.connect.sink.SinkRecord;
 

diff --git a/...atasource/database/writer/JDBCWriter.java → .../jdbcsink/database/writer/JDBCWriter.java b/...atasource/database/writer/JDBCWriter.java → .../jdbcsink/database/writer/JDBCWriter.java
@@ -16,11 +16,11 @@
  *
  */
 
-package com.ibm.eventstreams.connect.jdbcsink.sink.datasource.database.writer;
+package com.ibm.eventstreams.connect.jdbcsink.database.writer;
 
 import com.google.gson.Gson;
-import com.ibm.eventstreams.connect.jdbcsink.sink.JDBCSinkTask;
-import com.ibm.eventstreams.connect.jdbcsink.sink.datasource.IDataSource;
+import com.ibm.eventstreams.connect.jdbcsink.JDBCSinkTask;
+import com.ibm.eventstreams.connect.jdbcsink.database.datasource.IDataSource;
 import org.apache.kafka.connect.sink.SinkRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ @@
      *
      */
-    package com.ibm.eventstreams.connect.jdbcsink.sink.datasource;
+    package com.ibm.eventstreams.connect.jdbcsink.database.datasource;
     import com.mchange.v2.c3p0.ComboPooledDataSource;
@@ Expand Down @@