[pulsar] branch master updated: Fix source/sink creation to use JSON config values. (#3922)

[mmerli]

This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new ee395ca  Fix source/sink creation to use JSON config values. (#3922)
ee395ca is described below

commit ee395ca597beee9a0d844fd305d68b8400c947d5
Author: Fangbin Sun <sunfang...@gmail.com>
AuthorDate: Fri Mar 29 04:33:17 2019 +0800

    Fix source/sink creation to use JSON config values. (#3922)
---
 .../src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java            | 2 +-
 .../src/main/java/org/apache/pulsar/admin/cli/CmdSources.java          | 3 +--
 .../src/test/java/org/apache/pulsar/admin/cli/TestCmdSinks.java        | 2 +-
 .../src/test/java/org/apache/pulsar/admin/cli/TestCmdSources.java      | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
index 00cd26f..52842c3 100644
--- 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
+++ 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
@@ -423,7 +423,7 @@ public class CmdSinks extends CmdBase {
         }
 
         protected Map<String, Object> parseConfigs(String str) {
-            Type type = new TypeToken<Map<String, String>>(){}.getType();
+            Type type = new TypeToken<Map<String, Object>>(){}.getType();
             return new Gson().fromJson(str, type);
         }
 
diff --git 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
index c334380..3b1927e 100644
--- 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
+++ 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
@@ -376,8 +376,7 @@ public class CmdSources extends CmdBase {
         }
 
         protected Map<String, Object> parseConfigs(String str) {
-            Type type = new TypeToken<Map<String, String>>() {
-            }.getType();
+            Type type = new TypeToken<Map<String, Object>>(){}.getType();
             return new Gson().fromJson(str, type);
         }
 
diff --git 
a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSinks.java
 
b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSinks.java
index 195d2e7..2bb3877 100644
--- 
a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSinks.java
+++ 
b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSinks.java
@@ -522,7 +522,7 @@ public class TestCmdSinks {
         testSinkConfig.setParallelism(PARALLELISM + 1);
         testSinkConfig.setArchive(JAR_FILE_PATH + "-prime");
         testSinkConfig.setResources(new Resources(CPU + 1, RAM + 1, DISK + 1));
-        
testSinkConfig.setConfigs(createSink.parseConfigs("{\"created_at-prime\":\"Mon 
Jul 02 00:33:15 +0000 2018\"}"));
+        
testSinkConfig.setConfigs(createSink.parseConfigs("{\"created_at-prime\":\"Mon 
Jul 02 00:33:15 +0000 2018\", 
\"otherConfigProperties\":{\"property1.value\":\"value1\",\"property2.value\":\"value2\"}}"));
 
 
         SinkConfig expectedSinkConfig = getSinkConfig();
diff --git 
a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSources.java
 
b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSources.java
index bf9c079..77e26a5 100644
--- 
a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSources.java
+++ 
b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdSources.java
@@ -421,7 +421,7 @@ public class TestCmdSources {
         testSourceConfig.setParallelism(PARALLELISM + 1);
         testSourceConfig.setArchive(JAR_FILE_PATH + "-prime");
         testSourceConfig.setResources(new Resources(CPU + 1, RAM + 1, DISK + 
1));
-        
testSourceConfig.setConfigs(createSource.parseConfigs("{\"created_at-prime\":\"Mon
 Jul 02 00:33:15 +0000 2018\"}"));
+        
testSourceConfig.setConfigs(createSource.parseConfigs("{\"created_at-prime\":\"Mon
 Jul 02 00:33:15 +0000 2018\", 
\"otherProperties\":{\"property1.value\":\"value1\",\"property2.value\":\"value2\"}}"));
 
 
         SourceConfig expectedSourceConfig = getSourceConfig();