Change package to com.datastax

datastax · Jun 16, 2022 · 6afd5c5 · 6afd5c5
1 parent 71beb55
commit 6afd5c5
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 44 deletions.
diff --git a/...pulsar/functions/transforms/CastStep.java → ...pulsar/functions/transforms/CastStep.java b/...pulsar/functions/transforms/CastStep.java → ...pulsar/functions/transforms/CastStep.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pulsar.client.api.Schema;

diff --git a/...r/functions/transforms/DropFieldStep.java → ...r/functions/transforms/DropFieldStep.java b/...r/functions/transforms/DropFieldStep.java → ...r/functions/transforms/DropFieldStep.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...nctions/transforms/MergeKeyValueStep.java → ...nctions/transforms/MergeKeyValueStep.java b/...nctions/transforms/MergeKeyValueStep.java → ...nctions/transforms/MergeKeyValueStep.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...unctions/transforms/TransformContext.java → ...unctions/transforms/TransformContext.java b/...unctions/transforms/TransformContext.java → ...unctions/transforms/TransformContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/...nctions/transforms/TransformFunction.java → ...nctions/transforms/TransformFunction.java b/...nctions/transforms/TransformFunction.java → ...nctions/transforms/TransformFunction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;

diff --git a/...r/functions/transforms/TransformStep.java → ...r/functions/transforms/TransformStep.java b/...r/functions/transforms/TransformStep.java → ...r/functions/transforms/TransformStep.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
 
 public interface TransformStep {
   void process(TransformContext transformContext) throws Exception;

diff --git a/...ctions/transforms/UnwrapKeyValueStep.java → ...ctions/transforms/UnwrapKeyValueStep.java b/...ctions/transforms/UnwrapKeyValueStep.java → ...ctions/transforms/UnwrapKeyValueStep.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
 
 public class UnwrapKeyValueStep implements TransformStep {
 

diff --git a/...ar/functions/transforms/package-info.java → ...ar/functions/transforms/package-info.java b/...ar/functions/transforms/package-info.java → ...ar/functions/transforms/package-info.java
@@ -13,4 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
diff --git a/pulsar-transformations/src/main/resources/META-INF/services/pulsar-io.yaml b/pulsar-transformations/src/main/resources/META-INF/services/pulsar-io.yaml
@@ -19,4 +19,4 @@
 
 name: transforms
 description: Transformation function
-functionClass: org.apache.pulsar.functions.transforms.TransformFunction
+functionClass: com.datastax.pulsar.functions.transforms.TransformFunction
diff --git a/...ar/functions/transforms/CastStepTest.java → ...ar/functions/transforms/CastStepTest.java b/...ar/functions/transforms/CastStepTest.java → ...ar/functions/transforms/CastStepTest.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
 
-import static org.apache.pulsar.functions.transforms.Utils.createTestAvroKeyValueRecord;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertSame;
 
@@ -31,7 +30,7 @@ public class CastStepTest {
 
   @Test
   void testKeyValueAvroToString() throws Exception {
-    Record<GenericObject> record = createTestAvroKeyValueRecord();
+    Record<GenericObject> record = Utils.createTestAvroKeyValueRecord();
     CastStep step = new CastStep(SchemaType.STRING, SchemaType.STRING);
     Utils.TestTypedMessageBuilder<?> message = Utils.process(record, step);
 

diff --git a/...nctions/transforms/DropFieldStepTest.java → ...nctions/transforms/DropFieldStepTest.java b/...nctions/transforms/DropFieldStepTest.java → ...nctions/transforms/DropFieldStepTest.java
@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
 
-import static org.apache.pulsar.functions.transforms.Utils.createTestAvroKeyValueRecord;
-import static org.apache.pulsar.functions.transforms.Utils.getRecord;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotSame;
 import static org.testng.Assert.assertSame;
@@ -69,7 +67,7 @@ void testAvro() throws Exception {
     Utils.TestTypedMessageBuilder<?> message = Utils.process(record, step);
     assertEquals(message.getKey(), "test-key");
 
-    GenericData.Record read = getRecord(message.getSchema(), (byte[]) message.getValue());
+    GenericData.Record read = Utils.getRecord(message.getSchema(), (byte[]) message.getValue());
     assertEquals(read.get("age"), 42);
     assertNull(read.getSchema().getField("firstName"));
     assertNull(read.getSchema().getField("lastName"));
@@ -80,18 +78,18 @@ void testKeyValueAvro() throws Exception {
     DropFieldStep step =
         new DropFieldStep(
             Arrays.asList("keyField1", "keyField2"), Arrays.asList("valueField1", "valueField2"));
-    Utils.TestTypedMessageBuilder<?> message = Utils.process(createTestAvroKeyValueRecord(), step);
+    Utils.TestTypedMessageBuilder<?> message = Utils.process(Utils.createTestAvroKeyValueRecord(), step);
     KeyValueSchema messageSchema = (KeyValueSchema) message.getSchema();
     KeyValue messageValue = (KeyValue) message.getValue();
 
     GenericData.Record keyAvroRecord =
-        getRecord(messageSchema.getKeySchema(), (byte[]) messageValue.getKey());
+        Utils.getRecord(messageSchema.getKeySchema(), (byte[]) messageValue.getKey());
     assertEquals(keyAvroRecord.get("keyField3"), new Utf8("key3"));
     assertNull(keyAvroRecord.getSchema().getField("keyField1"));
     assertNull(keyAvroRecord.getSchema().getField("keyField2"));
 
     GenericData.Record valueAvroRecord =
-        getRecord(messageSchema.getValueSchema(), (byte[]) messageValue.getValue());
+        Utils.getRecord(messageSchema.getValueSchema(), (byte[]) messageValue.getValue());
     assertEquals(valueAvroRecord.get("valueField3"), new Utf8("value3"));
     assertNull(valueAvroRecord.getSchema().getField("valueField1"));
     assertNull(valueAvroRecord.getSchema().getField("valueField2"));
@@ -127,7 +125,7 @@ void testAvroNotModified() throws Exception {
 
   @Test
   void testKeyValueAvroNotModified() throws Exception {
-    Record<GenericObject> record = createTestAvroKeyValueRecord();
+    Record<GenericObject> record = Utils.createTestAvroKeyValueRecord();
 
     DropFieldStep step =
         new DropFieldStep(
@@ -146,15 +144,15 @@ void testKeyValueAvroNotModified() throws Exception {
 
   @Test
   void testKeyValueAvroCached() throws Exception {
-    Record<GenericObject> record = createTestAvroKeyValueRecord();
+    Record<GenericObject> record = Utils.createTestAvroKeyValueRecord();
 
     DropFieldStep step =
         new DropFieldStep(
             Arrays.asList("keyField1", "keyField2"), Arrays.asList("valueField1", "valueField2"));
     Utils.TestTypedMessageBuilder<?> message = Utils.process(record, step);
     KeyValueSchema messageSchema = (KeyValueSchema) message.getSchema();
 
-    message = Utils.process(createTestAvroKeyValueRecord(), step);
+    message = Utils.process(Utils.createTestAvroKeyValueRecord(), step);
     KeyValueSchema newMessageSchema = (KeyValueSchema) message.getSchema();
 
     // Schema was modified by process operation

diff --git a/...ons/transforms/MergeKeyValueStepTest.java → ...ons/transforms/MergeKeyValueStepTest.java b/...ons/transforms/MergeKeyValueStepTest.java → ...ons/transforms/MergeKeyValueStepTest.java
@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
 
-import static org.apache.pulsar.functions.transforms.Utils.createTestAvroKeyValueRecord;
-import static org.apache.pulsar.functions.transforms.Utils.getRecord;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotSame;
 import static org.testng.Assert.assertSame;
@@ -37,13 +35,13 @@ public class MergeKeyValueStepTest {
 
   @Test
   void testKeyValueAvro() throws Exception {
-    Record<GenericObject> record = createTestAvroKeyValueRecord();
+    Record<GenericObject> record = Utils.createTestAvroKeyValueRecord();
     Utils.TestTypedMessageBuilder<?> message = Utils.process(record, new MergeKeyValueStep());
     KeyValueSchema messageSchema = (KeyValueSchema) message.getSchema();
     KeyValue messageValue = (KeyValue) message.getValue();
 
     GenericData.Record read =
-        getRecord(messageSchema.getValueSchema(), (byte[]) messageValue.getValue());
+        Utils.getRecord(messageSchema.getValueSchema(), (byte[]) messageValue.getValue());
     assertEquals(
         read.toString(),
         "{\"keyField1\": \"key1\", \"keyField2\": \"key2\", \"keyField3\": \"key3\", "
@@ -96,13 +94,13 @@ void testKeyValuePrimitives() throws Exception {
 
   @Test
   void testKeyValueAvroCached() throws Exception {
-    Record<GenericObject> record = createTestAvroKeyValueRecord();
+    Record<GenericObject> record = Utils.createTestAvroKeyValueRecord();
 
     MergeKeyValueStep step = new MergeKeyValueStep();
     Utils.TestTypedMessageBuilder<?> message = Utils.process(record, step);
     KeyValueSchema messageSchema = (KeyValueSchema) message.getSchema();
 
-    message = Utils.process(createTestAvroKeyValueRecord(), step);
+    message = Utils.process(Utils.createTestAvroKeyValueRecord(), step);
     KeyValueSchema newMessageSchema = (KeyValueSchema) message.getSchema();
 
     // Schema was modified by process operation

diff --git a/...ons/transforms/TransformFunctionTest.java → ...ons/transforms/TransformFunctionTest.java b/...ons/transforms/TransformFunctionTest.java → ...ons/transforms/TransformFunctionTest.java
@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
 
-import static org.apache.pulsar.functions.transforms.Utils.createTestAvroKeyValueRecord;
-import static org.apache.pulsar.functions.transforms.Utils.getRecord;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertThrows;
 import static org.testng.AssertJUnit.assertNull;
@@ -107,7 +105,7 @@ void testDropFields() throws Exception {
         new Gson().fromJson(userConfig, new TypeToken<Map<String, Object>>() {}.getType());
     TransformFunction transformFunction = new TransformFunction();
 
-    Record<GenericObject> record = createTestAvroKeyValueRecord();
+    Record<GenericObject> record = Utils.createTestAvroKeyValueRecord();
     Utils.TestContext context = new Utils.TestContext(record, config);
     transformFunction.initialize(context);
     transformFunction.process(record.getValue(), context);
@@ -117,13 +115,13 @@ void testDropFields() throws Exception {
     KeyValue messageValue = (KeyValue) message.getValue();
 
     GenericData.Record keyAvroRecord =
-        getRecord(messageSchema.getKeySchema(), (byte[]) messageValue.getKey());
+        Utils.getRecord(messageSchema.getKeySchema(), (byte[]) messageValue.getKey());
     assertEquals(keyAvroRecord.get("keyField3"), new Utf8("key3"));
     assertNull(keyAvroRecord.getSchema().getField("keyField1"));
     assertNull(keyAvroRecord.getSchema().getField("keyField2"));
 
     GenericData.Record valueAvroRecord =
-        getRecord(messageSchema.getValueSchema(), (byte[]) messageValue.getValue());
+        Utils.getRecord(messageSchema.getValueSchema(), (byte[]) messageValue.getValue());
     assertEquals(valueAvroRecord.get("valueField2"), new Utf8("value2"));
     assertNull(valueAvroRecord.getSchema().getField("valueField1"));
     assertNull(valueAvroRecord.getSchema().getField("valueField3"));
@@ -145,7 +143,7 @@ void testRemoveMergeAndToString() throws Exception {
         new Gson().fromJson(userConfig, new TypeToken<Map<String, Object>>() {}.getType());
     TransformFunction transformFunction = new TransformFunction();
 
-    Record<GenericObject> record = createTestAvroKeyValueRecord();
+    Record<GenericObject> record = Utils.createTestAvroKeyValueRecord();
     Utils.TestContext context = new Utils.TestContext(record, config);
     transformFunction.initialize(context);
     transformFunction.process(record.getValue(), context);

diff --git a/...ns/transforms/UnwrapKeyValueStepTest.java → ...ns/transforms/UnwrapKeyValueStepTest.java b/...ns/transforms/UnwrapKeyValueStepTest.java → ...ns/transforms/UnwrapKeyValueStepTest.java
@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
 
-import static org.apache.pulsar.functions.transforms.Utils.createTestAvroKeyValueRecord;
-import static org.apache.pulsar.functions.transforms.Utils.getRecord;
 import static org.junit.Assert.assertSame;
 import static org.testng.Assert.assertEquals;
 
@@ -32,10 +30,10 @@ public class UnwrapKeyValueStepTest {
 
   @Test
   void testKeyValueUnwrapValue() throws Exception {
-    Record<GenericObject> record = createTestAvroKeyValueRecord();
+    Record<GenericObject> record = Utils.createTestAvroKeyValueRecord();
     Utils.TestTypedMessageBuilder<?> message = Utils.process(record, new UnwrapKeyValueStep(false));
 
-    GenericData.Record read = getRecord(message.getSchema(), (byte[]) message.getValue());
+    GenericData.Record read = Utils.getRecord(message.getSchema(), (byte[]) message.getValue());
     assertEquals(
         read.toString(),
         "{\"valueField1\": \"value1\", \"valueField2\": \"value2\", \"valueField3\": "
@@ -44,10 +42,10 @@ void testKeyValueUnwrapValue() throws Exception {
 
   @Test
   void testKeyValueUnwrapKey() throws Exception {
-    Record<GenericObject> record = createTestAvroKeyValueRecord();
+    Record<GenericObject> record = Utils.createTestAvroKeyValueRecord();
     Utils.TestTypedMessageBuilder<?> message = Utils.process(record, new UnwrapKeyValueStep(true));
 
-    GenericData.Record read = getRecord(message.getSchema(), (byte[]) message.getValue());
+    GenericData.Record read = Utils.getRecord(message.getSchema(), (byte[]) message.getValue());
     assertEquals(
         read.toString(),
         "{\"keyField1\": \"key1\", \"keyField2\": \"key2\", \"keyField3\": \"key3\"}");

diff --git a/...he/pulsar/functions/transforms/Utils.java → ...ax/pulsar/functions/transforms/Utils.java b/...he/pulsar/functions/transforms/Utils.java → ...ax/pulsar/functions/transforms/Utils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pulsar.functions.transforms;
+package com.datastax.pulsar.functions.transforms;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;