This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new a0f8a615a2e CAMEL-18432 - camel-Docker: malformed uri path
a0f8a615a2e is described below
commit a0f8a615a2e794267e8a8f075aa110ec4bcf0e74
Author: Marco Pernigo <marco.pern...@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 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
.../org/apache/camel/component/docker/docker.json | 2 +-
.../component/docker/DockerConfiguration.java | 8 +++----
.../builder/endpoint/StaticEndpointBuilders.java | 26 ++++++++++++----------
.../endpoint/dsl/DockerEndpointBuilderFactory.java | 22 +++++++++---------
6 files changed, 33 insertions(+), 29 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 fbb63a1afb8..a3b4a271dbf 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
@@ -128,7 +128,7 @@
"CamelDockerExecId": { "kind": "header", "displayName": "", "group":
"common", "label": "", "required": false, "javaType": "String", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The Exec ID", "constantName":
"org.apache.camel.component.docker.DockerConstants#DOCKER_EXEC_ID" }
},
"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/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 72a58fdca1b..b8ea5569626 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -392,7 +392,7 @@ Enriches a message with data from a secondary resource
<xs:element name="errorHandler" nillable="true" type="xs:anyType">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-Camel error handling.
+Error handler settings
]]></xs:documentation>
</xs:annotation>
</xs:element>
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 fbb63a1afb8..a3b4a271dbf 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
@@ -128,7 +128,7 @@
"CamelDockerExecId": { "kind": "header", "displayName": "", "group":
"common", "label": "", "required": false, "javaType": "String", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The Exec ID", "constantName":
"org.apache.camel.component.docker.DockerConstants#DOCKER_EXEC_ID" }
},
"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/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 037d7919951..b72cc1a37a0 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -3988,14 +3988,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
@@ -4016,14 +4017,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/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
index 9af1570fc0f..29afed0d379 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
@@ -1562,14 +1562,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
@@ -1589,14 +1590,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
