You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/05/07 12:49:32 UTC
[camel] 03/04: Renaming variable and consolidating - We can use ID
or Name for networks so can put under one header
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3fb94043e3f363254fc7a1ada5db36039e844e4c
Author: Martin Bramwell <ma...@hotmail.co.uk>
AuthorDate: Sun May 5 17:02:51 2019 +0100
Renaming variable and consolidating - We can use ID or Name for networks so can put under one header
---
.../java/org/apache/camel/component/docker/DockerConstants.java | 6 +-----
.../java/org/apache/camel/component/docker/DockerOperation.java | 6 +++---
.../org/apache/camel/component/docker/producer/DockerProducer.java | 6 +++---
.../component/docker/headers/ConnectToNetworkCmdHeaderTest.java | 2 +-
.../camel/component/docker/headers/CreateNetworkCmdHeaderTest.java | 2 +-
.../camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java | 2 +-
6 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
index 7023705..dad315b 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java
@@ -224,14 +224,10 @@ public final class DockerConstants {
/**
* Create Network *
- */
- public static final String DOCKER_NETWORK_NAME = "CamelDockerNetwork";
-
- /**
* Attach to Network *
* Remove Network *
*/
- public static final String DOCKER_NETWORK_ID = "CamelDockerNetworkId";
+ public static final String DOCKER_NETWORK = "CamelDockerNetwork";
/**
* Exec *
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
index e2a855b..4ab0f61 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
@@ -188,11 +188,11 @@ public enum DockerOperation {
UNPAUSE_CONTAINER("containerunpause", false, true, false,
DockerConstants.DOCKER_CONTAINER_ID, String.class),
CREATE_NETWORK("networkcreate", false, true, false,
- DockerConstants.DOCKER_NETWORK_NAME, String.class),
+ DockerConstants.DOCKER_NETWORK, String.class),
REMOVE_NETWORK("networkremove", false, true, false,
- DockerConstants.DOCKER_NETWORK_ID, String.class),
+ DockerConstants.DOCKER_NETWORK, String.class),
CONNECT_NETWORK("networkconnect", false, true, false,
- DockerConstants.DOCKER_NETWORK_ID, String.class,
+ DockerConstants.DOCKER_NETWORK, String.class,
DockerConstants.DOCKER_CONTAINER_ID, String.class),
WAIT_CONTAINER("containerwait", false, true, true,
DockerConstants.DOCKER_CONTAINER_ID, String.class),
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
index ade8db6..2ecd662 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java
@@ -1110,7 +1110,7 @@ public class DockerProducer extends DefaultProducer {
LOGGER.debug("Executing Docker Network Create Request");
- String networkName = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK_NAME, configuration, message, String.class);
+ String networkName = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK, configuration, message, String.class);
ObjectHelper.notNull(networkName, "Network Name must be specified");
@@ -1131,7 +1131,7 @@ public class DockerProducer extends DefaultProducer {
LOGGER.debug("Executing Docker Network Remove Request");
- String networkId = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK_ID, configuration, message, String.class);
+ String networkId = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK, configuration, message, String.class);
ObjectHelper.notNull(networkId, "Network ID must be specified");
@@ -1152,7 +1152,7 @@ public class DockerProducer extends DefaultProducer {
LOGGER.debug("Executing Docker Network Connect Request");
- String networkId = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK_ID, configuration, message, String.class);
+ String networkId = DockerHelper.getProperty(DockerConstants.DOCKER_NETWORK, configuration, message, String.class);
String containerId = DockerHelper.getProperty(DockerConstants.DOCKER_CONTAINER_ID, configuration, message, String.class);
ObjectHelper.notNull(networkId, "Network ID must be specified");
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
index 17e75a2..10d90cd 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/ConnectToNetworkCmdHeaderTest.java
@@ -46,7 +46,7 @@ public class ConnectToNetworkCmdHeaderTest extends BaseDockerHeaderTest<ConnectT
String containerId = "CID1234";
Map<String, Object> headers = getDefaultParameters();
- headers.put(DockerConstants.DOCKER_NETWORK_ID, networkId);
+ headers.put(DockerConstants.DOCKER_NETWORK, networkId);
headers.put(DockerConstants.DOCKER_CONTAINER_ID, containerId);
template.sendBodyAndHeaders("direct:in", "", headers);
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
index 5918eb7..3007194 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/CreateNetworkCmdHeaderTest.java
@@ -45,7 +45,7 @@ public class CreateNetworkCmdHeaderTest extends BaseDockerHeaderTest<CreateNetwo
String networkName = "TestNetwork";
Map<String, Object> headers = getDefaultParameters();
- headers.put(DockerConstants.DOCKER_NETWORK_NAME, networkName);
+ headers.put(DockerConstants.DOCKER_NETWORK, networkName);
template.sendBodyAndHeaders("direct:in", "", headers);
diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
index 1bb2253..cc749d1 100644
--- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
+++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/RemoveNetworkCmdHeaderTest.java
@@ -45,7 +45,7 @@ public class RemoveNetworkCmdHeaderTest extends BaseDockerHeaderTest<RemoveNetwo
String networkId = "ID1234";
Map<String, Object> headers = getDefaultParameters();
- headers.put(DockerConstants.DOCKER_NETWORK_ID, networkId);
+ headers.put(DockerConstants.DOCKER_NETWORK, networkId);
template.sendBodyAndHeaders("direct:in", "", headers);