You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/03/25 23:57:53 UTC

[GitHub] merlimat closed pull request #1437: Update user config interface for Java Pulsar Functions SDK

merlimat closed pull request #1437: Update user config interface for Java Pulsar Functions SDK
URL: https://github.com/apache/incubator-pulsar/pull/1437
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Context.java b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Context.java
index 871496223..a1abf30d8 100644
--- a/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Context.java
+++ b/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Context.java
@@ -21,6 +21,7 @@
 import org.slf4j.Logger;
 
 import java.util.Collection;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -112,11 +113,19 @@
     void incrCounter(String key, long amount);
 
     /**
-     * Get Any user defined key/value
+     * Get any user-defined key/value
      * @param key The key
-     * @return The value specified by the user for that key. null if no such key
+     * @return The Optional value specified by the user for that key.
      */
-    String getUserConfigValue(String key);
+    Optional<String> getUserConfigValue(String key);
+
+    /**
+     * Get any user-defined key/value or a default value if none is present
+     * @param key
+     * @param defaultValue
+     * @return Either the user config value associated with a given key or a supplied default value
+     */
+    String getUserConfigValueOrDefault(String key, String defaultValue);
 
     /**
      * Record a user defined metric
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/ContextImpl.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/ContextImpl.java
index 378106ed4..02fa616a7 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/ContextImpl.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/ContextImpl.java
@@ -38,6 +38,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -174,12 +175,13 @@ public Logger getLogger() {
     }
 
     @Override
-    public String getUserConfigValue(String key) {
-        if (config.getFunctionConfig().containsUserConfig(key)) {
-            return config.getFunctionConfig().getUserConfigOrDefault(key, null);
-        } else {
-            return null;
-        }
+    public Optional<String> getUserConfigValue(String key) {
+        return Optional.ofNullable(config.getFunctionConfig().getUserConfigOrDefault(key, null));
+    }
+
+    @Override
+    public String getUserConfigValueOrDefault(String key, String defaultValue) {
+        return getUserConfigValue(key).orElse(defaultValue);
     }
 
     @Override
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/PublishFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/PublishFunction.java
index 236d6514a..01e385219 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/PublishFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/PublishFunction.java
@@ -25,7 +25,9 @@
 public class PublishFunction implements Function<String, Void> {
     @Override
     public Void process(String input, Context context) {
-        context.publish(context.getUserConfigValue("PublishTopic"), input + "!", DefaultSerDe.class.getName());
+        String publishTopic = context.getUserConfigValueOrDefault("publish-topic", "persistent://sample/standalone/ns1/publish");
+        String output = String.format("%s!", input);
+        context.publish(publishTopic, output, DefaultSerDe.class.getName());
         return null;
     }
 }
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserConfigFunction.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserConfigFunction.java
index 65df29a51..6ff3dd878 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserConfigFunction.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/UserConfigFunction.java
@@ -20,11 +20,24 @@
 
 import org.apache.pulsar.functions.api.Context;
 import org.apache.pulsar.functions.api.Function;
+import org.slf4j.Logger;
 
-public class UserConfigFunction implements Function<String, String> {
+import java.util.Optional;
+
+public class UserConfigFunction implements Function<String, Void> {
     @Override
-    public String process(String input, Context context) {
-        context.getLogger().info("My Config is " + context.getUserConfigValue("MyOwnConfig"));
-        return input + context.getUserConfigValue("MyOwnConfig");
+    public Void process(String input, Context context) {
+        String key = "config-key";
+        Optional<String> maybeValue = context.getUserConfigValue(key);
+        Logger LOG = context.getLogger();
+
+        if (maybeValue.isPresent()) {
+            String value = maybeValue.get();
+            LOG.info("The config value is {}", value);
+        } else {
+            LOG.error("No value present for the key {}", key);
+        }
+
+        return null;
     }
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services