Move SerDe to api (apache#120)

* Move SerDe to api * Incorporate comments
sijie · Mar 4, 2018 · 5dfbb27 · 5dfbb27
1 parent 28ff628
commit 5dfbb27
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 43 deletions.
diff --git a/...pulsar/functions/runtime/serde/SerDe.java → ...rg/apache/pulsar/functions/api/SerDe.java b/...pulsar/functions/runtime/serde/SerDe.java → ...rg/apache/pulsar/functions/api/SerDe.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pulsar.functions.runtime.serde;
+package org.apache.pulsar.functions.api;
 
 /**
  * An interface for serializer/deserializer.

diff --git a/...ar/functions/runtime/serde/JavaSerDe.java → ...pulsar/functions/api/utils/JavaSerDe.java b/...ar/functions/runtime/serde/JavaSerDe.java → ...pulsar/functions/api/utils/JavaSerDe.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pulsar.functions.runtime.serde;
+package org.apache.pulsar.functions.api.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -25,6 +25,7 @@
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.functions.api.SerDe;
 
 /**
  * Java Serialization based SerDe

diff --git a/...ctions/runtime/serde/Utf8StringSerDe.java → .../functions/api/utils/Utf8StringSerDe.java b/...ctions/runtime/serde/Utf8StringSerDe.java → .../functions/api/utils/Utf8StringSerDe.java
@@ -16,9 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.pulsar.functions.runtime.serde;
+package org.apache.pulsar.functions.api.utils;
 
-import static com.google.common.base.Charsets.UTF_8;
+import org.apache.pulsar.functions.api.SerDe;
+
+import java.nio.charset.StandardCharsets;
 
 /**
  * A simple Serde that treats the bytes as Java String
@@ -33,11 +35,11 @@ public static Utf8StringSerDe of() {
 
     @Override
     public byte[] serialize(String string) {
-        return string.getBytes(UTF_8);
+        return string.getBytes(StandardCharsets.UTF_8);
     }
 
     @Override
     public String deserialize(byte[] data) {
-        return new String(data, UTF_8);
+        return new String(data, StandardCharsets.UTF_8);
     }
 }
diff --git a/...unctions/runtime/serde/JavaSerDeTest.java → ...ar/functions/api/utils/JavaSerDeTest.java b/...unctions/runtime/serde/JavaSerDeTest.java → ...ar/functions/api/utils/JavaSerDeTest.java
@@ -25,6 +25,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.apache.pulsar.functions.api.utils.JavaSerDe;
 import org.testng.annotations.Test;
 
 /**

diff --git a/...ns/runtime/serde/Utf8StringSerDeTest.java → ...ctions/api/utils/Utf8StringSerDeTest.java b/...ns/runtime/serde/Utf8StringSerDeTest.java → ...ctions/api/utils/Utf8StringSerDeTest.java
@@ -20,6 +20,7 @@
 
 import static org.testng.Assert.assertEquals;
 
+import org.apache.pulsar.functions.api.utils.Utf8StringSerDe;
 import org.testng.annotations.Test;
 
 /**

diff --git a/pulsar-functions/cli/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java b/pulsar-functions/cli/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
@@ -24,7 +24,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import com.google.protobuf.util.JsonFormat;
 import lombok.Getter;
@@ -33,7 +32,7 @@
 import org.apache.pulsar.functions.api.RequestHandler;
 import org.apache.pulsar.functions.proto.Function.FunctionConfig;
 import org.apache.pulsar.functions.runtime.container.ThreadFunctionContainerFactory;
-import org.apache.pulsar.functions.runtime.serde.SerDe;
+import org.apache.pulsar.functions.api.SerDe;
 import org.apache.pulsar.functions.fs.LimitsConfig;
 import org.apache.pulsar.functions.runtime.spawner.Spawner;
 import org.apache.pulsar.functions.utils.FunctionConfigUtils;

diff --git a/pulsar-functions/cli/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java b/pulsar-functions/cli/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
@@ -43,7 +43,7 @@
 import org.apache.pulsar.client.api.ClientConfiguration;
 import org.apache.pulsar.functions.api.RequestHandler;
 import org.apache.pulsar.functions.proto.Function.FunctionConfig;
-import org.apache.pulsar.functions.runtime.serde.Utf8StringSerDe;
+import org.apache.pulsar.functions.api.utils.Utf8StringSerDe;
 import org.apache.pulsar.functions.utils.Reflections;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;

diff --git a/pulsar-functions/run-examples.sh b/pulsar-functions/run-examples.sh
@@ -21,7 +21,7 @@ bin/pulsar-functions functions localrun \
     --function-config conf/example.yml \
     --source-topics persistent://sample/standalone/ns1/test_src \
     --sink-topic persistent://sample/standalone/ns1/test_result \
-    --input-serde-classnames org.apache.pulsar.functions.runtime.serde.Utf8StringSerDe \
-    --output-serde-classname org.apache.pulsar.functions.runtime.serde.Utf8StringSerDe \
+    --input-serde-classnames org.apache.pulsar.functions.api.utils.Utf8StringSerDe \
+    --output-serde-classname org.apache.pulsar.functions.api.utils.Utf8StringSerDe \
     --function-classname org.apache.pulsar.functions.api.examples.ExclamationFunction \
     --jar `pwd`/api-examples/target/pulsar-functions-api-examples.jar
diff --git a/pulsar-functions/run-logging-examples.sh b/pulsar-functions/run-logging-examples.sh
@@ -21,7 +21,7 @@ bin/pulsar-functions functions localrun \
     --function-config conf/example.yml \
     --source-topics persistent://sample/standalone/ns1/test_src \
     --sink-topic persistent://sample/standalone/ns1/test_result \
-    --input-serde-classnames org.apache.pulsar.functions.runtime.serde.Utf8StringSerDe \
-    --output-serde-classname org.apache.pulsar.functions.runtime.serde.Utf8StringSerDe \
+    --input-serde-classnames org.apache.pulsar.functions.api.utils.Utf8StringSerDe \
+    --output-serde-classname org.apache.pulsar.functions.api.utils.Utf8StringSerDe \
     --function-classname org.apache.pulsar.functions.api.examples.LoggingFunction \
     --jar `pwd`/api-examples/target/pulsar-functions-api-examples.jar
diff --git a/...ions/runtime/src/main/java/org/apache/pulsar/functions/runtime/instance/JavaInstance.java b/...ions/runtime/src/main/java/org/apache/pulsar/functions/runtime/instance/JavaInstance.java
@@ -28,13 +28,13 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import lombok.Getter;
+
 import lombok.extern.slf4j.Slf4j;
 import net.jodah.typetools.TypeResolver;
 import org.apache.pulsar.functions.api.RawRequestHandler;
 import org.apache.pulsar.functions.api.RequestHandler;
 import org.apache.pulsar.functions.proto.InstanceCommunication;
-import org.apache.pulsar.functions.runtime.serde.SerDe;
+import org.apache.pulsar.functions.api.SerDe;
 import org.apache.pulsar.functions.utils.Reflections;
 
 import java.lang.reflect.Type;

diff --git a/...time/src/main/java/org/apache/pulsar/functions/runtime/instance/JavaInstanceRunnable.java b/...time/src/main/java/org/apache/pulsar/functions/runtime/instance/JavaInstanceRunnable.java
@@ -28,7 +28,7 @@
 import org.apache.pulsar.functions.proto.Function.FunctionConfig;
 import org.apache.pulsar.functions.proto.InstanceCommunication;
 import org.apache.pulsar.functions.runtime.functioncache.FunctionCacheManager;
-import org.apache.pulsar.functions.runtime.serde.SerDe;
+import org.apache.pulsar.functions.api.SerDe;
 import org.apache.pulsar.functions.stats.FunctionStats;
 import org.apache.pulsar.functions.utils.FunctionConfigUtils;
 import org.apache.pulsar.functions.utils.Reflections;

diff --git a/...nctions/runtime/src/main/java/org/apache/pulsar/functions/runtime/serde/package-info.java b/...nctions/runtime/src/main/java/org/apache/pulsar/functions/runtime/serde/package-info.java
diff --git a/.../test/java/org/apache/pulsar/functions/runtime/container/ThreadFunctionContainerTest.java b/.../test/java/org/apache/pulsar/functions/runtime/container/ThreadFunctionContainerTest.java
@@ -73,7 +73,7 @@ FunctionConfig createFunctionConfig() {
         functionConfigBuilder.setNamespace(TEST_NAMESPACE);
         functionConfigBuilder.setName(TEST_NAME);
         functionConfigBuilder.setClassName("org.apache.pulsar.functions.runtime.functioncache.AddFunction");
-        functionConfigBuilder.putInputs(TEST_NAME + "-source", "org.apache.pulsar.functions.runtime.serde.Utf8StringSerDe");
+        functionConfigBuilder.putInputs(TEST_NAME + "-source", "org.apache.pulsar.functions.api.utils.Utf8StringSerDe");
         functionConfigBuilder.setSinkTopic(TEST_NAME + "-sink");
         return functionConfigBuilder.build();
     }

diff --git a/.../runtime/src/test/java/org/apache/pulsar/functions/runtime/instance/JavaInstanceTest.java b/.../runtime/src/test/java/org/apache/pulsar/functions/runtime/instance/JavaInstanceTest.java
@@ -31,8 +31,8 @@
 import org.apache.pulsar.functions.api.RequestHandler;
 import org.apache.pulsar.functions.fs.LimitsConfig;
 import org.apache.pulsar.functions.proto.Function.FunctionConfig;
-import org.apache.pulsar.functions.runtime.serde.JavaSerDe;
-import org.apache.pulsar.functions.runtime.serde.Utf8StringSerDe;
+import org.apache.pulsar.functions.api.utils.JavaSerDe;
+import org.apache.pulsar.functions.api.utils.Utf8StringSerDe;
 import org.testng.annotations.Test;
 
 import java.util.Arrays;

diff --git a/...orker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v1/ApiV1ResourceTest.java b/...orker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v1/ApiV1ResourceTest.java
@@ -51,13 +51,12 @@
 import org.apache.pulsar.functions.proto.Function.PackageLocationMetaData;
 import org.apache.pulsar.functions.proto.Function.FunctionConfig;
 import org.apache.pulsar.functions.proto.Function.FunctionMetaData;
-import org.apache.pulsar.functions.runtime.serde.Utf8StringSerDe;
+import org.apache.pulsar.functions.api.utils.Utf8StringSerDe;
 import org.apache.pulsar.functions.fs.LimitsConfig;
 import org.apache.pulsar.functions.worker.FunctionRuntimeInfo;
 import org.apache.pulsar.functions.worker.Utils;
 import org.apache.pulsar.functions.worker.WorkerConfig;
 import org.apache.pulsar.functions.worker.request.RequestResult;
-import org.apache.pulsar.functions.worker.rest.RestUtils;
 import org.apache.pulsar.functions.worker.FunctionRuntimeManager;
 import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;