You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/08/30 09:21:13 UTC
[camel] branch camel-3.14.x updated: CAMEL-18432 - camel-Docker: malformed uri path
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new cce051baac6 CAMEL-18432 - camel-Docker: malformed uri path
cce051baac6 is described below
commit cce051baac62aaf5d94df0d30a5a79f6003256e4
Author: Marco Pernigo <ma...@openinnovation.it>
AuthorDate: Fri Aug 26 14:01:51 2022 +0200
CAMEL-18432 - camel-Docker: malformed uri path
---
.../apache/camel/catalog/components/docker.json | 2 +-
.../org/apache/camel/component/docker/docker.json | 2 +-
.../component/docker/DockerConfiguration.java | 8 +++----
.../builder/endpoint/StaticEndpointBuilders.java | 26 ++++++++++++----------
.../endpoint/dsl/DockerEndpointBuilderFactory.java | 22 +++++++++---------
5 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/docker.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/docker.json
index 7e0444e8a48..1a331853080 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/docker.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/docker.json
@@ -45,7 +45,7 @@
"username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.docker.DockerConfiguration", "configurationField": "configuration", "description": "User name to authenticate with" }
},
"properties": {
- "operation": { "kind": "path", "displayName": "Operation", "group": "common", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.docker.DockerOperation", "enum": [ "events", "stats", "auth", "info", "ping", "version", "imagebuild", "imagecreate", "imageinspect", "imagelist", "imagepull", "imagepushimageremove", "imagesearch", "imagetag", "containerattach", "containercommit", "containercopyfile", "containercreate", "containerdiffinspectcontainer", [...]
+ "operation": { "kind": "path", "displayName": "Operation", "group": "common", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.docker.DockerOperation", "enum": [ "events", "stats", "auth", "info", "ping", "version", "imagebuild", "imagecreate", "imageinspect", "imagelist", "imagepull", "imagepush", "imageremove", "imagesearch", "imagetag", "containerattach", "containercommit", "containercopyfile", "containercreate", "containerdiff", "inspectcon [...]
"email": { "kind": "parameter", "displayName": "Email", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.docker.DockerConfiguration", "configurationField": "configuration", "description": "Email address associated with the user" },
"host": { "kind": "parameter", "displayName": "Host", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "localhost", "configurationClass": "org.apache.camel.component.docker.DockerConfiguration", "configurationField": "configuration", "description": "Docker host" },
"port": { "kind": "parameter", "displayName": "Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "2375", "configurationClass": "org.apache.camel.component.docker.DockerConfiguration", "configurationField": "configuration", "description": "Docker port" },
diff --git a/components/camel-docker/src/generated/resources/org/apache/camel/component/docker/docker.json b/components/camel-docker/src/generated/resources/org/apache/camel/component/docker/docker.json
index 7e0444e8a48..1a331853080 100644
--- a/components/camel-docker/src/generated/resources/org/apache/camel/component/docker/docker.json
+++ b/components/camel-docker/src/generated/resources/org/apache/camel/component/docker/docker.json
@@ -45,7 +45,7 @@
"username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.docker.DockerConfiguration", "configurationField": "configuration", "description": "User name to authenticate with" }
},
"properties": {
- "operation": { "kind": "path", "displayName": "Operation", "group": "common", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.docker.DockerOperation", "enum": [ "events", "stats", "auth", "info", "ping", "version", "imagebuild", "imagecreate", "imageinspect", "imagelist", "imagepull", "imagepushimageremove", "imagesearch", "imagetag", "containerattach", "containercommit", "containercopyfile", "containercreate", "containerdiffinspectcontainer", [...]
+ "operation": { "kind": "path", "displayName": "Operation", "group": "common", "label": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.docker.DockerOperation", "enum": [ "events", "stats", "auth", "info", "ping", "version", "imagebuild", "imagecreate", "imageinspect", "imagelist", "imagepull", "imagepush", "imageremove", "imagesearch", "imagetag", "containerattach", "containercommit", "containercopyfile", "containercreate", "containerdiff", "inspectcon [...]
"email": { "kind": "parameter", "displayName": "Email", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.docker.DockerConfiguration", "configurationField": "configuration", "description": "Email address associated with the user" },
"host": { "kind": "parameter", "displayName": "Host", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "localhost", "configurationClass": "org.apache.camel.component.docker.DockerConfiguration", "configurationField": "configuration", "description": "Docker host" },
"port": { "kind": "parameter", "displayName": "Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "2375", "configurationClass": "org.apache.camel.component.docker.DockerConfiguration", "configurationField": "configuration", "description": "Docker port" },
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
index 499df0b553a..b674be7a24a 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
@@ -28,10 +28,10 @@ import org.apache.camel.spi.UriPath;
@UriParams
public class DockerConfiguration implements Cloneable {
- @UriPath(enums = "events,stats,auth,info,ping,version,imagebuild,imagecreate,imageinspect,imagelist,imagepull,imagepush"
- + "imageremove,imagesearch,imagetag,containerattach,containercommit,containercopyfile,containercreate,containerdiff"
- + "inspectcontainer,containerkill,containerlist,containerlog,containerpause,containerrestart,containerremove,containerstart"
- + "containerstop,containertop,containerunpause,containerwait,execcreate,execstart")
+ @UriPath(enums = "events,stats,auth,info,ping,version,imagebuild,imagecreate,imageinspect,imagelist,imagepull,imagepush,"
+ + "imageremove,imagesearch,imagetag,containerattach,containercommit,containercopyfile,containercreate,containerdiff,"
+ + "inspectcontainer,containerkill,containerlist,containerlog,containerpause,containerrestart,containerremove,containerstart,"
+ + "containerstop,containertop,containerunpause,containerwait,execcreate,execstart,networkconnect,networkcreate,networkremove")
@Metadata(required = true)
private DockerOperation operation;
@UriParam(defaultValue = "localhost")
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 3a020a2e737..c54bc20b05f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -4127,14 +4127,15 @@ public class StaticEndpointBuilders {
*
* Path parameter: operation (required)
* Which operation to use
- * There are 31 enums and the value can be one of: events, stats, auth,
+ * There are 37 enums and the value can be one of: events, stats, auth,
* info, ping, version, imagebuild, imagecreate, imageinspect, imagelist,
- * imagepull, imagepushimageremove, imagesearch, imagetag, containerattach,
- * containercommit, containercopyfile, containercreate,
- * containerdiffinspectcontainer, containerkill, containerlist,
+ * imagepull, imagepush, imageremove, imagesearch, imagetag,
+ * containerattach, containercommit, containercopyfile, containercreate,
+ * containerdiff, inspectcontainer, containerkill, containerlist,
* containerlog, containerpause, containerrestart, containerremove,
- * containerstartcontainerstop, containertop, containerunpause,
- * containerwait, execcreate, execstart
+ * containerstart, containerstop, containertop, containerunpause,
+ * containerwait, execcreate, execstart, networkconnect, networkcreate,
+ * networkremove
*
* @param path operation
* @return the dsl builder
@@ -4155,14 +4156,15 @@ public class StaticEndpointBuilders {
*
* Path parameter: operation (required)
* Which operation to use
- * There are 31 enums and the value can be one of: events, stats, auth,
+ * There are 37 enums and the value can be one of: events, stats, auth,
* info, ping, version, imagebuild, imagecreate, imageinspect, imagelist,
- * imagepull, imagepushimageremove, imagesearch, imagetag, containerattach,
- * containercommit, containercopyfile, containercreate,
- * containerdiffinspectcontainer, containerkill, containerlist,
+ * imagepull, imagepush, imageremove, imagesearch, imagetag,
+ * containerattach, containercommit, containercopyfile, containercreate,
+ * containerdiff, inspectcontainer, containerkill, containerlist,
* containerlog, containerpause, containerrestart, containerremove,
- * containerstartcontainerstop, containertop, containerunpause,
- * containerwait, execcreate, execstart
+ * containerstart, containerstop, containertop, containerunpause,
+ * containerwait, execcreate, execstart, networkconnect, networkcreate,
+ * networkremove
*
* @param componentName to use a custom component name for the endpoint
* instead of the default name
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
index c9f6074ac83..81a1664a2a2 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
@@ -1548,14 +1548,15 @@ public interface DockerEndpointBuilderFactory {
*
* Path parameter: operation (required)
* Which operation to use
- * There are 31 enums and the value can be one of: events, stats, auth,
+ * There are 37 enums and the value can be one of: events, stats, auth,
* info, ping, version, imagebuild, imagecreate, imageinspect,
- * imagelist, imagepull, imagepushimageremove, imagesearch, imagetag,
+ * imagelist, imagepull, imagepush, imageremove, imagesearch, imagetag,
* containerattach, containercommit, containercopyfile, containercreate,
- * containerdiffinspectcontainer, containerkill, containerlist,
+ * containerdiff, inspectcontainer, containerkill, containerlist,
* containerlog, containerpause, containerrestart, containerremove,
- * containerstartcontainerstop, containertop, containerunpause,
- * containerwait, execcreate, execstart
+ * containerstart, containerstop, containertop, containerunpause,
+ * containerwait, execcreate, execstart, networkconnect, networkcreate,
+ * networkremove
*
* @param path operation
* @return the dsl builder
@@ -1575,14 +1576,15 @@ public interface DockerEndpointBuilderFactory {
*
* Path parameter: operation (required)
* Which operation to use
- * There are 31 enums and the value can be one of: events, stats, auth,
+ * There are 37 enums and the value can be one of: events, stats, auth,
* info, ping, version, imagebuild, imagecreate, imageinspect,
- * imagelist, imagepull, imagepushimageremove, imagesearch, imagetag,
+ * imagelist, imagepull, imagepush, imageremove, imagesearch, imagetag,
* containerattach, containercommit, containercopyfile, containercreate,
- * containerdiffinspectcontainer, containerkill, containerlist,
+ * containerdiff, inspectcontainer, containerkill, containerlist,
* containerlog, containerpause, containerrestart, containerremove,
- * containerstartcontainerstop, containertop, containerunpause,
- * containerwait, execcreate, execstart
+ * containerstart, containerstop, containertop, containerunpause,
+ * containerwait, execcreate, execstart, networkconnect, networkcreate,
+ * networkremove
*
* @param componentName to use a custom component name for the endpoint
* instead of the default name