GG-20428 Backport to 8.8-master of GG-20371 Trimmed WC agent argument…

…s. (#214) (cherry picked from commit 6ccbbfe)
gridgain · Jun 27, 2019 · 376d677 · 376d677
1 parent 870e225
commit 376d677
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/...b-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentConfiguration.java b/...b-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentConfiguration.java
@@ -31,6 +31,7 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.ignite.console.agent.AgentUtils.secured;
+import static org.apache.ignite.console.agent.AgentUtils.trim;
 
 /**
  * Agent configuration.
@@ -590,6 +591,10 @@ public void merge(AgentConfiguration cfg) {
 
         if (cipherSuites == null)
             cipherSuites(cfg.cipherSuites());
+
+        tokens = trim(tokens);
+        nodeURIs = trim(nodeURIs);
+        cipherSuites = trim(cipherSuites);
     }
 
 

diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentUtils.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentUtils.java
@@ -300,4 +300,14 @@ public static <K, V> Map.Entry<K, V> entry(K key, V val) {
     public static void send(Session ses, WebSocketEvent evt) throws Exception {
         ses.getRemote().sendStringByFuture(toJson(evt)).get();
     }
+
+    /**
+     * Trim all elements in list and return new list.
+     *
+     * @param lst List of elements to trim.
+     * @return List with trimmed values.
+     */
+    public static List<String> trim(List<String> lst) {
+        return F.isEmpty(lst) ? lst : lst.stream().map(String::trim).collect(toList());
+    }
 }