Pulsar IO rename (apache#1747)

* begin renaming process * more class and directory renames * move Record classes into pulsar-io * apply rename to Maven configs * rename java imports * update versions in maven configs * add missing imports * remove Message class from pulsar-io * add missing import * add Reflections util import * add Utils import * add missing Record import * supply missing Record imports
defncoder · May 8, 2018 · 17f7415 · 17f7415
1 parent 7056384
commit 17f7415
Show file tree

Hide file tree

Showing 43 changed files with 128 additions and 108 deletions.
diff --git a/pom.xml b/pom.xml
@@ -101,10 +101,10 @@ flexible messaging model and an intuitive client API.</description>
     <module>docker</module>
     <module>tests</module>
     <module>pulsar-log4j2-appender</module>
-    <!-- functions related modules -->
+    <!-- functions-related modules -->
     <module>pulsar-functions</module>
-    <!-- connector related modules -->
-    <module>pulsar-connect</module>
+    <!-- connector-related modules -->
+    <module>pulsar-io</module>
   </modules>
 
   <issueManagement>

diff --git a/pulsar-client-admin-shaded-for-functions/pom.xml b/pulsar-client-admin-shaded-for-functions/pom.xml
@@ -61,7 +61,7 @@
                 <includes>
                   <include>org.apache.pulsar:pulsar-common</include>
                   <include>org.apache.bookkeeper:circe-checksum</include>
-                  <include>org.apache.pulsar:pulsar-connect-core</include>
+                  <include>org.apache.pulsar:pulsar-io-core</include>
                   <include>org.apache.pulsar:pulsar-client-original</include>
                   <include>org.apache.pulsar:pulsar-client-admin-original</include>
                   <!-- client dependencies as below -->
@@ -109,7 +109,7 @@
                   </includes>
                 </filter>
                 <filter>
-                  <artifact>org.apache.pulsar:pulsar-connect-core</artifact>
+                  <artifact>org.apache.pulsar:pulsar-io-core</artifact>
                   <includes>
                     <include>**</include>
                   </includes>

diff --git a/pulsar-client-admin-shaded/pom.xml b/pulsar-client-admin-shaded/pom.xml
@@ -57,7 +57,7 @@
 
               <artifactSet>
                 <includes>
-                  <include>org.apache.pulsar:pulsar-connect-core</include>
+                  <include>org.apache.pulsar:pulsar-io-core</include>
                   <include>org.apache.pulsar:pulsar-client-original</include>
                   <include>org.apache.pulsar:pulsar-client-admin-original</include>
                   <include>org.apache.commons:commons-lang3</include>
@@ -94,7 +94,7 @@
                   </includes>
                 </filter>
                 <filter>
-                  <artifact>org.apache.pulsar:pulsar-connect-core</artifact>
+                  <artifact>org.apache.pulsar:pulsar-io-core</artifact>
                   <includes>
                     <include>**</include>
                   </includes>

diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml
@@ -59,7 +59,7 @@
 
               <artifactSet>
                 <includes>
-                  <include>org.apache.pulsar:pulsar-connect-core</include>
+                  <include>org.apache.pulsar:pulsar-io-core</include>
                   <include>org.apache.pulsar:pulsar-client-original</include>
                   <include>org.apache.commons:commons-lang3</include>
                   <include>commons-codec:commons-codec</include>
@@ -96,7 +96,7 @@
                   </includes>
                 </filter>
                 <filter>
-                  <artifact>org.apache.pulsar:pulsar-connect-core</artifact>
+                  <artifact>org.apache.pulsar:pulsar-io-core</artifact>
                   <includes>
                     <include>**</include>
                   </includes>

diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
@@ -31,8 +31,6 @@
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.internal.FunctionsImpl;
 import org.apache.pulsar.common.naming.TopicName;
-import org.apache.pulsar.connect.core.Sink;
-import org.apache.pulsar.connect.core.Source;
 import org.apache.pulsar.functions.api.utils.IdentityFunction;
 import org.apache.pulsar.functions.shaded.proto.Function;
 import org.apache.pulsar.functions.shaded.proto.Function.FunctionDetails;
@@ -41,7 +39,12 @@
 import org.apache.pulsar.functions.shaded.proto.Function.SourceSpec;
 import org.apache.pulsar.functions.sink.PulsarSink;
 import org.apache.pulsar.functions.source.PulsarSource;
-import org.apache.pulsar.functions.utils.*;
+import org.apache.pulsar.functions.utils.FunctionConfig;
+import org.apache.pulsar.functions.utils.Reflections;
+import org.apache.pulsar.functions.utils.SinkConfig;
+import org.apache.pulsar.functions.utils.Utils;
+import org.apache.pulsar.io.core.Sink;
+import org.apache.pulsar.io.core.Source;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
@@ -31,8 +31,6 @@
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.internal.FunctionsImpl;
 import org.apache.pulsar.common.naming.TopicName;
-import org.apache.pulsar.connect.core.Sink;
-import org.apache.pulsar.connect.core.Source;
 import org.apache.pulsar.functions.api.utils.IdentityFunction;
 import org.apache.pulsar.functions.shaded.proto.Function;
 import org.apache.pulsar.functions.shaded.proto.Function.FunctionDetails;
@@ -41,7 +39,12 @@
 import org.apache.pulsar.functions.shaded.proto.Function.SourceSpec;
 import org.apache.pulsar.functions.sink.PulsarSink;
 import org.apache.pulsar.functions.source.PulsarSource;
-import org.apache.pulsar.functions.utils.*;
+import org.apache.pulsar.functions.utils.FunctionConfig;
+import org.apache.pulsar.functions.utils.Reflections;
+import org.apache.pulsar.functions.utils.SourceConfig;
+import org.apache.pulsar.functions.utils.Utils;
+import org.apache.pulsar.io.core.Sink;
+import org.apache.pulsar.io.core.Source;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml
@@ -41,7 +41,7 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>pulsar-connect-core</artifactId>
+      <artifactId>pulsar-io-core</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
 

diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageRecordImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/MessageRecordImpl.java
@@ -20,7 +20,7 @@
 
 import org.apache.pulsar.client.api.Message;
 import org.apache.pulsar.client.api.MessageId;
-import org.apache.pulsar.connect.core.Record;
+import org.apache.pulsar.io.core.Record;
 
 /**
  * Abstract class that implements message api and connect record api.

diff --git a/pulsar-functions/instance/pom.xml b/pulsar-functions/instance/pom.xml
@@ -54,8 +54,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.pulsar</groupId>
-      <artifactId>pulsar-connect-core</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>pulsar-io-core</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/...r-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstance.java b/...r-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstance.java
@@ -23,9 +23,9 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.PulsarClient;
-import org.apache.pulsar.connect.core.Source;
 import org.apache.pulsar.functions.api.Function;
 import org.apache.pulsar.functions.proto.InstanceCommunication;
+import org.apache.pulsar.io.core.Source;
 
 import org.apache.pulsar.functions.source.PulsarSource;
 import org.slf4j.Logger;

diff --git a/...ons/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java b/...ons/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java
@@ -50,9 +50,6 @@
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.impl.PulsarClientImpl;
-import org.apache.pulsar.connect.core.Record;
-import org.apache.pulsar.connect.core.Sink;
-import org.apache.pulsar.connect.core.Source;
 import org.apache.pulsar.functions.api.Function;
 import org.apache.pulsar.functions.api.utils.IdentityFunction;
 import org.apache.pulsar.functions.proto.InstanceCommunication;
@@ -70,6 +67,9 @@
 import org.apache.pulsar.functions.instance.state.StateContextImpl;
 import org.apache.pulsar.functions.utils.FunctionDetailsUtils;
 import org.apache.pulsar.functions.utils.Reflections;
+import org.apache.pulsar.io.core.Record;
+import org.apache.pulsar.io.core.Sink;
+import org.apache.pulsar.io.core.Source;
 
 /**
  * A function container implemented using java thread.

diff --git a/...functions/instance/src/main/java/org/apache/pulsar/functions/sink/DefaultRuntimeSink.java b/...functions/instance/src/main/java/org/apache/pulsar/functions/sink/DefaultRuntimeSink.java
@@ -20,7 +20,7 @@
 
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import org.apache.pulsar.connect.core.Sink;
+import org.apache.pulsar.io.core.Sink;
 
 /**
  * The default implementation of runtime sink.

diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
@@ -30,7 +30,6 @@
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.PulsarClientException;
-import org.apache.pulsar.connect.core.RecordContext;
 import org.apache.pulsar.functions.api.SerDe;
 import org.apache.pulsar.functions.api.utils.DefaultSerDe;
 import org.apache.pulsar.functions.instance.InstanceUtils;
@@ -39,6 +38,7 @@
 import org.apache.pulsar.functions.instance.producers.Producers;
 import org.apache.pulsar.functions.source.PulsarRecord;
 import org.apache.pulsar.functions.utils.FunctionConfig;
+import org.apache.pulsar.io.core.RecordContext;
 
 import java.util.Base64;
 import java.util.Map;

diff --git a/...r-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkConfig.java b/...r-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkConfig.java
@@ -23,8 +23,6 @@
 import lombok.ToString;
 import org.apache.pulsar.functions.utils.FunctionConfig;
 
-import java.util.Map;
-
 @Getter
 @Setter
 @ToString

diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/RuntimeSink.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/RuntimeSink.java
@@ -18,8 +18,8 @@
  */
 package org.apache.pulsar.functions.sink;
 
-import org.apache.pulsar.connect.core.RecordContext;
-import org.apache.pulsar.connect.core.Sink;
+import org.apache.pulsar.io.core.RecordContext;
+import org.apache.pulsar.io.core.Sink;
 
 /**
  * This class extends connect sink.

diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarRecord.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarRecord.java
@@ -24,7 +24,7 @@
 import lombok.Getter;
 import lombok.ToString;
 import org.apache.pulsar.client.api.MessageId;
-import org.apache.pulsar.connect.core.Record;
+import org.apache.pulsar.io.core.Record;
 
 @Data
 @Builder

diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/source/PulsarSource.java
@@ -26,12 +26,12 @@
 import org.apache.pulsar.client.impl.MessageIdImpl;
 import org.apache.pulsar.client.impl.TopicMessageIdImpl;
 import org.apache.pulsar.client.impl.TopicMessageImpl;
-import org.apache.pulsar.connect.core.Record;
-import org.apache.pulsar.connect.core.Source;
 import org.apache.pulsar.functions.api.SerDe;
 import org.apache.pulsar.functions.api.utils.DefaultSerDe;
 import org.apache.pulsar.functions.instance.InstanceUtils;
 import org.apache.pulsar.functions.utils.FunctionConfig;
+import org.apache.pulsar.io.core.Record;
+import org.apache.pulsar.io.core.Source;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/...tions/instance/src/test/java/org/apache/pulsar/functions/sink/DefaultRuntimeSinkTest.java b/...tions/instance/src/test/java/org/apache/pulsar/functions/sink/DefaultRuntimeSinkTest.java
@@ -29,8 +29,8 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import org.apache.pulsar.connect.core.RecordContext;
-import org.apache.pulsar.connect.core.Sink;
+import org.apache.pulsar.io.core.RecordContext;
+import org.apache.pulsar.io.core.Sink;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

diff --git a/pulsar-functions/utils/pom.xml b/pulsar-functions/utils/pom.xml
@@ -49,7 +49,7 @@
         </exclusion>
         <exclusion>
           <groupId>org.apache.pulsar</groupId>
-          <artifactId>pulsar-connect-core</artifactId>
+          <artifactId>pulsar-io-core</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.pulsar</groupId>

diff --git a/pulsar-connect/aerospike/pom.xml → pulsar-io/aerospike/pom.xml b/pulsar-connect/aerospike/pom.xml → pulsar-io/aerospike/pom.xml
@@ -23,18 +23,18 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.pulsar</groupId>
-    <artifactId>pulsar-connect</artifactId>
+    <artifactId>pulsar-io</artifactId>
     <version>2.1.0-incubating-SNAPSHOT</version>
   </parent>
 
-  <artifactId>pulsar-connect-aerospike</artifactId>
-  <name>Pulsar Connect :: Aerospike</name>
+  <artifactId>pulsar-io-aerospike</artifactId>
+  <name>Pulsar IO :: Aerospike</name>
 
   <dependencies>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>pulsar-connect-core</artifactId>
+      <artifactId>pulsar-io-core</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/...lsar/connect/aerospike/AerospikeSink.java → ...he/pulsar/io/aerospike/AerospikeSink.java b/...lsar/connect/aerospike/AerospikeSink.java → ...he/pulsar/io/aerospike/AerospikeSink.java
@@ -17,25 +17,30 @@
  * under the License.
  */
 
-package org.apache.pulsar.connect.aerospike;
-
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.LinkedBlockingDeque;
-
-import com.aerospike.client.*;
+package org.apache.pulsar.io.aerospike;
+
+import com.aerospike.client.AerospikeClient;
+import com.aerospike.client.AerospikeException;
+import com.aerospike.client.Bin;
+import com.aerospike.client.Host;
+import com.aerospike.client.Key;
+import com.aerospike.client.Value;
 import com.aerospike.client.async.EventLoop;
 import com.aerospike.client.async.EventPolicy;
 import com.aerospike.client.async.NioEventLoops;
 import com.aerospike.client.listener.WriteListener;
 import com.aerospike.client.policy.ClientPolicy;
 import com.aerospike.client.policy.WritePolicy;
 import org.apache.pulsar.common.util.KeyValue;
-import org.apache.pulsar.connect.core.Sink;
+import org.apache.pulsar.io.core.Sink;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.LinkedBlockingDeque;
+
 /**
  * Simple AeroSpike sink
  */

diff --git a/...onnect/aerospike/AerospikeSinkConfig.java → ...sar/io/aerospike/AerospikeSinkConfig.java b/...onnect/aerospike/AerospikeSinkConfig.java → ...sar/io/aerospike/AerospikeSinkConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.pulsar.connect.aerospike;
+package org.apache.pulsar.io.aerospike;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;

diff --git a/pulsar-connect/cassandra/pom.xml → pulsar-io/cassandra/pom.xml b/pulsar-connect/cassandra/pom.xml → pulsar-io/cassandra/pom.xml
@@ -23,18 +23,18 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.pulsar</groupId>
-    <artifactId>pulsar-connect</artifactId>
+    <artifactId>pulsar-io</artifactId>
     <version>2.1.0-incubating-SNAPSHOT</version>
   </parent>
 
-  <artifactId>pulsar-connect-cassandra</artifactId>
-  <name>Pulsar Connect :: Cassandra</name>
+  <artifactId>pulsar-io-cassandra</artifactId>
+  <name>Pulsar IO :: Cassandra</name>
 
   <dependencies>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>pulsar-connect-core</artifactId>
+      <artifactId>pulsar-io-core</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/...lsar/connect/cassandra/CassandraSink.java → ...he/pulsar/io/cassandra/CassandraSink.java b/...lsar/connect/cassandra/CassandraSink.java → ...he/pulsar/io/cassandra/CassandraSink.java
@@ -17,13 +17,18 @@
  * under the License.
  */
 
-package org.apache.pulsar.connect.cassandra;
+package org.apache.pulsar.io.cassandra;
 
-import com.datastax.driver.core.*;
+import com.datastax.driver.core.BoundStatement;
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.PreparedStatement;
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.ResultSetFuture;
+import com.datastax.driver.core.Session;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import org.apache.pulsar.common.util.KeyValue;
-import org.apache.pulsar.connect.core.Sink;
+import org.apache.pulsar.io.core.Sink;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...onnect/cassandra/CassandraSinkConfig.java → ...sar/io/cassandra/CassandraSinkConfig.java b/...onnect/cassandra/CassandraSinkConfig.java → ...sar/io/cassandra/CassandraSinkConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.pulsar.connect.cassandra;
+package org.apache.pulsar.io.cassandra;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;