From 40e5c64451344f256e3289d61c4ca1306043f9c2 Mon Sep 17 00:00:00 2001
From: volodymyr-babak <volodymyr.babak@gmail.com>
Date: Mon, 20 Feb 2017 09:56:53 +0200
Subject: [PATCH] Fixed mapping for combo-boxes with multiple=false

---
 .../rabbitmq/action/RabbitMqPluginAction.java |  2 +-
 .../RabbitMqPluginActionConfiguration.java    |  2 +-
 .../resources/RabbitMqActionDescriptor.json   | 59 +++++++++----------
 ...emoClient.java => RabbitMqDemoClient.java} |  2 +-
 .../rest/action/RestApiCallPluginAction.java  | 11 +---
 .../RestApiCallPluginActionConfiguration.java |  2 +-
 .../rest/plugin/RestApiCallPlugin.java        |  2 +-
 .../RestApiCallPluginConfiguration.java       |  2 +-
 .../RestApiCallActionDescriptor.json          | 26 ++++----
 .../RestApiCallPluginDescriptor.json          | 26 ++++----
 .../RestApiCallDemoClient.java                |  0
 11 files changed, 60 insertions(+), 74 deletions(-)
 rename extensions/extension-rabbitmq/src/test/java/org/thingsboard/server/extensions/rabbitmq/{DemoClient.java => RabbitMqDemoClient.java} (98%)
 rename extensions/extension-rest-api-call/src/test/java/org/thingsboard/server/extensions/{kafka => rest}/RestApiCallDemoClient.java (100%)

diff --git a/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginAction.java b/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginAction.java
index 4c70a6cfd8..2333a1df47 100644
--- a/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginAction.java
+++ b/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginAction.java
@@ -37,7 +37,7 @@ public class RabbitMqPluginAction extends AbstractTemplatePluginAction<RabbitMqP
         builder.sync(configuration.isSync());
         builder.exchange(configuration.getExchange());
         builder.queueName(configuration.getQueueName());
-        builder.messageProperties(configuration.getMessageProperties()[0]);
+        builder.messageProperties(configuration.getMessageProperties());
         builder.msgType(payload.getMsgType());
         builder.requestId(payload.getRequestId());
         builder.payload(getMsgBody(ctx, msg));
diff --git a/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginActionConfiguration.java b/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginActionConfiguration.java
index b08b884518..d639350bf6 100644
--- a/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginActionConfiguration.java
+++ b/extensions/extension-rabbitmq/src/main/java/org/thingsboard/server/extensions/rabbitmq/action/RabbitMqPluginActionConfiguration.java
@@ -27,6 +27,6 @@ public class RabbitMqPluginActionConfiguration implements TemplateActionConfigur
     private boolean sync;
     private String exchange;
     private String queueName;
-    private String[] messageProperties;
+    private String messageProperties;
     private String template;
 }
