fix: Move internal packages to "internal" use a property for flink and pubsublite versions (#45)

* minor adjustments

* move to internal

* update pom

* remove change

Author: palmere-google

pom.xml

@@ -11,6 +11,10 @@
     <packaging>jar</packaging>
     <artifactId>google-cloud-pubsublite-flink</artifactId>
     <version>0.1.0-SNAPSHOT</version>
+    <properties>
+        <flink.version>1.13.0</flink.version>
+        <pubsublite.version>0.16.1</pubsublite.version>
+    </properties>
     <build>
         <extensions>
             <extension>
@@ -54,12 +58,12 @@
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-pubsublite</artifactId>
-            <version>0.16.1</version>
+            <version>${pubsublite.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.api.grpc</groupId>
             <artifactId>proto-google-cloud-pubsublite-v1</artifactId>
-            <version>0.16.1</version>
+            <version>${pubsublite.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.api</groupId>
@@ -89,27 +93,27 @@
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-core</artifactId>
-            <version>1.13.0</version>
+            <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-base</artifactId>
-            <version>1.13.0</version>
+            <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-metrics-core</artifactId>
-            <version>1.13.0</version>
+            <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-streaming-java_2.11</artifactId>
-            <version>1.13.0</version>
+            <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-runtime_2.11</artifactId>
-            <version>1.13.0</version>
+            <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -129,13 +133,13 @@
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-test-utils</artifactId>
-            <version>1.13.0</version>
+            <version>${flink.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-test-utils-junit</artifactId>
-            <version>1.13.0</version>
+            <version>${flink.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

src/main/java/com/google/cloud/pubsublite/flink/PubsubLiteSink.java

@@ -16,10 +16,10 @@
 package com.google.cloud.pubsublite.flink;
 
 import com.google.cloud.Tuple;
-import com.google.cloud.pubsublite.flink.sink.BulkWaitPublisher;
-import com.google.cloud.pubsublite.flink.sink.MessagePublisher;
-import com.google.cloud.pubsublite.flink.sink.PerServerPublisherCache;
-import com.google.cloud.pubsublite.flink.sink.SerializingPublisher;
+import com.google.cloud.pubsublite.flink.internal.sink.BulkWaitPublisher;
+import com.google.cloud.pubsublite.flink.internal.sink.MessagePublisher;
+import com.google.cloud.pubsublite.flink.internal.sink.PerServerPublisherCache;
+import com.google.cloud.pubsublite.flink.internal.sink.SerializingPublisher;
 import com.google.errorprone.annotations.concurrent.GuardedBy;
 import java.time.Instant;
 import org.apache.flink.configuration.Configuration;

src/main/java/com/google/cloud/pubsublite/flink/PubsubLiteSinkSettings.java

@@ -18,7 +18,7 @@
 import com.google.auto.value.AutoValue;
 import com.google.cloud.pubsublite.Message;
 import com.google.cloud.pubsublite.TopicPath;
-import com.google.cloud.pubsublite.flink.sink.PublisherOptions;
+import com.google.cloud.pubsublite.flink.internal.sink.PublisherOptions;
 import java.io.Serializable;
 
 @AutoValue

src/main/java/com/google/cloud/pubsublite/flink/PubsubLiteSource.java

@@ -17,17 +17,17 @@
 
 import com.google.cloud.pubsublite.AdminClient;
 import com.google.cloud.pubsublite.TopicPath;
-import com.google.cloud.pubsublite.flink.enumerator.PartitionAssigner;
-import com.google.cloud.pubsublite.flink.enumerator.PubsubLiteSplitEnumerator;
-import com.google.cloud.pubsublite.flink.enumerator.SingleSubscriptionSplitDiscovery;
-import com.google.cloud.pubsublite.flink.enumerator.SplitDiscovery;
-import com.google.cloud.pubsublite.flink.enumerator.SplitEnumeratorCheckpointSerializer;
-import com.google.cloud.pubsublite.flink.enumerator.UniformPartitionAssigner;
+import com.google.cloud.pubsublite.flink.internal.enumerator.PartitionAssigner;
+import com.google.cloud.pubsublite.flink.internal.enumerator.PubsubLiteSplitEnumerator;
+import com.google.cloud.pubsublite.flink.internal.enumerator.SingleSubscriptionSplitDiscovery;
+import com.google.cloud.pubsublite.flink.internal.enumerator.SplitDiscovery;
+import com.google.cloud.pubsublite.flink.internal.enumerator.SplitEnumeratorCheckpointSerializer;
+import com.google.cloud.pubsublite.flink.internal.enumerator.UniformPartitionAssigner;
+import com.google.cloud.pubsublite.flink.internal.reader.PubsubLiteRecordEmitter;
+import com.google.cloud.pubsublite.flink.internal.reader.PubsubLiteSourceReader;
+import com.google.cloud.pubsublite.flink.internal.split.SubscriptionPartitionSplit;
+import com.google.cloud.pubsublite.flink.internal.split.SubscriptionPartitionSplitSerializer;
 import com.google.cloud.pubsublite.flink.proto.SplitEnumeratorCheckpoint;
-import com.google.cloud.pubsublite.flink.reader.PubsubLiteRecordEmitter;
-import com.google.cloud.pubsublite.flink.reader.PubsubLiteSourceReader;
-import com.google.cloud.pubsublite.flink.split.SubscriptionPartitionSplit;
-import com.google.cloud.pubsublite.flink.split.SubscriptionPartitionSplitSerializer;
 import com.google.cloud.pubsublite.internal.ExtractStatus;
 import org.apache.flink.api.common.serialization.DeserializationSchema;
 import org.apache.flink.api.common.typeinfo.TypeInformation;

src/main/java/com/google/cloud/pubsublite/flink/PubsubLiteSourceSettings.java

@@ -29,8 +29,8 @@
 import com.google.cloud.pubsublite.SequencedMessage;
 import com.google.cloud.pubsublite.SubscriptionPath;
 import com.google.cloud.pubsublite.cloudpubsub.FlowControlSettings;
-import com.google.cloud.pubsublite.flink.reader.*;
-import com.google.cloud.pubsublite.flink.split.SubscriptionPartitionSplit;
+import com.google.cloud.pubsublite.flink.internal.reader.*;
+import com.google.cloud.pubsublite.flink.internal.split.SubscriptionPartitionSplit;
 import com.google.cloud.pubsublite.internal.BlockingPullSubscriber;
 import com.google.cloud.pubsublite.internal.BlockingPullSubscriberImpl;
 import com.google.cloud.pubsublite.internal.CursorClient;

src/main/java/com/google/cloud/pubsublite/flink/enumerator/PartitionAssigner.java renamed to src/main/java/com/google/cloud/pubsublite/flink/internal/enumerator/PartitionAssigner.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.pubsublite.flink.enumerator;
+package com.google.cloud.pubsublite.flink.internal.enumerator;
 
+import com.google.cloud.pubsublite.flink.internal.split.SubscriptionPartitionSplit;
 import com.google.cloud.pubsublite.flink.proto.SplitEnumeratorCheckpoint;
-import com.google.cloud.pubsublite.flink.split.SubscriptionPartitionSplit;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;

src/main/java/com/google/cloud/pubsublite/flink/enumerator/PubsubLiteSplitEnumerator.java renamed to src/main/java/com/google/cloud/pubsublite/flink/internal/enumerator/PubsubLiteSplitEnumerator.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.pubsublite.flink.enumerator;
+package com.google.cloud.pubsublite.flink.internal.enumerator;
 
+import com.google.cloud.pubsublite.flink.internal.split.SubscriptionPartitionSplit;
 import com.google.cloud.pubsublite.flink.proto.SplitEnumeratorCheckpoint;
-import com.google.cloud.pubsublite.flink.split.SubscriptionPartitionSplit;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.List;

src/main/java/com/google/cloud/pubsublite/flink/enumerator/SingleSubscriptionSplitDiscovery.java renamed to src/main/java/com/google/cloud/pubsublite/flink/internal/enumerator/SingleSubscriptionSplitDiscovery.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.pubsublite.flink.enumerator;
+package com.google.cloud.pubsublite.flink.internal.enumerator;
 
 import com.google.api.gax.rpc.ApiException;
 import com.google.cloud.pubsublite.*;
+import com.google.cloud.pubsublite.flink.internal.split.SubscriptionPartitionSplit;
 import com.google.cloud.pubsublite.flink.proto.SplitEnumeratorCheckpoint;
-import com.google.cloud.pubsublite.flink.split.SubscriptionPartitionSplit;
 import com.google.cloud.pubsublite.internal.CursorClient;
 import com.google.cloud.pubsublite.internal.ExtractStatus;
 import java.util.ArrayList;

src/main/java/com/google/cloud/pubsublite/flink/enumerator/SplitDiscovery.java renamed to src/main/java/com/google/cloud/pubsublite/flink/internal/enumerator/SplitDiscovery.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.pubsublite.flink.enumerator;
+package com.google.cloud.pubsublite.flink.internal.enumerator;
 
 import com.google.api.gax.rpc.ApiException;
+import com.google.cloud.pubsublite.flink.internal.split.SubscriptionPartitionSplit;
 import com.google.cloud.pubsublite.flink.proto.SplitEnumeratorCheckpoint;
-import com.google.cloud.pubsublite.flink.split.SubscriptionPartitionSplit;
 import java.util.List;
 
 public interface SplitDiscovery extends AutoCloseable {

src/main/java/com/google/cloud/pubsublite/flink/enumerator/SplitEnumeratorCheckpointSerializer.java renamed to src/main/java/com/google/cloud/pubsublite/flink/internal/enumerator/SplitEnumeratorCheckpointSerializer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.cloud.pubsublite.flink.enumerator;
+package com.google.cloud.pubsublite.flink.internal.enumerator;
 
 import com.google.cloud.pubsublite.flink.proto.SplitEnumeratorCheckpoint;
 import java.io.IOException;