You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/10/21 08:16:30 UTC
[camel-k-runtime] 03/04: yaml: use URISupport to create query string
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 77ca0b7d61b6dac9d9d09beddf2ebabe4cada025
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Mon Oct 19 14:51:39 2020 +0200
yaml: use URISupport to create query string
---
.../camel/k/loader/yaml/support/StepParserSupport.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/StepParserSupport.java b/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/StepParserSupport.java
index 017ad30..fc44afe 100644
--- a/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/StepParserSupport.java
+++ b/camel-k-loader-yaml/camel-k-loader-yaml-common/src/main/java/org/apache/camel/k/loader/yaml/support/StepParserSupport.java
@@ -19,7 +19,6 @@ package org.apache.camel.k.loader.yaml.support;
import java.net.URISyntaxException;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
@@ -31,6 +30,7 @@ import org.apache.camel.model.OutputNode;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.spi.EndpointUriFactory;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.URISupport;
public final class StepParserSupport {
private StepParserSupport() {
@@ -74,13 +74,15 @@ public final class StepParserSupport {
String answer = uri;
if (parameters != null) {
- String queryString = parameters.entrySet().stream()
- .filter(entry -> entry.getValue() != null)
- .map(entry -> String.format("%s=%s", entry.getKey(), entry.getValue()))
- .collect(Collectors.joining("&"));
-
- if (ObjectHelper.isNotEmpty(queryString)) {
- answer += "?" + queryString;
+ String queryString;
+
+ try {
+ queryString = URISupport.createQueryString(parameters, false);
+ if (ObjectHelper.isNotEmpty(queryString)) {
+ answer += "?" + queryString;
+ }
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException(e);
}
}