diff --git a/extensions/extension-rabbitmq/src/main/resources/RabbitMqActionDescriptor.json b/extensions/extension-rabbitmq/src/main/resources/RabbitMqActionDescriptor.json
index 3a2e4e1b15..c365f13c10 100644
--- a/extensions/extension-rabbitmq/src/main/resources/RabbitMqActionDescriptor.json
+++ b/extensions/extension-rabbitmq/src/main/resources/RabbitMqActionDescriptor.json
@@ -18,35 +18,7 @@
       },
       "messageProperties": {
         "title": "Message properties",
-        "type": "array",
-        "minItems" : 1,
-        "items": [
-          {
-            "value": "BASIC",
-            "label": "BASIC"
-          },
-          {
-            "value": "MINIMAL_BASIC",
-            "label": "MINIMAL_BASIC"
-          },
-          {
-            "value": "MINIMAL_PERSISTENT_BASIC",
-            "label": "MINIMAL_PERSISTENT_BASIC"
-          },
-          {
-            "value": "PERSISTENT_BASIC",
-            "label": "PERSISTENT_BASIC"
-          },
-          {
-            "value": "PERSISTENT_TEXT_PLAIN",
-            "label": "PERSISTENT_TEXT_PLAIN"
-          },
-          {
-            "value": "TEXT_PLAIN",
-            "label": "TEXT_PLAIN"
-          }
-        ],
-        "uniqueItems": true
+        "type": "string"
       },
       "template": {
         "title": "Body Template",
@@ -67,8 +39,35 @@
     {
       "key": "messageProperties",
       "type": "rc-select",
-      "multiple": false
+      "multiple": false,
+      "items": [
+        {
+          "value": "BASIC",
+          "label": "BASIC"
+        },
+        {
+          "value": "MINIMAL_BASIC",
+          "label": "MINIMAL_BASIC"
+        },
+        {
+          "value": "MINIMAL_PERSISTENT_BASIC",
+          "label": "MINIMAL_PERSISTENT_BASIC"
+        },
+        {
+          "value": "PERSISTENT_BASIC",
+          "label": "PERSISTENT_BASIC"
+        },
+        {
+          "value": "PERSISTENT_TEXT_PLAIN",
+          "label": "PERSISTENT_TEXT_PLAIN"
+        },
+        {
+          "value": "TEXT_PLAIN",
+          "label": "TEXT_PLAIN"
+        }
+      ]
     },
+
     {
       "key": "template",
       "type": "textarea",
diff --git a/extensions/extension-rabbitmq/src/test/java/org/thingsboard/server/extensions/rabbitmq/DemoClient.java b/extensions/extension-rabbitmq/src/test/java/org/thingsboard/server/extensions/rabbitmq/RabbitMqDemoClient.java
similarity index 98%
rename from extensions/extension-rabbitmq/src/test/java/org/thingsboard/server/extensions/rabbitmq/DemoClient.java
rename to extensions/extension-rabbitmq/src/test/java/org/thingsboard/server/extensions/rabbitmq/RabbitMqDemoClient.java
index 54506e638e..0319ddea78 100644
--- a/extensions/extension-rabbitmq/src/test/java/org/thingsboard/server/extensions/rabbitmq/DemoClient.java
+++ b/extensions/extension-rabbitmq/src/test/java/org/thingsboard/server/extensions/rabbitmq/RabbitMqDemoClient.java
@@ -22,7 +22,7 @@ import java.io.IOException;
 /**
  * @author Andrew Shvayka
  */
-public class DemoClient {
+public class RabbitMqDemoClient {
 
     private static final String HOST = "localhost";
     private static final String USERNAME = "guest";
diff --git a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallPluginAction.java b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallPluginAction.java
index 055dcb6ec3..71c87fd7f9 100644
--- a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallPluginAction.java
+++ b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallPluginAction.java
@@ -16,23 +16,14 @@
 package org.thingsboard.server.extensions.rest.action;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.runtime.parser.ParseException;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.thingsboard.server.common.msg.device.ToDeviceActorMsg;
 import org.thingsboard.server.common.msg.session.FromDeviceRequestMsg;
-import org.thingsboard.server.common.msg.session.ToDeviceMsg;
 import org.thingsboard.server.extensions.api.component.Action;
-import org.thingsboard.server.extensions.api.plugins.PluginAction;
-import org.thingsboard.server.extensions.api.plugins.msg.PluginToRuleMsg;
-import org.thingsboard.server.extensions.api.plugins.msg.ResponsePluginToRuleMsg;
 import org.thingsboard.server.extensions.api.plugins.msg.RuleToPluginMsg;
 import org.thingsboard.server.extensions.api.rules.RuleContext;
-import org.thingsboard.server.extensions.api.rules.RuleProcessingMetaData;
 import org.thingsboard.server.extensions.core.action.template.AbstractTemplatePluginAction;
-import org.thingsboard.server.extensions.core.utils.VelocityUtils;
 
 import java.util.Optional;
 
@@ -48,7 +39,7 @@ public class RestApiCallPluginAction extends AbstractTemplatePluginAction<RestAp
         builder.requestId(payload.getRequestId());
         builder.sync(configuration.isSync());
         builder.actionPath(configuration.getActionPath());
-        builder.httpMethod(HttpMethod.valueOf(configuration.getRequestMethod()[0]));
+        builder.httpMethod(HttpMethod.valueOf(configuration.getRequestMethod()));
         builder.expectedResultCode(HttpStatus.valueOf(configuration.getExpectedResultCode()));
         builder.msgBody(getMsgBody(ctx, msg));
         return Optional.of(new RestApiCallActionMsg(msg.getTenantId(),
diff --git a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallPluginActionConfiguration.java b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallPluginActionConfiguration.java
index 91c0f27fb5..664fe8273b 100644
--- a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallPluginActionConfiguration.java
+++ b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/action/RestApiCallPluginActionConfiguration.java
@@ -24,5 +24,5 @@ public class RestApiCallPluginActionConfiguration implements TemplateActionConfi
     private String template;
     private String actionPath;
     private int expectedResultCode;
-    private String[] requestMethod;
+    private String requestMethod;
 }
diff --git a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPlugin.java b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPlugin.java
index cd77b880d8..797ebf5cb7 100644
--- a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPlugin.java
+++ b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPlugin.java
@@ -47,7 +47,7 @@ public class RestApiCallPlugin extends AbstractPlugin<RestApiCallPluginConfigura
                 configuration.getPort(),
                 configuration.getBasePath());
 
-        if (configuration.getAuthMethod()[0].equals(BASIC_AUTH_METHOD)) {
+        if (configuration.getAuthMethod().equals(BASIC_AUTH_METHOD)) {
             String userName = configuration.getUserName();
             String password = configuration.getPassword();
             String credentials = String.format(CREDENTIALS_TEMPLATE, userName, password);
diff --git a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPluginConfiguration.java b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPluginConfiguration.java
index 02314da9f7..2b20e9bec1 100644
--- a/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPluginConfiguration.java
+++ b/extensions/extension-rest-api-call/src/main/java/org/thingsboard/server/extensions/rest/plugin/RestApiCallPluginConfiguration.java
@@ -23,7 +23,7 @@ public class RestApiCallPluginConfiguration {
     private int port;
     private String basePath;
 
-    private String[] authMethod;
+    private String authMethod;
 
     private String userName;
     private String password;
diff --git a/extensions/extension-rest-api-call/src/main/resources/RestApiCallActionDescriptor.json b/extensions/extension-rest-api-call/src/main/resources/RestApiCallActionDescriptor.json
index c45d028d85..9da55b5e7a 100644
--- a/extensions/extension-rest-api-call/src/main/resources/RestApiCallActionDescriptor.json
+++ b/extensions/extension-rest-api-call/src/main/resources/RestApiCallActionDescriptor.json
@@ -18,19 +18,7 @@
       },
       "requestMethod": {
         "title": "Request method",
-        "type": "array",
-        "minItems" : 1,
-        "items": [
-          {
-            "value": "POST",
-            "label": "POST"
-          },
-          {
-            "value": "PUT",
-            "label": "PUT"
-          }
-        ],
-        "uniqueItems": true
+        "type": "string"
       },
       "expectedResultCode": {
         "title": "Expected Result Code",
@@ -56,7 +44,17 @@
     {
       "key": "requestMethod",
       "type": "rc-select",
-      "multiple": false
+      "multiple": false,
+      "items": [
+        {
+          "value": "POST",
+          "label": "POST"
+        },
+        {
+          "value": "PUT",
+          "label": "PUT"
+        }
+      ]
     },
     "expectedResultCode"
   ]
diff --git a/extensions/extension-rest-api-call/src/main/resources/RestApiCallPluginDescriptor.json b/extensions/extension-rest-api-call/src/main/resources/RestApiCallPluginDescriptor.json
index 2c319371cc..e0e4d1814d 100644
--- a/extensions/extension-rest-api-call/src/main/resources/RestApiCallPluginDescriptor.json
+++ b/extensions/extension-rest-api-call/src/main/resources/RestApiCallPluginDescriptor.json
@@ -21,19 +21,7 @@
       },
       "authMethod": {
         "title": "Authentication method",
-        "type": "array",
-        "minItems" : 1,
-        "items": [
-          {
-            "value": "NO_AUTH",
-            "label": "No authentication"
-          },
-          {
-            "value": "BASIC_AUTH",
-            "label": "Basic authentication"
-          }
-        ],
-        "uniqueItems": true
+        "type": "string"
       },
       "userName": {
         "title": "Username",
@@ -58,7 +46,17 @@
     {
       "key": "authMethod",
       "type": "rc-select",
-      "multiple": false
+      "multiple": false,
+      "items": [
+        {
+          "value": "NO_AUTH",
+          "label": "No authentication"
+        },
+        {
+          "value": "BASIC_AUTH",
+          "label": "Basic authentication"
+        }
+      ]
     },
     "userName",
     {
diff --git a/extensions/extension-rest-api-call/src/test/java/org/thingsboard/server/extensions/kafka/RestApiCallDemoClient.java b/extensions/extension-rest-api-call/src/test/java/org/thingsboard/server/extensions/rest/RestApiCallDemoClient.java
similarity index 100%
rename from extensions/extension-rest-api-call/src/test/java/org/thingsboard/server/extensions/kafka/RestApiCallDemoClient.java
rename to extensions/extension-rest-api-call/src/test/java/org/thingsboard/server/extensions/rest/RestApiCallDemoClient.java