This is an automated email from the ASF dual-hosted git repository.
Croway pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new a12015f994c CAMEL-27082: camel-spring-boot - camel-core-starter no
longer ships the camel.cloud.*.service-discovery configuration properties of
the removed Service Call EIP
a12015f994c is described below
commit a12015f994c9a3364c89c43c42cc42c3f1a0b6e7
Author: croway <[email protected]>
AuthorDate: Mon Nov 16 22:10:49 2026 +0100
CAMEL-27082: camel-spring-boot - camel-core-starter no longer ships the
camel.cloud.*.service-discovery configuration properties of the removed Service
Call EIP
Camel removed camel-cloud and the Service Call EIP in 4.19, and the
auto-configurations that read the camel.cloud.* options were removed then.
camel-core-starter still had the generated Consul, DNS and Kubernetes
ServiceCallServiceDiscoveryConfiguration Common and Properties classes
(camel.cloud.{consul,dns,kubernetes}.service-discovery). Nothing registered
or read them, but their 39 options were in the configuration metadata of
the starter, so an IDE offered them, and the Core starter page listed them.
The classes are removed, with the code of SpringBootAutoConfigurationMojo
that generated them (and the etcd one) from the service discovery models,
which camel-core-model no longer has. core.json and the Core starter page
are regenerated.
---
.../camel-core-starter/src/main/docs/core.json | 256 -------------------
...iceCallServiceDiscoveryConfigurationCommon.java | 149 -----------
...allServiceDiscoveryConfigurationProperties.java | 48 ----
...iceCallServiceDiscoveryConfigurationCommon.java | 65 -----
...allServiceDiscoveryConfigurationProperties.java | 48 ----
...iceCallServiceDiscoveryConfigurationCommon.java | 281 ---------------------
...allServiceDiscoveryConfigurationProperties.java | 48 ----
.../modules/ROOT/pages/starters/core.adoc | 41 +--
.../maven/SpringBootAutoConfigurationMojo.java | 49 ----
9 files changed, 1 insertion(+), 984 deletions(-)
diff --git a/components-starter/camel-core-starter/src/main/docs/core.json
b/components-starter/camel-core-starter/src/main/docs/core.json
index cf31fc8cd65..be5f7df6917 100644
--- a/components-starter/camel-core-starter/src/main/docs/core.json
+++ b/components-starter/camel-core-starter/src/main/docs/core.json
@@ -1,20 +1,5 @@
{
"groups": [
- {
- "name": "camel.cloud.consul.service-discovery",
- "type":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties",
- "sourceType":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.dns.service-discovery",
- "type":
"org.apache.camel.model.cloud.springboot.DnsServiceCallServiceDiscoveryConfigurationProperties",
- "sourceType":
"org.apache.camel.model.cloud.springboot.DnsServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery",
- "type":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
{
"name": "camel.language.constant",
"type":
"org.apache.camel.language.constant.springboot.ConstantLanguageConfiguration",
@@ -115,247 +100,6 @@
}
],
"properties": [
- {
- "name": "camel.cloud.consul.service-discovery.acl-token",
- "type": "java.lang.String",
- "description": "Sets the ACL token to be used with Consul",
- "sourceType":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.consul.service-discovery.block-seconds",
- "type": "java.lang.Integer",
- "description": "The seconds to wait for a watch event, default 10
seconds",
- "sourceType":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties",
- "defaultValue": 10
- },
- {
- "name": "camel.cloud.consul.service-discovery.configurations",
- "type":
"java.util.Map<java.lang.String,org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationCommon>",
- "description": "Define additional configuration definitions",
- "sourceType":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.consul.service-discovery.connect-timeout-millis",
- "type": "java.lang.Long",
- "description": "Connect timeout for OkHttpClient",
- "sourceType":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.consul.service-discovery.datacenter",
- "type": "java.lang.String",
- "description": "The data center",
- "sourceType":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.consul.service-discovery.enabled",
- "type": "java.lang.Boolean",
- "description": "Enable the component",
- "sourceType":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties",
- "defaultValue": true
- },
- {
- "name": "camel.cloud.consul.service-discovery.password",
- "type": "java.lang.String",
- "description": "Sets the password to be used for basic authentication",
- "sourceType":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.consul.service-discovery.properties",
- "type": "java.util.Map<java.lang.String,java.lang.String>",
- "description": "Set client properties to use. These properties are
specific to what service call implementation are in use. For example if using a
different one, then the client properties are defined according to the specific
service in use.",
- "sourceType":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.consul.service-discovery.read-timeout-millis",
- "type": "java.lang.Long",
- "description": "Read timeout for OkHttpClient",
- "sourceType":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.consul.service-discovery.url",
- "type": "java.lang.String",
- "description": "The Consul agent URL",
- "sourceType":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.consul.service-discovery.user-name",
- "type": "java.lang.String",
- "description": "Sets the username to be used for basic authentication",
- "sourceType":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.consul.service-discovery.write-timeout-millis",
- "type": "java.lang.Long",
- "description": "Write timeout for OkHttpClient",
- "sourceType":
"org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.dns.service-discovery.configurations",
- "type":
"java.util.Map<java.lang.String,org.apache.camel.model.cloud.springboot.DnsServiceCallServiceDiscoveryConfigurationCommon>",
- "description": "Define additional configuration definitions",
- "sourceType":
"org.apache.camel.model.cloud.springboot.DnsServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.dns.service-discovery.domain",
- "type": "java.lang.String",
- "description": "The domain name;",
- "sourceType":
"org.apache.camel.model.cloud.springboot.DnsServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.dns.service-discovery.enabled",
- "type": "java.lang.Boolean",
- "description": "Enable the component",
- "sourceType":
"org.apache.camel.model.cloud.springboot.DnsServiceCallServiceDiscoveryConfigurationProperties",
- "defaultValue": true
- },
- {
- "name": "camel.cloud.dns.service-discovery.properties",
- "type": "java.util.Map<java.lang.String,java.lang.String>",
- "description": "Set client properties to use. These properties are
specific to what service call implementation are in use. For example if using a
different one, then the client properties are defined according to the specific
service in use.",
- "sourceType":
"org.apache.camel.model.cloud.springboot.DnsServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.dns.service-discovery.proto",
- "type": "java.lang.String",
- "description": "The transport protocol of the desired service.",
- "sourceType":
"org.apache.camel.model.cloud.springboot.DnsServiceCallServiceDiscoveryConfigurationProperties",
- "defaultValue": "_tcp"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.api-version",
- "type": "java.lang.String",
- "description": "Sets the API version when using client lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.ca-cert-data",
- "type": "java.lang.String",
- "description": "Sets the Certificate Authority data when using client
lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.ca-cert-file",
- "type": "java.lang.String",
- "description": "Sets the Certificate Authority data that are loaded from
the file when using client lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.client-cert-data",
- "type": "java.lang.String",
- "description": "Sets the Client Certificate data when using client
lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.client-cert-file",
- "type": "java.lang.String",
- "description": "Sets the Client Certificate data that are loaded from
the file when using client lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.client-key-algo",
- "type": "java.lang.String",
- "description": "Sets the Client Keystore algorithm, such as RSA when
using client lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.client-key-data",
- "type": "java.lang.String",
- "description": "Sets the Client Keystore data when using client lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.client-key-file",
- "type": "java.lang.String",
- "description": "Sets the Client Keystore data that are loaded from the
file when using client lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.client-key-passphrase",
- "type": "java.lang.String",
- "description": "Sets the Client Keystore passphrase when using client
lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.configurations",
- "type":
"java.util.Map<java.lang.String,org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationCommon>",
- "description": "Define additional configuration definitions",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.dns-domain",
- "type": "java.lang.String",
- "description": "Sets the DNS domain to use for DNS lookup.",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.enabled",
- "type": "java.lang.Boolean",
- "description": "Enable the component",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties",
- "defaultValue": true
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.lookup",
- "type": "java.lang.String",
- "description": "How to perform service lookup. Possible values: client,
dns, environment. When using client, then the client queries the kubernetes
master to obtain a list of active pods that provides the service, and then
random (or round robin) select a pod. When using dns the service name is
resolved as name.namespace.svc.dnsDomain. When using dnssrv the service name is
resolved with SRV query for _._...svc... When using environment then
environment variables are used to lookup [...]
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties",
- "defaultValue": "environment"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.master-url",
- "type": "java.lang.String",
- "description": "Sets the URL to the master when using client lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.namespace",
- "type": "java.lang.String",
- "description": "Sets the namespace to use. Will by default use namespace
from the ENV variable KUBERNETES_MASTER.",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.oauth-token",
- "type": "java.lang.String",
- "description": "Sets the OAUTH token for authentication (instead of
username\/password) when using client lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.password",
- "type": "java.lang.String",
- "description": "Sets the password for authentication when using client
lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.port-name",
- "type": "java.lang.String",
- "description": "Sets the Port Name to use for DNS\/DNSSRV lookup.",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.port-protocol",
- "type": "java.lang.String",
- "description": "Sets the Port Protocol to use for DNS\/DNSSRV lookup.",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.properties",
- "type": "java.util.Map<java.lang.String,java.lang.String>",
- "description": "Set client properties to use. These properties are
specific to what service call implementation are in use. For example if using a
different one, then the client properties are defined according to the specific
service in use.",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.trust-certs",
- "type": "java.lang.Boolean",
- "description": "Sets whether to turn on trust certificate check when
using client lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties",
- "defaultValue": false
- },
- {
- "name": "camel.cloud.kubernetes.service-discovery.username",
- "type": "java.lang.String",
- "description": "Sets the username for authentication when using client
lookup",
- "sourceType":
"org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties"
- },
{
"name": "camel.language.constant.customizer.enabled",
"type": "java.lang.Boolean",
diff --git
a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/ConsulServiceCallServiceDiscoveryConfigurationCommon.java
b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/ConsulServiceCallServiceDiscoveryConfigurationCommon.java
deleted file mode 100644
index 739d7c14fef..00000000000
---
a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/ConsulServiceCallServiceDiscoveryConfigurationCommon.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.model.cloud.springboot;
-
-import java.util.Map;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-public class ConsulServiceCallServiceDiscoveryConfigurationCommon {
-
- /**
- * The Consul agent URL
- */
- private String url;
- /**
- * The data center
- */
- private String datacenter;
- /**
- * Sets the ACL token to be used with Consul
- */
- private String aclToken;
- /**
- * Sets the username to be used for basic authentication
- */
- private String userName;
- /**
- * Sets the password to be used for basic authentication
- */
- private String password;
- /**
- * Connect timeout for OkHttpClient
- */
- private Long connectTimeoutMillis;
- /**
- * Read timeout for OkHttpClient
- */
- private Long readTimeoutMillis;
- /**
- * Write timeout for OkHttpClient
- */
- private Long writeTimeoutMillis;
- /**
- * The seconds to wait for a watch event, default 10 seconds
- */
- private Integer blockSeconds = 10;
- /**
- * Set client properties to use. These properties are specific to what
- * service call implementation are in use. For example if using a different
- * one, then the client properties are defined according to the specific
- * service in use.
- */
- private Map<String, String> properties;
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getDatacenter() {
- return datacenter;
- }
-
- public void setDatacenter(String datacenter) {
- this.datacenter = datacenter;
- }
-
- public String getAclToken() {
- return aclToken;
- }
-
- public void setAclToken(String aclToken) {
- this.aclToken = aclToken;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public Long getConnectTimeoutMillis() {
- return connectTimeoutMillis;
- }
-
- public void setConnectTimeoutMillis(Long connectTimeoutMillis) {
- this.connectTimeoutMillis = connectTimeoutMillis;
- }
-
- public Long getReadTimeoutMillis() {
- return readTimeoutMillis;
- }
-
- public void setReadTimeoutMillis(Long readTimeoutMillis) {
- this.readTimeoutMillis = readTimeoutMillis;
- }
-
- public Long getWriteTimeoutMillis() {
- return writeTimeoutMillis;
- }
-
- public void setWriteTimeoutMillis(Long writeTimeoutMillis) {
- this.writeTimeoutMillis = writeTimeoutMillis;
- }
-
- public Integer getBlockSeconds() {
- return blockSeconds;
- }
-
- public void setBlockSeconds(Integer blockSeconds) {
- this.blockSeconds = blockSeconds;
- }
-
- public Map<String, String> getProperties() {
- return properties;
- }
-
- public void setProperties(Map<String, String> properties) {
- this.properties = properties;
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/ConsulServiceCallServiceDiscoveryConfigurationProperties.java
b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/ConsulServiceCallServiceDiscoveryConfigurationProperties.java
deleted file mode 100644
index 187308742a0..00000000000
---
a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/ConsulServiceCallServiceDiscoveryConfigurationProperties.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.model.cloud.springboot;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "camel.cloud.consul.service-discovery")
-public class ConsulServiceCallServiceDiscoveryConfigurationProperties
- extends
- ConsulServiceCallServiceDiscoveryConfigurationCommon {
-
- /**
- * Enable the component
- */
- private boolean enabled = true;
- /**
- * Define additional configuration definitions
- */
- private Map<String, ConsulServiceCallServiceDiscoveryConfigurationCommon>
configurations = new HashMap<>();
-
- public Map<String, ConsulServiceCallServiceDiscoveryConfigurationCommon>
getConfigurations() {
- return configurations;
- }
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/DnsServiceCallServiceDiscoveryConfigurationCommon.java
b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/DnsServiceCallServiceDiscoveryConfigurationCommon.java
deleted file mode 100644
index 8e417a37ee8..00000000000
---
a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/DnsServiceCallServiceDiscoveryConfigurationCommon.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.model.cloud.springboot;
-
-import java.util.Map;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-public class DnsServiceCallServiceDiscoveryConfigurationCommon {
-
- /**
- * The transport protocol of the desired service.
- */
- private String proto = "_tcp";
- /**
- * The domain name;
- */
- private String domain;
- /**
- * Set client properties to use. These properties are specific to what
- * service call implementation are in use. For example if using a different
- * one, then the client properties are defined according to the specific
- * service in use.
- */
- private Map<String, String> properties;
-
- public String getProto() {
- return proto;
- }
-
- public void setProto(String proto) {
- this.proto = proto;
- }
-
- public String getDomain() {
- return domain;
- }
-
- public void setDomain(String domain) {
- this.domain = domain;
- }
-
- public Map<String, String> getProperties() {
- return properties;
- }
-
- public void setProperties(Map<String, String> properties) {
- this.properties = properties;
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/DnsServiceCallServiceDiscoveryConfigurationProperties.java
b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/DnsServiceCallServiceDiscoveryConfigurationProperties.java
deleted file mode 100644
index ece770d9545..00000000000
---
a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/DnsServiceCallServiceDiscoveryConfigurationProperties.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.model.cloud.springboot;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "camel.cloud.dns.service-discovery")
-public class DnsServiceCallServiceDiscoveryConfigurationProperties
- extends
- DnsServiceCallServiceDiscoveryConfigurationCommon {
-
- /**
- * Enable the component
- */
- private boolean enabled = true;
- /**
- * Define additional configuration definitions
- */
- private Map<String, DnsServiceCallServiceDiscoveryConfigurationCommon>
configurations = new HashMap<>();
-
- public Map<String, DnsServiceCallServiceDiscoveryConfigurationCommon>
getConfigurations() {
- return configurations;
- }
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/KubernetesServiceCallServiceDiscoveryConfigurationCommon.java
b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/KubernetesServiceCallServiceDiscoveryConfigurationCommon.java
deleted file mode 100644
index d22834f0c69..00000000000
---
a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/KubernetesServiceCallServiceDiscoveryConfigurationCommon.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.model.cloud.springboot;
-
-import java.util.Map;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-public class KubernetesServiceCallServiceDiscoveryConfigurationCommon {
-
- /**
- * How to perform service lookup. Possible values: client, dns,
environment.
- * When using client, then the client queries the kubernetes master to
- * obtain a list of active pods that provides the service, and then random
- * (or round robin) select a pod. When using dns the service name is
- * resolved as name.namespace.svc.dnsDomain. When using dnssrv the service
- * name is resolved with SRV query for _._...svc... When using environment
- * then environment variables are used to lookup the service. By default
- * environment is used.
- */
- private String lookup = "environment";
- /**
- * Sets the DNS domain to use for DNS lookup.
- */
- private String dnsDomain;
- /**
- * Sets the Port Name to use for DNS/DNSSRV lookup.
- */
- private String portName;
- /**
- * Sets the Port Protocol to use for DNS/DNSSRV lookup.
- */
- private String portProtocol;
- /**
- * Sets the namespace to use. Will by default use namespace from the ENV
- * variable KUBERNETES_MASTER.
- */
- private String namespace;
- /**
- * Sets the API version when using client lookup
- */
- private String apiVersion;
- /**
- * Sets the URL to the master when using client lookup
- */
- private String masterUrl;
- /**
- * Sets the username for authentication when using client lookup
- */
- private String username;
- /**
- * Sets the password for authentication when using client lookup
- */
- private String password;
- /**
- * Sets the OAUTH token for authentication (instead of username/password)
- * when using client lookup
- */
- private String oauthToken;
- /**
- * Sets the Certificate Authority data when using client lookup
- */
- private String caCertData;
- /**
- * Sets the Certificate Authority data that are loaded from the file when
- * using client lookup
- */
- private String caCertFile;
- /**
- * Sets the Client Certificate data when using client lookup
- */
- private String clientCertData;
- /**
- * Sets the Client Certificate data that are loaded from the file when
using
- * client lookup
- */
- private String clientCertFile;
- /**
- * Sets the Client Keystore algorithm, such as RSA when using client lookup
- */
- private String clientKeyAlgo;
- /**
- * Sets the Client Keystore data when using client lookup
- */
- private String clientKeyData;
- /**
- * Sets the Client Keystore data that are loaded from the file when using
- * client lookup
- */
- private String clientKeyFile;
- /**
- * Sets the Client Keystore passphrase when using client lookup
- */
- private String clientKeyPassphrase;
- /**
- * Sets whether to turn on trust certificate check when using client lookup
- */
- private Boolean trustCerts = false;
- /**
- * Set client properties to use. These properties are specific to what
- * service call implementation are in use. For example if using a different
- * one, then the client properties are defined according to the specific
- * service in use.
- */
- private Map<String, String> properties;
-
- public String getLookup() {
- return lookup;
- }
-
- public void setLookup(String lookup) {
- this.lookup = lookup;
- }
-
- public String getDnsDomain() {
- return dnsDomain;
- }
-
- public void setDnsDomain(String dnsDomain) {
- this.dnsDomain = dnsDomain;
- }
-
- public String getPortName() {
- return portName;
- }
-
- public void setPortName(String portName) {
- this.portName = portName;
- }
-
- public String getPortProtocol() {
- return portProtocol;
- }
-
- public void setPortProtocol(String portProtocol) {
- this.portProtocol = portProtocol;
- }
-
- public String getNamespace() {
- return namespace;
- }
-
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
-
- public String getApiVersion() {
- return apiVersion;
- }
-
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
-
- public String getMasterUrl() {
- return masterUrl;
- }
-
- public void setMasterUrl(String masterUrl) {
- this.masterUrl = masterUrl;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getOauthToken() {
- return oauthToken;
- }
-
- public void setOauthToken(String oauthToken) {
- this.oauthToken = oauthToken;
- }
-
- public String getCaCertData() {
- return caCertData;
- }
-
- public void setCaCertData(String caCertData) {
- this.caCertData = caCertData;
- }
-
- public String getCaCertFile() {
- return caCertFile;
- }
-
- public void setCaCertFile(String caCertFile) {
- this.caCertFile = caCertFile;
- }
-
- public String getClientCertData() {
- return clientCertData;
- }
-
- public void setClientCertData(String clientCertData) {
- this.clientCertData = clientCertData;
- }
-
- public String getClientCertFile() {
- return clientCertFile;
- }
-
- public void setClientCertFile(String clientCertFile) {
- this.clientCertFile = clientCertFile;
- }
-
- public String getClientKeyAlgo() {
- return clientKeyAlgo;
- }
-
- public void setClientKeyAlgo(String clientKeyAlgo) {
- this.clientKeyAlgo = clientKeyAlgo;
- }
-
- public String getClientKeyData() {
- return clientKeyData;
- }
-
- public void setClientKeyData(String clientKeyData) {
- this.clientKeyData = clientKeyData;
- }
-
- public String getClientKeyFile() {
- return clientKeyFile;
- }
-
- public void setClientKeyFile(String clientKeyFile) {
- this.clientKeyFile = clientKeyFile;
- }
-
- public String getClientKeyPassphrase() {
- return clientKeyPassphrase;
- }
-
- public void setClientKeyPassphrase(String clientKeyPassphrase) {
- this.clientKeyPassphrase = clientKeyPassphrase;
- }
-
- public Boolean getTrustCerts() {
- return trustCerts;
- }
-
- public void setTrustCerts(Boolean trustCerts) {
- this.trustCerts = trustCerts;
- }
-
- public Map<String, String> getProperties() {
- return properties;
- }
-
- public void setProperties(Map<String, String> properties) {
- this.properties = properties;
- }
-}
\ No newline at end of file
diff --git
a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/KubernetesServiceCallServiceDiscoveryConfigurationProperties.java
b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/KubernetesServiceCallServiceDiscoveryConfigurationProperties.java
deleted file mode 100644
index d0660cf9815..00000000000
---
a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/cloud/springboot/KubernetesServiceCallServiceDiscoveryConfigurationProperties.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.model.cloud.springboot;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "camel.cloud.kubernetes.service-discovery")
-public class KubernetesServiceCallServiceDiscoveryConfigurationProperties
- extends
- KubernetesServiceCallServiceDiscoveryConfigurationCommon {
-
- /**
- * Enable the component
- */
- private boolean enabled = true;
- /**
- * Define additional configuration definitions
- */
- private Map<String,
KubernetesServiceCallServiceDiscoveryConfigurationCommon> configurations = new
HashMap<>();
-
- public Map<String,
KubernetesServiceCallServiceDiscoveryConfigurationCommon> getConfigurations() {
- return configurations;
- }
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-}
\ No newline at end of file
diff --git a/docs/spring-boot/modules/ROOT/pages/starters/core.adoc
b/docs/spring-boot/modules/ROOT/pages/starters/core.adoc
index da41aa77e49..435a1cc6881 100644
--- a/docs/spring-boot/modules/ROOT/pages/starters/core.adoc
+++ b/docs/spring-boot/modules/ROOT/pages/starters/core.adoc
@@ -15,50 +15,11 @@
== Spring Boot Auto-Configuration
-The starter supports 115 options, which are listed below.
+The starter supports 76 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| camel.cloud.consul.service-discovery.acl-token | Sets the ACL token to be
used with Consul | | String
-| camel.cloud.consul.service-discovery.block-seconds | The seconds to wait for
a watch event, default 10 seconds | 10 | Integer
-| camel.cloud.consul.service-discovery.configurations | Define additional
configuration definitions | |
ConsulServiceCallServiceDiscoveryConfigurationCommon>
-| camel.cloud.consul.service-discovery.connect-timeout-millis | Connect
timeout for OkHttpClient | | Long
-| camel.cloud.consul.service-discovery.datacenter | The data center | | String
-| camel.cloud.consul.service-discovery.enabled | Enable the component | true |
Boolean
-| camel.cloud.consul.service-discovery.password | Sets the password to be used
for basic authentication | | String
-| camel.cloud.consul.service-discovery.properties | Set client properties to
use. These properties are specific to what service call implementation are in
use. For example if using a different one, then the client properties are
defined according to the specific service in use. | | String>
-| camel.cloud.consul.service-discovery.read-timeout-millis | Read timeout for
OkHttpClient | | Long
-| camel.cloud.consul.service-discovery.url | The Consul agent URL | | String
-| camel.cloud.consul.service-discovery.user-name | Sets the username to be
used for basic authentication | | String
-| camel.cloud.consul.service-discovery.write-timeout-millis | Write timeout
for OkHttpClient | | Long
-| camel.cloud.dns.service-discovery.configurations | Define additional
configuration definitions | |
DnsServiceCallServiceDiscoveryConfigurationCommon>
-| camel.cloud.dns.service-discovery.domain | The domain name; | | String
-| camel.cloud.dns.service-discovery.enabled | Enable the component | true |
Boolean
-| camel.cloud.dns.service-discovery.properties | Set client properties to use.
These properties are specific to what service call implementation are in use.
For example if using a different one, then the client properties are defined
according to the specific service in use. | | String>
-| camel.cloud.dns.service-discovery.proto | The transport protocol of the
desired service. | _tcp | String
-| camel.cloud.kubernetes.service-discovery.api-version | Sets the API version
when using client lookup | | String
-| camel.cloud.kubernetes.service-discovery.ca-cert-data | Sets the Certificate
Authority data when using client lookup | | String
-| camel.cloud.kubernetes.service-discovery.ca-cert-file | Sets the Certificate
Authority data that are loaded from the file when using client lookup | |
String
-| camel.cloud.kubernetes.service-discovery.client-cert-data | Sets the Client
Certificate data when using client lookup | | String
-| camel.cloud.kubernetes.service-discovery.client-cert-file | Sets the Client
Certificate data that are loaded from the file when using client lookup | |
String
-| camel.cloud.kubernetes.service-discovery.client-key-algo | Sets the Client
Keystore algorithm, such as RSA when using client lookup | | String
-| camel.cloud.kubernetes.service-discovery.client-key-data | Sets the Client
Keystore data when using client lookup | | String
-| camel.cloud.kubernetes.service-discovery.client-key-file | Sets the Client
Keystore data that are loaded from the file when using client lookup | | String
-| camel.cloud.kubernetes.service-discovery.client-key-passphrase | Sets the
Client Keystore passphrase when using client lookup | | String
-| camel.cloud.kubernetes.service-discovery.configurations | Define additional
configuration definitions | |
KubernetesServiceCallServiceDiscoveryConfigurationCommon>
-| camel.cloud.kubernetes.service-discovery.dns-domain | Sets the DNS domain to
use for DNS lookup. | | String
-| camel.cloud.kubernetes.service-discovery.enabled | Enable the component |
true | Boolean
-| camel.cloud.kubernetes.service-discovery.lookup | How to perform service
lookup. Possible values: client, dns, environment. When using client, then the
client queries the kubernetes master to obtain a list of active pods that
provides the service, and then random (or round robin) select a pod. When using
dns the service name is resolved as name.namespace.svc.dnsDomain. When using
dnssrv the service name is resolved with SRV query for _._...svc... When using
environment then environment [...]
-| camel.cloud.kubernetes.service-discovery.master-url | Sets the URL to the
master when using client lookup | | String
-| camel.cloud.kubernetes.service-discovery.namespace | Sets the namespace to
use. Will by default use namespace from the ENV variable KUBERNETES_MASTER. |
| String
-| camel.cloud.kubernetes.service-discovery.oauth-token | Sets the OAUTH token
for authentication (instead of username/password) when using client lookup | |
String
-| camel.cloud.kubernetes.service-discovery.password | Sets the password for
authentication when using client lookup | | String
-| camel.cloud.kubernetes.service-discovery.port-name | Sets the Port Name to
use for DNS/DNSSRV lookup. | | String
-| camel.cloud.kubernetes.service-discovery.port-protocol | Sets the Port
Protocol to use for DNS/DNSSRV lookup. | | String
-| camel.cloud.kubernetes.service-discovery.properties | Set client properties
to use. These properties are specific to what service call implementation are
in use. For example if using a different one, then the client properties are
defined according to the specific service in use. | | String>
-| camel.cloud.kubernetes.service-discovery.trust-certs | Sets whether to turn
on trust certificate check when using client lookup | false | Boolean
-| camel.cloud.kubernetes.service-discovery.username | Sets the username for
authentication when using client lookup | | String
| camel.language.constant.enabled | Whether to enable auto configuration of
the constant language. This is enabled by default. | | Boolean
| camel.language.exchange-property.enabled | Whether to enable auto
configuration of the exchangeProperty language. This is enabled by default. |
| Boolean
| camel.language.file.enabled | Whether to enable auto configuration of the
file language. This is enabled by default. | | Boolean
diff --git
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
index 387d5e7d237..c4b01229ba4 100644
---
a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
+++
b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
@@ -187,55 +187,6 @@ public class SpringBootAutoConfigurationMojo extends
AbstractSpringBootGenerator
createEipModelConfigurationSource(pkg, model,
"camel.resilience4j", true);
}
- // Consul
- json = loadModelJson(files, "consulServiceDiscovery");
- if (json != null) {
- EipModel model = JsonMapper.generateEipModel(json);
-
- int pos = model.getJavaType().lastIndexOf(".");
- String pkg = model.getJavaType().substring(0, pos) + ".springboot";
-
- // Generate properties, auto-configuration for camel-core-starter
- createEipModelConfigurationSource(pkg, model,
"camel.cloud.consul.service-discovery", true);
- }
-
- // DNS
- json = loadModelJson(files, "dnsServiceDiscovery");
- if (json != null) {
- EipModel model = JsonMapper.generateEipModel(json);
-
- int pos = model.getJavaType().lastIndexOf(".");
- String pkg = model.getJavaType().substring(0, pos) + ".springboot";
-
- // Generate properties, auto-configuration for camel-core-starter
- createEipModelConfigurationSource(pkg, model,
"camel.cloud.dns.service-discovery", true);
- }
-
- // Etcd
- json = loadModelJson(files, "etcdServiceDiscovery");
- if (json != null) {
- EipModel model = JsonMapper.generateEipModel(json);
-
- int pos = model.getJavaType().lastIndexOf(".");
- String pkg = model.getJavaType().substring(0, pos) + ".springboot";
-
- // Generate properties, auto-configuration for camel-core-starter
- createEipModelConfigurationSource(pkg, model,
"camel.cloud.etcd.service-discovery", true);
- }
-
- // Kubernetes
- json = loadModelJson(files, "kubernetesServiceDiscovery");
- if (json != null) {
- EipModel model = JsonMapper.generateEipModel(json);
-
- int pos = model.getJavaType().lastIndexOf(".");
- String pkg = model.getJavaType().substring(0, pos) + ".springboot";
-
- // Generate properties, auto-configuration happens in
- // camel-kubernetes-starter
- createEipModelConfigurationSource(pkg, model,
"camel.cloud.kubernetes.service-discovery", true);
- }
-
// Rest
json = loadModelJson(files, "restConfiguration");
if (json != null) {