This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch milo-better-user-password-handling in repository https://gitbox.apache.org/repos/asf/camel.git
commit 25741ce60b5bc5ba0ea2dbedc074e2707ebacd9c Author: Claus Ibsen <[email protected]> AuthorDate: Tue Jun 23 09:28:14 2026 +0200 chore: regenerate metadata and fix formatting for camel-milo Co-Authored-By: Claude <[email protected]> Signed-off-by: Claus Ibsen <[email protected]> --- .../component/milo/browse/MiloBrowseComponentConfigurer.java | 6 ++++++ .../camel/component/milo/browse/MiloBrowseEndpointConfigurer.java | 6 ++++++ .../camel/component/milo/browse/MiloBrowseEndpointUriFactory.java | 7 +++++-- .../component/milo/client/MiloClientComponentConfigurer.java | 6 ++++++ .../camel/component/milo/client/MiloClientEndpointConfigurer.java | 6 ++++++ .../camel/component/milo/client/MiloClientEndpointUriFactory.java | 7 +++++-- .../org/apache/camel/component/milo/browse/milo-browse.json | 8 ++++++-- .../org/apache/camel/component/milo/client/milo-client.json | 8 ++++++-- .../apache/camel/component/milo/client/MiloClientEndpoint.java | 1 - .../camel/component/milo/client/internal/SubscriptionManager.java | 4 +++- 10 files changed, 49 insertions(+), 10 deletions(-) diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/browse/MiloBrowseComponentConfigurer.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/browse/MiloBrowseComponentConfigurer.java index 6354a32100ef..b7046b96293b 100644 --- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/browse/MiloBrowseComponentConfigurer.java +++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/browse/MiloBrowseComponentConfigurer.java @@ -69,6 +69,7 @@ public class MiloBrowseComponentConfigurer extends PropertyConfigurerSupport imp case "overrideHost": getOrCreateConfiguration(target).setOverrideHost(property(camelContext, boolean.class, value)); return true; case "overrideport": case "overridePort": getOrCreateConfiguration(target).setOverridePort(property(camelContext, boolean.class, value)); return true; + case "password": getOrCreateConfiguration(target).setPassword(property(camelContext, java.lang.String.class, value)); return true; case "producturi": case "productUri": getOrCreateConfiguration(target).setProductUri(property(camelContext, java.lang.String.class, value)); return true; case "requesttimeout": @@ -79,6 +80,7 @@ public class MiloBrowseComponentConfigurer extends PropertyConfigurerSupport imp case "sessionName": getOrCreateConfiguration(target).setSessionName(property(camelContext, java.lang.String.class, value)); return true; case "sessiontimeout": case "sessionTimeout": getOrCreateConfiguration(target).setSessionTimeout(property(camelContext, java.lang.Long.class, value)); return true; + case "username": getOrCreateConfiguration(target).setUsername(property(camelContext, java.lang.String.class, value)); return true; default: return false; } } @@ -130,6 +132,7 @@ public class MiloBrowseComponentConfigurer extends PropertyConfigurerSupport imp case "overrideHost": return boolean.class; case "overrideport": case "overridePort": return boolean.class; + case "password": return java.lang.String.class; case "producturi": case "productUri": return java.lang.String.class; case "requesttimeout": @@ -140,6 +143,7 @@ public class MiloBrowseComponentConfigurer extends PropertyConfigurerSupport imp case "sessionName": return java.lang.String.class; case "sessiontimeout": case "sessionTimeout": return java.lang.Long.class; + case "username": return java.lang.String.class; default: return null; } } @@ -187,6 +191,7 @@ public class MiloBrowseComponentConfigurer extends PropertyConfigurerSupport imp case "overrideHost": return getOrCreateConfiguration(target).isOverrideHost(); case "overrideport": case "overridePort": return getOrCreateConfiguration(target).isOverridePort(); + case "password": return getOrCreateConfiguration(target).getPassword(); case "producturi": case "productUri": return getOrCreateConfiguration(target).getProductUri(); case "requesttimeout": @@ -197,6 +202,7 @@ public class MiloBrowseComponentConfigurer extends PropertyConfigurerSupport imp case "sessionName": return getOrCreateConfiguration(target).getSessionName(); case "sessiontimeout": case "sessionTimeout": return getOrCreateConfiguration(target).getSessionTimeout(); + case "username": return getOrCreateConfiguration(target).getUsername(); default: return null; } } diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/browse/MiloBrowseEndpointConfigurer.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/browse/MiloBrowseEndpointConfigurer.java index 708c394aee22..aa088f47c678 100644 --- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/browse/MiloBrowseEndpointConfigurer.java +++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/browse/MiloBrowseEndpointConfigurer.java @@ -67,6 +67,7 @@ public class MiloBrowseEndpointConfigurer extends PropertyConfigurerSupport impl case "overrideHost": target.getConfiguration().setOverrideHost(property(camelContext, boolean.class, value)); return true; case "overrideport": case "overridePort": target.getConfiguration().setOverridePort(property(camelContext, boolean.class, value)); return true; + case "password": target.getConfiguration().setPassword(property(camelContext, java.lang.String.class, value)); return true; case "producturi": case "productUri": target.getConfiguration().setProductUri(property(camelContext, java.lang.String.class, value)); return true; case "recursive": target.setRecursive(property(camelContext, boolean.class, value)); return true; @@ -78,6 +79,7 @@ public class MiloBrowseEndpointConfigurer extends PropertyConfigurerSupport impl case "sessionName": target.getConfiguration().setSessionName(property(camelContext, java.lang.String.class, value)); return true; case "sessiontimeout": case "sessionTimeout": target.getConfiguration().setSessionTimeout(property(camelContext, java.lang.Long.class, value)); return true; + case "username": target.getConfiguration().setUsername(property(camelContext, java.lang.String.class, value)); return true; default: return false; } } @@ -129,6 +131,7 @@ public class MiloBrowseEndpointConfigurer extends PropertyConfigurerSupport impl case "overrideHost": return boolean.class; case "overrideport": case "overridePort": return boolean.class; + case "password": return java.lang.String.class; case "producturi": case "productUri": return java.lang.String.class; case "recursive": return boolean.class; @@ -140,6 +143,7 @@ public class MiloBrowseEndpointConfigurer extends PropertyConfigurerSupport impl case "sessionName": return java.lang.String.class; case "sessiontimeout": case "sessionTimeout": return java.lang.Long.class; + case "username": return java.lang.String.class; default: return null; } } @@ -192,6 +196,7 @@ public class MiloBrowseEndpointConfigurer extends PropertyConfigurerSupport impl case "overrideHost": return target.getConfiguration().isOverrideHost(); case "overrideport": case "overridePort": return target.getConfiguration().isOverridePort(); + case "password": return target.getConfiguration().getPassword(); case "producturi": case "productUri": return target.getConfiguration().getProductUri(); case "recursive": return target.isRecursive(); @@ -203,6 +208,7 @@ public class MiloBrowseEndpointConfigurer extends PropertyConfigurerSupport impl case "sessionName": return target.getConfiguration().getSessionName(); case "sessiontimeout": case "sessionTimeout": return target.getConfiguration().getSessionTimeout(); + case "username": return target.getConfiguration().getUsername(); default: return null; } } diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/browse/MiloBrowseEndpointUriFactory.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/browse/MiloBrowseEndpointUriFactory.java index 885128ccdad6..5c7240ca1682 100644 --- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/browse/MiloBrowseEndpointUriFactory.java +++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/browse/MiloBrowseEndpointUriFactory.java @@ -24,7 +24,7 @@ public class MiloBrowseEndpointUriFactory extends org.apache.camel.support.compo private static final Set<String> ENDPOINT_IDENTITY_PROPERTY_NAMES; private static final Map<String, String> MULTI_VALUE_PREFIXES; static { - Set<String> props = new HashSet<>(31); + Set<String> props = new HashSet<>(33); props.add("allowedSecurityPolicies"); props.add("applicationName"); props.add("applicationUri"); @@ -50,16 +50,19 @@ public class MiloBrowseEndpointUriFactory extends org.apache.camel.support.compo props.add("nodeClasses"); props.add("overrideHost"); props.add("overridePort"); + props.add("password"); props.add("productUri"); props.add("recursive"); props.add("requestTimeout"); props.add("requestedPublishingInterval"); props.add("sessionName"); props.add("sessionTimeout"); + props.add("username"); PROPERTY_NAMES = Collections.unmodifiableSet(props); - Set<String> secretProps = new HashSet<>(2); + Set<String> secretProps = new HashSet<>(3); secretProps.add("keyPassword"); secretProps.add("keyStorePassword"); + secretProps.add("password"); SECRET_PROPERTY_NAMES = Collections.unmodifiableSet(secretProps); ENDPOINT_IDENTITY_PROPERTY_NAMES = Collections.emptySet(); MULTI_VALUE_PREFIXES = Collections.emptyMap(); diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientComponentConfigurer.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientComponentConfigurer.java index b28d4fe4fc69..055e23d8baf8 100644 --- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientComponentConfigurer.java +++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientComponentConfigurer.java @@ -71,6 +71,7 @@ public class MiloClientComponentConfigurer extends PropertyConfigurerSupport imp case "overrideHost": getOrCreateConfiguration(target).setOverrideHost(property(camelContext, boolean.class, value)); return true; case "overrideport": case "overridePort": getOrCreateConfiguration(target).setOverridePort(property(camelContext, boolean.class, value)); return true; + case "password": getOrCreateConfiguration(target).setPassword(property(camelContext, java.lang.String.class, value)); return true; case "producturi": case "productUri": getOrCreateConfiguration(target).setProductUri(property(camelContext, java.lang.String.class, value)); return true; case "requesttimeout": @@ -81,6 +82,7 @@ public class MiloClientComponentConfigurer extends PropertyConfigurerSupport imp case "sessionName": getOrCreateConfiguration(target).setSessionName(property(camelContext, java.lang.String.class, value)); return true; case "sessiontimeout": case "sessionTimeout": getOrCreateConfiguration(target).setSessionTimeout(property(camelContext, java.lang.Long.class, value)); return true; + case "username": getOrCreateConfiguration(target).setUsername(property(camelContext, java.lang.String.class, value)); return true; default: return false; } } @@ -134,6 +136,7 @@ public class MiloClientComponentConfigurer extends PropertyConfigurerSupport imp case "overrideHost": return boolean.class; case "overrideport": case "overridePort": return boolean.class; + case "password": return java.lang.String.class; case "producturi": case "productUri": return java.lang.String.class; case "requesttimeout": @@ -144,6 +147,7 @@ public class MiloClientComponentConfigurer extends PropertyConfigurerSupport imp case "sessionName": return java.lang.String.class; case "sessiontimeout": case "sessionTimeout": return java.lang.Long.class; + case "username": return java.lang.String.class; default: return null; } } @@ -193,6 +197,7 @@ public class MiloClientComponentConfigurer extends PropertyConfigurerSupport imp case "overrideHost": return getOrCreateConfiguration(target).isOverrideHost(); case "overrideport": case "overridePort": return getOrCreateConfiguration(target).isOverridePort(); + case "password": return getOrCreateConfiguration(target).getPassword(); case "producturi": case "productUri": return getOrCreateConfiguration(target).getProductUri(); case "requesttimeout": @@ -203,6 +208,7 @@ public class MiloClientComponentConfigurer extends PropertyConfigurerSupport imp case "sessionName": return getOrCreateConfiguration(target).getSessionName(); case "sessiontimeout": case "sessionTimeout": return getOrCreateConfiguration(target).getSessionTimeout(); + case "username": return getOrCreateConfiguration(target).getUsername(); default: return null; } } diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointConfigurer.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointConfigurer.java index d5f5c46560e7..971853e1a8e6 100644 --- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointConfigurer.java +++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointConfigurer.java @@ -77,6 +77,7 @@ public class MiloClientEndpointConfigurer extends PropertyConfigurerSupport impl case "overrideHost": target.getConfiguration().setOverrideHost(property(camelContext, boolean.class, value)); return true; case "overrideport": case "overridePort": target.getConfiguration().setOverridePort(property(camelContext, boolean.class, value)); return true; + case "password": target.getConfiguration().setPassword(property(camelContext, java.lang.String.class, value)); return true; case "producturi": case "productUri": target.getConfiguration().setProductUri(property(camelContext, java.lang.String.class, value)); return true; case "requesttimeout": @@ -89,6 +90,7 @@ public class MiloClientEndpointConfigurer extends PropertyConfigurerSupport impl case "sessionName": target.getConfiguration().setSessionName(property(camelContext, java.lang.String.class, value)); return true; case "sessiontimeout": case "sessionTimeout": target.getConfiguration().setSessionTimeout(property(camelContext, java.lang.Long.class, value)); return true; + case "username": target.getConfiguration().setUsername(property(camelContext, java.lang.String.class, value)); return true; default: return false; } } @@ -150,6 +152,7 @@ public class MiloClientEndpointConfigurer extends PropertyConfigurerSupport impl case "overrideHost": return boolean.class; case "overrideport": case "overridePort": return boolean.class; + case "password": return java.lang.String.class; case "producturi": case "productUri": return java.lang.String.class; case "requesttimeout": @@ -162,6 +165,7 @@ public class MiloClientEndpointConfigurer extends PropertyConfigurerSupport impl case "sessionName": return java.lang.String.class; case "sessiontimeout": case "sessionTimeout": return java.lang.Long.class; + case "username": return java.lang.String.class; default: return null; } } @@ -224,6 +228,7 @@ public class MiloClientEndpointConfigurer extends PropertyConfigurerSupport impl case "overrideHost": return target.getConfiguration().isOverrideHost(); case "overrideport": case "overridePort": return target.getConfiguration().isOverridePort(); + case "password": return target.getConfiguration().getPassword(); case "producturi": case "productUri": return target.getConfiguration().getProductUri(); case "requesttimeout": @@ -236,6 +241,7 @@ public class MiloClientEndpointConfigurer extends PropertyConfigurerSupport impl case "sessionName": return target.getConfiguration().getSessionName(); case "sessiontimeout": case "sessionTimeout": return target.getConfiguration().getSessionTimeout(); + case "username": return target.getConfiguration().getUsername(); default: return null; } } diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriFactory.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriFactory.java index c6a55f8b249c..575bfabdd798 100644 --- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriFactory.java +++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriFactory.java @@ -24,7 +24,7 @@ public class MiloClientEndpointUriFactory extends org.apache.camel.support.compo private static final Set<String> ENDPOINT_IDENTITY_PROPERTY_NAMES; private static final Map<String, String> MULTI_VALUE_PREFIXES; static { - Set<String> props = new HashSet<>(35); + Set<String> props = new HashSet<>(37); props.add("allowedSecurityPolicies"); props.add("applicationName"); props.add("applicationUri"); @@ -54,16 +54,19 @@ public class MiloClientEndpointUriFactory extends org.apache.camel.support.compo props.add("omitNullValues"); props.add("overrideHost"); props.add("overridePort"); + props.add("password"); props.add("productUri"); props.add("requestTimeout"); props.add("requestedPublishingInterval"); props.add("samplingInterval"); props.add("sessionName"); props.add("sessionTimeout"); + props.add("username"); PROPERTY_NAMES = Collections.unmodifiableSet(props); - Set<String> secretProps = new HashSet<>(2); + Set<String> secretProps = new HashSet<>(3); secretProps.add("keyPassword"); secretProps.add("keyStorePassword"); + secretProps.add("password"); SECRET_PROPERTY_NAMES = Collections.unmodifiableSet(secretProps); ENDPOINT_IDENTITY_PROPERTY_NAMES = Collections.emptySet(); MULTI_VALUE_PREFIXES = Collections.emptyMap(); diff --git a/components/camel-milo/src/generated/resources/META-INF/org/apache/camel/component/milo/browse/milo-browse.json b/components/camel-milo/src/generated/resources/META-INF/org/apache/camel/component/milo/browse/milo-browse.json index e7391bdcfd0a..aa643bd4b294 100644 --- a/components/camel-milo/src/generated/resources/META-INF/org/apache/camel/component/milo/browse/milo-browse.json +++ b/components/camel-milo/src/generated/resources/META-INF/org/apache/camel/component/milo/browse/milo-browse.json @@ -48,7 +48,9 @@ "requestedPublishingInterval": { "index": 21, "kind": "property", "displayName": "Requested Publishing Interval", "group": "client", "label": "client", "required": false, "type": "number", "javaType": "java.lang.Double", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1_000.0", "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "The requested publishing interval in mi [...] "requestTimeout": { "index": 22, "kind": "property", "displayName": "Request Timeout", "group": "client", "label": "client", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Request timeout in milliseconds" }, "sessionName": { "index": 23, "kind": "property", "displayName": "Session Name", "group": "client", "label": "client", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Session name" }, - "sessionTimeout": { "index": 24, "kind": "property", "displayName": "Session Timeout", "group": "client", "label": "client", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Session timeout in milliseconds" } + "sessionTimeout": { "index": 24, "kind": "property", "displayName": "Session Timeout", "group": "client", "label": "client", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Session timeout in milliseconds" }, + "password": { "index": 25, "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "security": "secret", "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "The password for authentication. Use this instead of embedding credentials in the [...] + "username": { "index": 26, "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "The username for authentication. Use this instead of embedding credentials in the endpoint URI when th [...] }, "headers": { "CamelMiloNodeIds": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "List", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The node ids.", "constantName": "org.apache.camel.component.milo.MiloConstants#HEADER_NODE_IDS" } @@ -84,6 +86,8 @@ "requestedPublishingInterval": { "index": 27, "kind": "parameter", "displayName": "Requested Publishing Interval", "group": "client", "label": "client", "required": false, "type": "number", "javaType": "java.lang.Double", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1_000.0", "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "The requested publishing interval in m [...] "requestTimeout": { "index": 28, "kind": "parameter", "displayName": "Request Timeout", "group": "client", "label": "client", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Request timeout in milliseconds" }, "sessionName": { "index": 29, "kind": "parameter", "displayName": "Session Name", "group": "client", "label": "client", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Session name" }, - "sessionTimeout": { "index": 30, "kind": "parameter", "displayName": "Session Timeout", "group": "client", "label": "client", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Session timeout in milliseconds" } + "sessionTimeout": { "index": 30, "kind": "parameter", "displayName": "Session Timeout", "group": "client", "label": "client", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Session timeout in milliseconds" }, + "password": { "index": 31, "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "security": "secret", "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "The password for authentication. Use this instead of embedding credentials in th [...] + "username": { "index": 32, "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "The username for authentication. Use this instead of embedding credentials in the endpoint URI when t [...] } } diff --git a/components/camel-milo/src/generated/resources/META-INF/org/apache/camel/component/milo/client/milo-client.json b/components/camel-milo/src/generated/resources/META-INF/org/apache/camel/component/milo/client/milo-client.json index 73e3dabb3dd9..9b90876beadb 100644 --- a/components/camel-milo/src/generated/resources/META-INF/org/apache/camel/component/milo/client/milo-client.json +++ b/components/camel-milo/src/generated/resources/META-INF/org/apache/camel/component/milo/client/milo-client.json @@ -49,7 +49,9 @@ "requestedPublishingInterval": { "index": 22, "kind": "property", "displayName": "Requested Publishing Interval", "group": "client", "label": "client", "required": false, "type": "number", "javaType": "java.lang.Double", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1_000.0", "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "The requested publishing interval in mi [...] "requestTimeout": { "index": 23, "kind": "property", "displayName": "Request Timeout", "group": "client", "label": "client", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Request timeout in milliseconds" }, "sessionName": { "index": 24, "kind": "property", "displayName": "Session Name", "group": "client", "label": "client", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Session name" }, - "sessionTimeout": { "index": 25, "kind": "property", "displayName": "Session Timeout", "group": "client", "label": "client", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Session timeout in milliseconds" } + "sessionTimeout": { "index": 25, "kind": "property", "displayName": "Session Timeout", "group": "client", "label": "client", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Session timeout in milliseconds" }, + "password": { "index": 26, "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "security": "secret", "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "The password for authentication. Use this instead of embedding credentials in the [...] + "username": { "index": 27, "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "The username for authentication. Use this instead of embedding credentials in the endpoint URI when th [...] }, "headers": { "CamelMiloNodeIds": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "List", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The node ids.", "constantName": "org.apache.camel.component.milo.MiloConstants#HEADER_NODE_IDS" }, @@ -90,6 +92,8 @@ "requestedPublishingInterval": { "index": 31, "kind": "parameter", "displayName": "Requested Publishing Interval", "group": "client", "label": "client", "required": false, "type": "number", "javaType": "java.lang.Double", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1_000.0", "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "The requested publishing interval in m [...] "requestTimeout": { "index": 32, "kind": "parameter", "displayName": "Request Timeout", "group": "client", "label": "client", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Request timeout in milliseconds" }, "sessionName": { "index": 33, "kind": "parameter", "displayName": "Session Name", "group": "client", "label": "client", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Session name" }, - "sessionTimeout": { "index": 34, "kind": "parameter", "displayName": "Session Timeout", "group": "client", "label": "client", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Session timeout in milliseconds" } + "sessionTimeout": { "index": 34, "kind": "parameter", "displayName": "Session Timeout", "group": "client", "label": "client", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "Session timeout in milliseconds" }, + "password": { "index": 35, "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "security": "secret", "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "The password for authentication. Use this instead of embedding credentials in th [...] + "username": { "index": 36, "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.milo.client.MiloClientConfiguration", "configurationField": "configuration", "description": "The username for authentication. Use this instead of embedding credentials in the endpoint URI when t [...] } } diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientEndpoint.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientEndpoint.java index 28b14089a633..ae796c746d6c 100644 --- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientEndpoint.java +++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientEndpoint.java @@ -204,7 +204,6 @@ public class MiloClientEndpoint extends DefaultEndpoint { this.omitNullValues = omitNullValues; } - public String getUsername() { return configuration != null ? configuration.getUsername() : null; } diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java index f187679763fe..75d6ec23f0b9 100644 --- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java +++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java @@ -700,7 +700,9 @@ public class SubscriptionManager { // Extracting/removing user:password string from the full URL is error-prone with special characters, // because of that the discovery URL is rebuilt from URI parts. - discoveryUri = new URI(uri.getScheme(), null, uri.getHost(), uri.getPort(), uri.getPath(), uri.getQuery(), uri.getFragment()).toString(); + discoveryUri + = new URI(uri.getScheme(), null, uri.getHost(), uri.getPort(), uri.getPath(), uri.getQuery(), uri.getFragment()) + .toString(); final String user = uri.getUserInfo(); LOG.debug("Discovering endpoints from: {}", discoveryUri);
