diff --git a/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/CastStep.java b/pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/CastStep.java similarity index 97% rename from pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/CastStep.java rename to pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/CastStep.java index 6dee5f58..417e062c 100644 --- a/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/CastStep.java +++ b/pulsar-transformations/src/main/java/com/datastax/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/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/DropFieldStep.java b/pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/DropFieldStep.java similarity index 98% rename from pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/DropFieldStep.java rename to pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/DropFieldStep.java index 4e7ee291..3dbd698a 100644 --- a/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/DropFieldStep.java +++ b/pulsar-transformations/src/main/java/com/datastax/pulsar/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/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/MergeKeyValueStep.java b/pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/MergeKeyValueStep.java similarity index 98% rename from pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/MergeKeyValueStep.java rename to pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/MergeKeyValueStep.java index af0cc779..0aa1d20a 100644 --- a/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/MergeKeyValueStep.java +++ b/pulsar-transformations/src/main/java/com/datastax/pulsar/functions/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/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/TransformContext.java b/pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/TransformContext.java similarity index 99% rename from pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/TransformContext.java rename to pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/TransformContext.java index a4e000cd..4be983ce 100644 --- a/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/TransformContext.java +++ b/pulsar-transformations/src/main/java/com/datastax/pulsar/functions/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/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/TransformFunction.java b/pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/TransformFunction.java similarity index 99% rename from pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/TransformFunction.java rename to pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/TransformFunction.java index 16f3a954..1690ff27 100644 --- a/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/TransformFunction.java +++ b/pulsar-transformations/src/main/java/com/datastax/pulsar/functions/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/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/TransformStep.java b/pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/TransformStep.java similarity index 93% rename from pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/TransformStep.java rename to pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/TransformStep.java index e27e41e5..9b57fffd 100644 --- a/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/TransformStep.java +++ b/pulsar-transformations/src/main/java/com/datastax/pulsar/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/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/UnwrapKeyValueStep.java b/pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/UnwrapKeyValueStep.java similarity index 96% rename from pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/UnwrapKeyValueStep.java rename to pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/UnwrapKeyValueStep.java index 693504cf..cc1f911c 100644 --- a/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/UnwrapKeyValueStep.java +++ b/pulsar-transformations/src/main/java/com/datastax/pulsar/functions/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/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/package-info.java b/pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/package-info.java similarity index 92% rename from pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/package-info.java rename to pulsar-transformations/src/main/java/com/datastax/pulsar/functions/transforms/package-info.java index c14a1eba..3ce15751 100644 --- a/pulsar-transformations/src/main/java/org/apache/pulsar/functions/transforms/package-info.java +++ b/pulsar-transformations/src/main/java/com/datastax/pulsar/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 index 8ada23e2..85ee9c90 100644 --- 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/pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/CastStepTest.java b/pulsar-transformations/src/test/java/com/datastax/pulsar/functions/transforms/CastStepTest.java similarity index 89% rename from pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/CastStepTest.java rename to pulsar-transformations/src/test/java/com/datastax/pulsar/functions/transforms/CastStepTest.java index 5047ccc7..ca31f01f 100644 --- a/pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/CastStepTest.java +++ b/pulsar-transformations/src/test/java/com/datastax/pulsar/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 record = createTestAvroKeyValueRecord(); + Record record = Utils.createTestAvroKeyValueRecord(); CastStep step = new CastStep(SchemaType.STRING, SchemaType.STRING); Utils.TestTypedMessageBuilder message = Utils.process(record, step); diff --git a/pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/DropFieldStepTest.java b/pulsar-transformations/src/test/java/com/datastax/pulsar/functions/transforms/DropFieldStepTest.java similarity index 92% rename from pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/DropFieldStepTest.java rename to pulsar-transformations/src/test/java/com/datastax/pulsar/functions/transforms/DropFieldStepTest.java index 017295f2..0730d17b 100644 --- a/pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/DropFieldStepTest.java +++ b/pulsar-transformations/src/test/java/com/datastax/pulsar/functions/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 record = createTestAvroKeyValueRecord(); + Record record = Utils.createTestAvroKeyValueRecord(); DropFieldStep step = new DropFieldStep( @@ -146,7 +144,7 @@ void testKeyValueAvroNotModified() throws Exception { @Test void testKeyValueAvroCached() throws Exception { - Record record = createTestAvroKeyValueRecord(); + Record record = Utils.createTestAvroKeyValueRecord(); DropFieldStep step = new DropFieldStep( @@ -154,7 +152,7 @@ void testKeyValueAvroCached() throws Exception { 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/pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/MergeKeyValueStepTest.java b/pulsar-transformations/src/test/java/com/datastax/pulsar/functions/transforms/MergeKeyValueStepTest.java similarity index 90% rename from pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/MergeKeyValueStepTest.java rename to pulsar-transformations/src/test/java/com/datastax/pulsar/functions/transforms/MergeKeyValueStepTest.java index 31538d42..def67357 100644 --- a/pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/MergeKeyValueStepTest.java +++ b/pulsar-transformations/src/test/java/com/datastax/pulsar/functions/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 record = createTestAvroKeyValueRecord(); + Record 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 record = createTestAvroKeyValueRecord(); + Record 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/pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/TransformFunctionTest.java b/pulsar-transformations/src/test/java/com/datastax/pulsar/functions/transforms/TransformFunctionTest.java similarity index 93% rename from pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/TransformFunctionTest.java rename to pulsar-transformations/src/test/java/com/datastax/pulsar/functions/transforms/TransformFunctionTest.java index 81f605f8..12419d7a 100644 --- a/pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/TransformFunctionTest.java +++ b/pulsar-transformations/src/test/java/com/datastax/pulsar/functions/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>() {}.getType()); TransformFunction transformFunction = new TransformFunction(); - Record record = createTestAvroKeyValueRecord(); + Record 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>() {}.getType()); TransformFunction transformFunction = new TransformFunction(); - Record record = createTestAvroKeyValueRecord(); + Record record = Utils.createTestAvroKeyValueRecord(); Utils.TestContext context = new Utils.TestContext(record, config); transformFunction.initialize(context); transformFunction.process(record.getValue(), context); diff --git a/pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/UnwrapKeyValueStepTest.java b/pulsar-transformations/src/test/java/com/datastax/pulsar/functions/transforms/UnwrapKeyValueStepTest.java similarity index 81% rename from pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/UnwrapKeyValueStepTest.java rename to pulsar-transformations/src/test/java/com/datastax/pulsar/functions/transforms/UnwrapKeyValueStepTest.java index 76c03e9b..358ee2a7 100644 --- a/pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/UnwrapKeyValueStepTest.java +++ b/pulsar-transformations/src/test/java/com/datastax/pulsar/functions/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 record = createTestAvroKeyValueRecord(); + Record 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 record = createTestAvroKeyValueRecord(); + Record 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/pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/Utils.java b/pulsar-transformations/src/test/java/com/datastax/pulsar/functions/transforms/Utils.java similarity index 99% rename from pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/Utils.java rename to pulsar-transformations/src/test/java/com/datastax/pulsar/functions/transforms/Utils.java index 90205e9a..6c7c229f 100644 --- a/pulsar-transformations/src/test/java/org/apache/pulsar/functions/transforms/Utils.java +++ b/pulsar-transformations/src/test/java/com/datastax/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;