Repository: camel Updated Branches: refs/heads/camel-2.19.x d03f78bcf -> 2ad2cc021 refs/heads/master 86b58a1ad -> 0150745a9
CAMEL-11843: Fix issues configuring some URI options on DockerEndpoint Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0150745a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0150745a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0150745a Branch: refs/heads/master Commit: 0150745a9434818ed919e777013d191b1d9983ab Parents: 86b58a1 Author: James Netherton <jamesnether...@gmail.com> Authored: Wed Sep 27 10:36:04 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Sep 27 11:53:41 2017 +0200 ---------------------------------------------------------------------- .../camel/component/docker/DockerComponent.java | 3 - .../camel/component/docker/DockerHelper.java | 62 -------------------- .../docker/it/DockerProducerTestIT.java | 2 +- 3 files changed, 1 insertion(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0150745a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java index cfcc08b..a41ffeb 100644 --- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java +++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerComponent.java @@ -61,9 +61,6 @@ public class DockerComponent extends DefaultComponent { configuration.setOperation(operation); - // Validate URI Parameters - DockerHelper.validateParameters(operation, parameters); - Endpoint endpoint = new DockerEndpoint(uri, this, configuration); setProperties(configuration, parameters); configuration.setParameters(parameters); http://git-wip-us.apache.org/repos/asf/camel/blob/0150745a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java index 7b886ab..4df89d5 100644 --- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java +++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java @@ -17,10 +17,7 @@ package org.apache.camel.component.docker; import java.lang.reflect.Array; -import java.util.HashMap; -import java.util.Map; -import com.github.dockerjava.api.exception.DockerClientException; import org.apache.camel.Message; import org.apache.camel.util.ObjectHelper; import org.apache.commons.lang.BooleanUtils; @@ -37,45 +34,6 @@ public final class DockerHelper { } /** - * Validates the URI parameters for a given {@link DockerOperation} - * - * @param dockerOperation - * @param parameters - */ - public static void validateParameters(DockerOperation dockerOperation, Map<String, Object> parameters) { - Map<String, Class<?>> validParamMap = new HashMap<String, Class<?>>(); - validParamMap.putAll(DockerConstants.DOCKER_DEFAULT_PARAMETERS); - validParamMap.putAll(dockerOperation.getParameters()); - - for (String key : parameters.keySet()) { - - String transformedKey = DockerHelper.transformToHeaderName(key); - - // Validate URI parameter name - if (!validParamMap.containsKey(transformedKey)) { - throw new DockerClientException(key + " is not a valid URI parameter"); - } - - try { - Class<?> parameterClass = validParamMap.get(transformedKey); - Object parameterValue = parameters.get(key); - - if (parameterClass == null || parameterValue == null) { - throw new DockerClientException("Failed to validate parameter type for property " + key); - } - - if (Integer.class == parameterClass) { - Integer.parseInt((String)parameterValue); - } else if (Boolean.class == parameterClass) { - BooleanUtils.toBooleanObject((String)parameterValue, "true", "false", "null"); - } - } catch (Exception e) { - throw new DockerClientException("Failed to validate parameter type for property " + key); - } - } - } - - /** * Transforms a Docker Component header value to its analogous URI * parameter * @@ -98,26 +56,6 @@ public final class DockerHelper { } /** - * Transforms a Docker Component URI parameter to its analogous header - * value - * - * @param name - * @return - */ - public static String transformToHeaderName(String name) { - ObjectHelper.notEmpty(name, "name"); - - StringBuilder formattedName = new StringBuilder(DockerConstants.DOCKER_PREFIX); - - if (name.length() > 0) { - formattedName.append(name.substring(0, 1).toUpperCase()); - formattedName.append(name.substring(1)); - } - - return formattedName.toString(); - } - - /** * Attempts to locate a given property name within a URI parameter or the * message header. A found value in a message header takes precedence over a * URI parameter. http://git-wip-us.apache.org/repos/asf/camel/blob/0150745a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java index 07826b7..99b5d9b 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java @@ -42,7 +42,7 @@ public class DockerProducerTestIT extends DockerITTestSupport { return new RouteBuilder() { public void configure() { from("direct:in") - .to("docker://imagelist") + .to("docker://imagelist?maxTotalConnections=10") .log("${body}") .to("mock:result"); }
