Moved api/examples to api-java and java-examples (#128)

apache · Mar 4, 2018 · 850c1bd · 850c1bd
1 parent f50a68e
commit 850c1bd
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 5 deletions.
diff --git a/pulsar-functions/api/pom.xml → pulsar-functions/api-java/pom.xml b/pulsar-functions/api/pom.xml → pulsar-functions/api-java/pom.xml
diff --git a/.../apache/pulsar/functions/api/Context.java → .../apache/pulsar/functions/api/Context.java b/.../apache/pulsar/functions/api/Context.java → .../apache/pulsar/functions/api/Context.java
diff --git a/...lsar/functions/api/RawRequestHandler.java → ...lsar/functions/api/RawRequestHandler.java b/...lsar/functions/api/RawRequestHandler.java → ...lsar/functions/api/RawRequestHandler.java
diff --git a/.../pulsar/functions/api/RequestHandler.java → .../pulsar/functions/api/RequestHandler.java b/.../pulsar/functions/api/RequestHandler.java → .../pulsar/functions/api/RequestHandler.java
diff --git a/...rg/apache/pulsar/functions/api/SerDe.java → ...rg/apache/pulsar/functions/api/SerDe.java b/...rg/apache/pulsar/functions/api/SerDe.java → ...rg/apache/pulsar/functions/api/SerDe.java
diff --git a/...he/pulsar/functions/api/package-info.java → ...he/pulsar/functions/api/package-info.java b/...he/pulsar/functions/api/package-info.java → ...he/pulsar/functions/api/package-info.java
diff --git a/...pulsar/functions/api/utils/JavaSerDe.java → ...pulsar/functions/api/utils/JavaSerDe.java b/...pulsar/functions/api/utils/JavaSerDe.java → ...pulsar/functions/api/utils/JavaSerDe.java
diff --git a/.../functions/api/utils/Utf8StringSerDe.java → .../functions/api/utils/Utf8StringSerDe.java b/.../functions/api/utils/Utf8StringSerDe.java → .../functions/api/utils/Utf8StringSerDe.java
diff --git a/...ar/functions/api/utils/JavaSerDeTest.java → ...ar/functions/api/utils/JavaSerDeTest.java b/...ar/functions/api/utils/JavaSerDeTest.java → ...ar/functions/api/utils/JavaSerDeTest.java
diff --git a/...ctions/api/utils/Utf8StringSerDeTest.java → ...ctions/api/utils/Utf8StringSerDeTest.java b/...ctions/api/utils/Utf8StringSerDeTest.java → ...ctions/api/utils/Utf8StringSerDeTest.java
diff --git a/pulsar-functions/api-examples/pom.xml → pulsar-functions/java-examples/pom.xml b/pulsar-functions/api-examples/pom.xml → pulsar-functions/java-examples/pom.xml
diff --git a/...ons/api/examples/ExclamationFunction.java → ...ons/api/examples/ExclamationFunction.java b/...ons/api/examples/ExclamationFunction.java → ...ons/api/examples/ExclamationFunction.java
diff --git a/...nctions/api/examples/LoggingFunction.java → ...nctions/api/examples/LoggingFunction.java b/...nctions/api/examples/LoggingFunction.java → ...nctions/api/examples/LoggingFunction.java
diff --git a/...nctions/api/examples/PublishFunction.java → ...nctions/api/examples/PublishFunction.java b/...nctions/api/examples/PublishFunction.java → ...nctions/api/examples/PublishFunction.java
diff --git a/...ions/api/examples/UserConfigFunction.java → ...ions/api/examples/UserConfigFunction.java b/...ions/api/examples/UserConfigFunction.java → ...ions/api/examples/UserConfigFunction.java
diff --git a/...ions/api/examples/UserMetricFunction.java → ...ions/api/examples/UserMetricFunction.java b/...ions/api/examples/UserMetricFunction.java → ...ions/api/examples/UserMetricFunction.java
diff --git a/.../functions/api/examples/VoidFunction.java → .../functions/api/examples/VoidFunction.java b/.../functions/api/examples/VoidFunction.java → .../functions/api/examples/VoidFunction.java
diff --git a/pulsar-functions/pom.xml b/pulsar-functions/pom.xml
@@ -33,11 +33,11 @@
 
   <modules>
     <module>proto</module>
-    <module>api</module>
+    <module>api-java</module>
     <module>runtime</module>
     <module>worker</module>
     <module>cli</module>
-    <module>api-examples</module>
+    <module>java-examples</module>
     <module>runtime-benchmark</module>
   </modules>
 

diff --git a/...src/main/java/org/apache/pulsar/functions/runtime/container/ProcessFunctionContainer.java b/...src/main/java/org/apache/pulsar/functions/runtime/container/ProcessFunctionContainer.java
@@ -124,7 +124,7 @@ class ProcessFunctionContainer implements FunctionContainer {
         args.add(pulsarServiceUrl);
         args.add("--max-buffered-tuples");
         args.add(String.valueOf(maxBufferedTuples));
-        Map<String, String> userConfig = instanceConfig.getFunctionConfig().getUserConfig();
+        Map<String, String> userConfig = instanceConfig.getFunctionConfig().getUserConfigMap();
         String userConfigString = "";
         if (userConfig != null && !userConfig.isEmpty()) {
             for (Map.Entry<String, String> entry : userConfig.entrySet()) {

diff --git a/...tions/runtime/src/main/java/org/apache/pulsar/functions/runtime/instance/ContextImpl.java b/...tions/runtime/src/main/java/org/apache/pulsar/functions/runtime/instance/ContextImpl.java
@@ -157,8 +157,8 @@ public Logger getLogger() {
 
     @Override
     public String getUserConfigValue(String key) {
-        if (config.getFunctionConfig().getUserConfig().containsKey(key)) {
-            return config.getFunctionConfig().getUserConfig().get(key);
+        if (config.getFunctionConfig().containsUserConfig(key)) {
+            return config.getFunctionConfig().getUserConfigOrDefault(key, null);
         } else {
             return null;
         }