You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2026/03/02 07:06:26 UTC
(camel-spring-boot) branch main updated: CAMEL-22290, CAMEL-22289: Remove deprecated camel-cloud and serviceCall EIP
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 f6a3096400d CAMEL-22290, CAMEL-22289: Remove deprecated camel-cloud and serviceCall EIP
f6a3096400d is described below
commit f6a3096400d2e43fef15e0a78b03568cb061d038
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 2 08:05:07 2026 +0100
CAMEL-22290, CAMEL-22289: Remove deprecated camel-cloud and serviceCall EIP
---
.../camel-consul-cluster-service-starter/pom.xml | 47 ---
.../src/main/docs/consul-cluster-service.json | 185 ----------
.../ConsulClusterServiceAutoConfiguration.java | 68 ----
.../cluster/ConsulClusterServiceConfiguration.java | 220 -----------
.../src/main/resources/META-INF/LICENSE.txt | 203 -----------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
...rk.boot.autoconfigure.AutoConfiguration.imports | 18 -
.../ConsulClusterServiceAutoConfigurationTest.java | 67 ----
.../src/test/resources/logback.xml | 42 ---
components-starter/camel-consul-starter/pom.xml | 79 +---
.../camel-consul-starter/src/main/docs/consul.json | 200 ----------
.../ConsulServiceDiscoveryAutoConfiguration.java | 104 ------
.../ConsulServiceRegistryAutoConfiguration.java | 52 ---
.../cloud/ConsulServiceRegistryConfiguration.java | 254 -------------
...rk.boot.autoconfigure.AutoConfiguration.imports | 3 -
.../cloud/ConsulServiceDiscoveryTest.java | 53 ---
.../src/test/resources/application.properties | 17 -
.../src/test/resources/logback.xml | 42 ---
components-starter/camel-dns-starter/pom.xml | 3 +-
.../cloud/DnsCloudAutoConfiguration.java | 106 ------
...rk.boot.autoconfigure.AutoConfiguration.imports | 2 -
.../springboot/cloud/DnsServiceDiscoveryTest.java | 53 ---
.../src/test/resources/application.properties | 18 -
.../src/test/resources/logback.xml | 41 ---
.../camel-file-cluster-service-starter/pom.xml | 48 ---
.../src/main/docs/file-cluster-service.json | 76 ----
.../FileLockClusterServiceAutoConfiguration.java | 63 ----
.../FileLockClusterServiceConfiguration.java | 167 ---------
.../src/main/resources/META-INF/LICENSE.txt | 203 -----------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
...rk.boot.autoconfigure.AutoConfiguration.imports | 18 -
.../FileClusterServiceAutoConfigurationTest.java | 68 ----
.../src/test/resources/logback.xml | 42 ---
.../pom.xml | 59 ---
.../src/main/docs/infinispan-cluster-service.json | 105 ------
...ispanRemoteClusterServiceAutoConfiguration.java | 55 ---
...nfinispanRemoteClusterServiceConfiguration.java | 169 ---------
.../src/main/resources/META-INF/LICENSE.txt | 203 -----------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
...rk.boot.autoconfigure.AutoConfiguration.imports | 18 -
...mbeddedClusterServiceAutoConfigurationTest.java | 68 ----
.../src/test/resources/logback.xml | 42 ---
.../pom.xml | 48 ---
.../main/docs/jgroups-raft-cluster-service.json | 46 ---
...JGroupsRaftClusterServiceAutoConfiguration.java | 55 ---
.../JGroupsRaftClusterServiceConfiguration.java | 88 -----
.../src/main/resources/META-INF/LICENSE.txt | 203 -----------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
...rk.boot.autoconfigure.AutoConfiguration.imports | 18 -
...upsRaftClusterServiceAutoConfigurationTest.java | 69 ----
.../src/test/resources/logback.xml | 42 ---
.../pom.xml | 48 ---
.../src/main/docs/kubernetes-cluster-service.json | 100 -----
.../KubernetesClusterServiceAutoConfiguration.java | 64 ----
.../KubernetesClusterServiceConfiguration.java | 208 -----------
.../src/main/resources/META-INF/LICENSE.txt | 203 -----------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
...rk.boot.autoconfigure.AutoConfiguration.imports | 18 -
...ernetesClusterServiceAutoConfigurationTest.java | 95 -----
.../src/test/resources/logback.xml | 42 ---
.../camel-kubernetes-starter/pom.xml | 8 +-
...ubernetesServiceDiscoveryAutoConfiguration.java | 104 ------
...rk.boot.autoconfigure.AutoConfiguration.imports | 7 +-
...netesServiceDiscoveryAutoConfigurationTest.java | 129 -------
.../src/test/resources/logback.xml | 42 ---
components-starter/camel-service-starter/pom.xml | 49 ---
.../src/main/docs/service.json | 58 ---
.../ServiceComponentAutoConfiguration.java | 77 ----
.../springboot/ServiceComponentConfiguration.java | 105 ------
.../springboot/ServiceComponentConverter.java | 65 ----
.../src/main/resources/META-INF/LICENSE.txt | 203 -----------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
...rk.boot.autoconfigure.AutoConfiguration.imports | 19 -
.../pom.xml | 60 ---
.../src/main/docs/zookeeper-cluster-service.json | 141 --------
.../ZooKeeperClusterServiceAutoConfiguration.java | 65 ----
.../ZooKeeperClusterServiceConfiguration.java | 144 --------
.../src/main/resources/META-INF/LICENSE.txt | 203 -----------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
...rk.boot.autoconfigure.AutoConfiguration.imports | 18 -
.../cluster/ZooKeeperClusterServiceTest.java | 91 -----
.../src/test/resources/logback.xml | 42 ---
components-starter/camel-zookeeper-starter/pom.xml | 15 +-
.../src/main/docs/zookeeper.json | 168 ---------
.../ZooKeeperServiceRegistryAutoConfiguration.java | 52 ---
.../ZooKeeperServiceRegistryConfiguration.java | 188 ----------
...rk.boot.autoconfigure.AutoConfiguration.imports | 2 -
.../cloud/ZooKeeperServiceRegistryTest.java | 134 -------
.../src/test/resources/application.properties | 17 -
.../src/test/resources/logback.xml | 42 ---
components-starter/pom.xml | 7 -
core/camel-spring-boot/pom.xml | 4 -
.../src/main/docs/spring-boot.json | 175 ---------
.../boot/cloud/CamelCloudAutoConfiguration.java | 30 --
.../cloud/CamelCloudConfigurationProperties.java | 401 ---------------------
...dServiceCallConfigurationAutoConfiguration.java | 86 -----
.../CamelCloudServiceChooserAutoConfiguration.java | 40 --
.../boot/cloud/CamelCloudServiceDiscovery.java | 38 --
...amelCloudServiceDiscoveryAutoConfiguration.java | 125 -------
.../spring/boot/cloud/CamelCloudServiceFilter.java | 36 --
.../CamelCloudServiceFilterAutoConfiguration.java | 120 ------
...rk.boot.autoconfigure.AutoConfiguration.imports | 5 -
.../CamelCloudServiceCallConfigurationTest.java | 109 ------
...melCloudServiceCallGlobalConfigurationTest.java | 121 -------
.../CamelCloudServiceCallRefExpressionTest.java | 128 -------
.../CamelCloudServiceCallSimpleExpressionTest.java | 119 ------
.../boot/cloud/CamelCloudServiceCallTest.java | 118 ------
.../spring/boot/cloud/SpringBootPropertyUtil.java | 56 ---
tooling/camel-spring-boot-bom/pom.xml | 35 --
tooling/camel-spring-boot-dependencies/pom.xml | 45 ---
110 files changed, 7 insertions(+), 8744 deletions(-)
diff --git a/components-starter/camel-consul-cluster-service-starter/pom.xml b/components-starter/camel-consul-cluster-service-starter/pom.xml
deleted file mode 100644
index 1367513b242..00000000000
--- a/components-starter/camel-consul-cluster-service-starter/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>components-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-consul-cluster-service-starter</artifactId>
- <packaging>jar</packaging>
- <name>Camel SB Starters :: Consul Cluster Service</name>
- <description>Spring-Boot Starter for Camel Cluster Service based on Consul</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-consul-starter</artifactId>
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git a/components-starter/camel-consul-cluster-service-starter/src/main/docs/consul-cluster-service.json b/components-starter/camel-consul-cluster-service-starter/src/main/docs/consul-cluster-service.json
deleted file mode 100644
index c3c75268bbf..00000000000
--- a/components-starter/camel-consul-cluster-service-starter/src/main/docs/consul-cluster-service.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
- "groups": [
- {
- "name": "camel.cluster.consul",
- "type": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- }
- ],
- "properties": [
- {
- "name": "camel.cluster.consul.acl-token",
- "type": "java.lang.String",
- "description": "Sets the ACL token to be used with Consul",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.attributes",
- "type": "java.util.Map<java.lang.String,java.lang.Object>",
- "description": "Custom service attributes.",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.block-seconds",
- "type": "java.lang.Integer",
- "description": "The time (in seconds) to wait for a watch event, default 10 seconds",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration",
- "defaultValue": 10
- },
- {
- "name": "camel.cluster.consul.connect-timeout",
- "type": "java.time.Duration",
- "description": "Connect timeout for OkHttpClient",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.consistency-mode",
- "type": "org.kiwiproject.consul.option.ConsistencyMode",
- "description": "The consistencyMode used for queries, default ConsistencyMode.DEFAULT",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration",
- "defaultValue": "default"
- },
- {
- "name": "camel.cluster.consul.datacenter",
- "type": "java.lang.String",
- "description": "The data center",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.enabled",
- "type": "java.lang.Boolean",
- "description": "Sets if the consul cluster service should be enabled or not, default is true.",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.cluster.consul.first-index",
- "type": "java.math.BigInteger",
- "description": "The first index for watch for, default 0",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration",
- "defaultValue": 0
- },
- {
- "name": "camel.cluster.consul.id",
- "type": "java.lang.String",
- "description": "Cluster Service ID",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.near-node",
- "type": "java.lang.String",
- "description": "The near node to use for queries.",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.node-meta",
- "type": "java.lang.String",
- "description": "The note meta-data to use for queries.",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.node-metas-as-list",
- "type": "java.util.Collection<java.lang.String>",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.order",
- "type": "java.lang.Integer",
- "description": "Service lookup order\/priority.",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.password",
- "type": "java.lang.String",
- "description": "Sets the password to be used for basic authentication",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.ping-instance",
- "type": "java.lang.Boolean",
- "description": "Configure if the AgentClient should attempt a ping before returning the Consul instance",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.cluster.consul.read-timeout",
- "type": "java.time.Duration",
- "description": "Read timeout for OkHttpClient",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.recursive",
- "type": "java.lang.Boolean",
- "description": "Recursively watch, default false",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration",
- "defaultValue": false
- },
- {
- "name": "camel.cluster.consul.root-path",
- "type": "java.lang.String",
- "description": "Consul root path",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration",
- "defaultValue": "\/camel"
- },
- {
- "name": "camel.cluster.consul.session-lock-delay",
- "type": "java.lang.Integer",
- "description": "The value for lockDelay",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration",
- "defaultValue": 5
- },
- {
- "name": "camel.cluster.consul.session-refresh-interval",
- "type": "java.lang.Integer",
- "description": "The value of wait attribute",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration",
- "defaultValue": 5
- },
- {
- "name": "camel.cluster.consul.session-ttl",
- "type": "java.lang.Integer",
- "description": "The value of TTL",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration",
- "defaultValue": 60
- },
- {
- "name": "camel.cluster.consul.ssl-context-parameters",
- "type": "org.apache.camel.support.jsse.SSLContextParameters",
- "description": "SSL configuration using an org.apache.camel.support.jsse.SSLContextParameters instance.",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.tag-as-set",
- "type": "java.util.Collection<java.lang.String>",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.tags",
- "type": "java.lang.String",
- "description": "Set tags. You can separate multiple tags by comma.",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.url",
- "type": "java.lang.String",
- "description": "The Consul agent URL",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.user-name",
- "type": "java.lang.String",
- "description": "Sets the username to be used for basic authentication",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.consul.write-timeout",
- "type": "java.time.Duration",
- "description": "Write timeout for OkHttpClient",
- "sourceType": "org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceConfiguration"
- }
- ],
- "hints": [],
- "ignored": {
- "properties": []
- }
-}
\ No newline at end of file
diff --git a/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java b/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java
deleted file mode 100644
index 7e2d63d2569..00000000000
--- a/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfiguration.java
+++ /dev/null
@@ -1,68 +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.component.consul.springboot.cluster;
-
-import org.apache.camel.cluster.CamelClusterService;
-import org.apache.camel.component.consul.cluster.ConsulClusterService;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-import java.util.Optional;
-
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
-@ConditionalOnProperty(prefix = "camel.cluster.consul", name = "enabled", matchIfMissing = true)
-@EnableConfigurationProperties(ConsulClusterServiceConfiguration.class)
-public class ConsulClusterServiceAutoConfiguration {
-
- @Autowired
- private ConsulClusterServiceConfiguration configuration;
-
- @Bean(name = "consul-cluster-service")
- @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
- public CamelClusterService consulClusterService() throws Exception {
- ConsulClusterService service = new ConsulClusterService();
-
- Optional.ofNullable(configuration.getId()).ifPresent(service::setId);
- Optional.ofNullable(configuration.getOrder()).ifPresent(service::setOrder);
- Optional.ofNullable(configuration.getAttributes()).ifPresent(service::setAttributes);
- Optional.ofNullable(configuration.getAclToken()).ifPresent(service::setAclToken);
- Optional.ofNullable(configuration.getDatacenter()).ifPresent(service::setDatacenter);
- Optional.ofNullable(configuration.getBlockSeconds()).ifPresent(service::setBlockSeconds);
- Optional.ofNullable(configuration.getConnectTimeout()).ifPresent(d -> service.setConnectTimeout((int) d.toMillis()));
- Optional.ofNullable(configuration.getUrl()).ifPresent(service::setUrl);
- Optional.of(configuration.getSessionLockDelay()).ifPresent(service::setSessionLockDelay);
- Optional.ofNullable(configuration.getPassword()).ifPresent(service::setPassword);
- Optional.ofNullable(configuration.getReadTimeout()).ifPresent(d -> service.setReadTimeout((int) d.toMillis()));
- Optional.ofNullable(configuration.getRootPath()).ifPresent(service::setRootPath);
- Optional.ofNullable(configuration.getSslContextParameters()).ifPresent(service::setSslContextParameters);
- Optional.of(configuration.getSessionTtl()).ifPresent(service::setSessionTtl);
- Optional.ofNullable(configuration.getUserName()).ifPresent(service::setUserName);
- Optional.ofNullable(configuration.getWriteTimeout()).ifPresent(d -> service.setWriteTimeout((int) d.toMillis()));
- service.setConfiguration(configuration);
-
- return service;
- }
-}
diff --git a/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceConfiguration.java b/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceConfiguration.java
deleted file mode 100644
index d9c558e1d40..00000000000
--- a/components-starter/camel-consul-cluster-service-starter/src/main/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceConfiguration.java
+++ /dev/null
@@ -1,220 +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.component.consul.springboot.cluster;
-
-import java.math.BigInteger;
-import java.time.Duration;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.kiwiproject.consul.option.ConsistencyMode;
-
-import org.apache.camel.component.consul.cluster.ConsulClusterConfiguration;
-import org.apache.camel.support.jsse.SSLContextParameters;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "camel.cluster.consul")
-public class ConsulClusterServiceConfiguration extends ConsulClusterConfiguration {
-
- /**
- * Sets if the consul cluster service should be enabled or not, default is true.
- */
- private boolean enabled = true;
-
- /**
- * Cluster Service ID
- */
- private String id;
-
- /**
- * Custom service attributes.
- */
- private Map<String, Object> attributes;
-
- /**
- * Service lookup order/priority.
- */
- private Integer order;
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Map<String, Object> getAttributes() {
- return attributes;
- }
-
- public void setAttributes(Map<String, Object> attributes) {
- this.attributes = attributes;
- }
-
- public Integer getOrder() {
- return order;
- }
-
- public void setOrder(Integer order) {
- this.order = order;
- }
-
- //
- // Fields copied from org.apache.camel.component.consul.cluster.ConsulClusterConfiguration
- // to add javadoc which is used by spring-boot-configuration-processor
- // to generate descritpions for inherited properties
- // ------------------------------------------
- /**
- * The value of TTL
- */
- private int sessionTtl = 60;
-
- /**
- * The value for lockDelay
- */
- private int sessionLockDelay = 5;
-
- /**
- * The value of wait attribute
- */
- private int sessionRefreshInterval = 5;
-
- /**
- * Consul root path
- */
- private String rootPath = "/camel";
-
- //
- // Fields copied from
- // org.apache.camel.component.consul.ConsulClientConfiguration
- // ---------------
-
- /**
- * The Consul agent URL
- */
- private String url;
-
- /**
- * Use datacenter instead
- */
- private String dc;
-
- /**
- * The data center
- */
- private String datacenter;
-
- /**
- * The near node to use for queries.
- */
- private String nearNode;
-
- /**
- * The note meta-data to use for queries.
- */
- private List<String> nodeMeta;
-
- /**
- * The consistencyMode used for queries, default ConsistencyMode.DEFAULT
- */
- private ConsistencyMode consistencyMode = ConsistencyMode.DEFAULT;
-
- /**
- * Set tags. You can separate multiple tags by comma.
- */
- private Set<String> tags;
-
- /**
- * SSL configuration using an org.apache.camel.support.jsse.SSLContextParameters instance.
- */
- private SSLContextParameters sslContextParameters;
-
- /**
- * 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;
-
- /**
- * Use connectTimeout instead
- */
- private Long connectTimeoutMillis;
-
- /**
- * Connect timeout for OkHttpClient
- */
- private Duration connectTimeout;
-
- /**
- * Use readTimeout instead.
- */
- private Long readTimeoutMillis;
-
- /**
- * Read timeout for OkHttpClient
- */
- private Duration readTimeout;
-
- /**
- * Use writeTimeout instead.
- */
- private Long writeTimeoutMillis;
-
- /**
- * Write timeout for OkHttpClient
- */
- private Duration writeTimeout;
-
- /**
- * Configure if the AgentClient should attempt a ping before returning the Consul instance
- */
- private boolean pingInstance = true;
-
- /**
- * The time (in seconds) to wait for a watch event, default 10 seconds
- */
- private Integer blockSeconds = 10;
-
- /**
- * The first index for watch for, default 0
- */
- private BigInteger firstIndex = BigInteger.valueOf(0L);
-
- /**
- * Recursively watch, default false
- */
- private boolean recursive;
-}
diff --git a/components-starter/camel-consul-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-consul-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b1270ff0..00000000000
--- a/components-starter/camel-consul-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
diff --git a/components-starter/camel-consul-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-consul-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf2e6b..00000000000
--- a/components-starter/camel-consul-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git a/components-starter/camel-consul-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-consul-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index bb45e07f529..00000000000
--- a/components-starter/camel-consul-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,18 +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.
-## ---------------------------------------------------------------------------
-
-org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceAutoConfiguration
\ No newline at end of file
diff --git a/components-starter/camel-consul-cluster-service-starter/src/test/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfigurationTest.java b/components-starter/camel-consul-cluster-service-starter/src/test/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfigurationTest.java
deleted file mode 100644
index 6b9cf5d0b59..00000000000
--- a/components-starter/camel-consul-cluster-service-starter/src/test/java/org/apache/camel/component/consul/springboot/cluster/ConsulClusterServiceAutoConfigurationTest.java
+++ /dev/null
@@ -1,67 +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.component.consul.springboot.cluster;
-
-import org.apache.camel.component.consul.cluster.ConsulClusterService;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class ConsulClusterServiceAutoConfigurationTest {
-
- @Test
- public void testDisable() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(ConsulClusterServiceAutoConfiguration.class))
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cluster.consul.enabled=false")
- .run(
- context -> {
- assertThat(context).doesNotHaveBean(ConsulClusterService.class);
- });
- }
-
- /**
- * Testing that the service can be enabled and configured completely.
- */
- @Test
- public void testPropertiesMapped() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(ConsulClusterServiceAutoConfiguration.class))
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cluster.consul.id=myid1")
- .run(
- context -> {
- final ConsulClusterService clusterService = context.getBean(ConsulClusterService.class);
-
- assertThat(clusterService.getId()).isEqualTo("myid1");
- });
- }
-
- @EnableAutoConfiguration
- @Configuration
- public static class TestConfiguration {
- }
-}
diff --git a/components-starter/camel-consul-cluster-service-starter/src/test/resources/logback.xml b/components-starter/camel-consul-cluster-service-starter/src/test/resources/logback.xml
deleted file mode 100644
index 7f709ede714..00000000000
--- a/components-starter/camel-consul-cluster-service-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- <file>target/camel-consul-cluster-service-starter-test.log</file>
- </appender>
-
- <root level="INFO">
- <!--<appender-ref ref="STDOUT"/>-->
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/components-starter/camel-consul-starter/pom.xml b/components-starter/camel-consul-starter/pom.xml
index b18b3a99b83..4c2e6db18d2 100644
--- a/components-starter/camel-consul-starter/pom.xml
+++ b/components-starter/camel-consul-starter/pom.xml
@@ -26,31 +26,18 @@
</parent>
<artifactId>camel-consul-starter</artifactId>
<packaging>jar</packaging>
- <name>Camel SB Starters :: Consul</name>
- <description>Spring-Boot Starter for Camel Consul support</description>
+ <name>Camel SB Starters :: consul</name>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
+ <version>${spring-boot-version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-consul</artifactId>
<version>${camel-version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <version>${camel-version}</version>
- <scope>provided</scope>
- </dependency>
- <!-- testing -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jetty</artifactId>
- <version>${camel-version}</version>
- <scope>test</scope>
- </dependency>
<!--START OF GENERATED CODE-->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
@@ -58,66 +45,4 @@
</dependency>
<!--END OF GENERATED CODE-->
</dependencies>
- <profiles>
- <!-- activate integration test if the docker socket file is accessible -->
- <profile>
- <id>consul-integration-tests-docker-file</id>
- <activation>
- <file>
- <exists>/var/run/docker.sock</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <!-- activate integration test if the DOCKER_HOST env var is set -->
- <profile>
- <id>consul-integration-tests-docker-env</id>
- <activation>
- <property>
- <name>env.DOCKER_HOST</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/components-starter/camel-consul-starter/src/main/docs/consul.json b/components-starter/camel-consul-starter/src/main/docs/consul.json
index 1fb3978fd57..4a4fe199733 100644
--- a/components-starter/camel-consul-starter/src/main/docs/consul.json
+++ b/components-starter/camel-consul-starter/src/main/docs/consul.json
@@ -1,10 +1,5 @@
{
"groups": [
- {
- "name": "camel.cloud.consul",
- "type": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
{
"name": "camel.component.consul",
"type": "org.apache.camel.component.consul.springboot.ConsulComponentConfiguration",
@@ -18,148 +13,6 @@
}
],
"properties": [
- {
- "name": "camel.cloud.consul.acl-token",
- "type": "java.lang.String",
- "description": "Sets the ACL token to be used with Consul",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.attributes",
- "type": "java.util.Map<java.lang.String,java.lang.Object>",
- "description": "Custom service attributes.",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.block-seconds",
- "type": "java.lang.Integer",
- "description": "The time (in seconds) to wait for a watch event, default 10 seconds",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "defaultValue": 10
- },
- {
- "name": "camel.cloud.consul.connect-timeout",
- "type": "java.time.Duration",
- "description": "Connect timeout for OkHttpClient",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.consistency-mode",
- "type": "org.kiwiproject.consul.option.ConsistencyMode",
- "description": "The consistencyMode used for queries, default ConsistencyMode.DEFAULT",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "defaultValue": "default"
- },
- {
- "name": "camel.cloud.consul.datacenter",
- "type": "java.lang.String",
- "description": "The data center",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.enabled",
- "type": "java.lang.Boolean",
- "description": "Sets if the consul service registry should be enabled or not, default is false.",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "defaultValue": false
- },
- {
- "name": "camel.cloud.consul.first-index",
- "type": "java.math.BigInteger",
- "description": "The first index for watch for, default 0",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "defaultValue": 0
- },
- {
- "name": "camel.cloud.consul.id",
- "type": "java.lang.String",
- "description": "Service Registry ID",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.near-node",
- "type": "java.lang.String",
- "description": "The near node to use for queries.",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.node-meta",
- "type": "java.lang.String",
- "description": "The note meta-data to use for queries.",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.node-metas-as-list",
- "type": "java.util.Collection<java.lang.String>",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.order",
- "type": "java.lang.Integer",
- "description": "Service lookup order\/priority.",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.password",
- "type": "java.lang.String",
- "description": "Sets the password to be used for basic authentication",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.ping-instance",
- "type": "java.lang.Boolean",
- "description": "Configure if the AgentClient should attempt a ping before returning the Consul instance",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.cloud.consul.read-timeout",
- "type": "java.time.Duration",
- "description": "Read timeout for OkHttpClient",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.recursive",
- "type": "java.lang.Boolean",
- "description": "Recursively watch, default false",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "defaultValue": false
- },
- {
- "name": "camel.cloud.consul.ssl-context-parameters",
- "type": "org.apache.camel.support.jsse.SSLContextParameters",
- "description": "SSL configuration using an org.apache.camel.support.jsse.SSLContextParameters instance.",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.tag-as-set",
- "type": "java.util.Collection<java.lang.String>",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.tags",
- "type": "java.lang.String",
- "description": "Set tags. You can separate multiple tags by comma.",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.url",
- "type": "java.lang.String",
- "description": "The Consul agent URL",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.user-name",
- "type": "java.lang.String",
- "description": "Sets the username to be used for basic authentication",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.consul.write-timeout",
- "type": "java.time.Duration",
- "description": "Write timeout for OkHttpClient",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration"
- },
{
"name": "camel.component.consul.acl-token",
"type": "java.lang.String",
@@ -335,59 +188,6 @@
"type": "java.time.Duration",
"description": "Write timeout",
"sourceType": "org.apache.camel.component.consul.springboot.ConsulComponentConfiguration"
- },
- {
- "name": "camel.cloud.consul.check-interval",
- "type": "java.lang.Integer",
- "description": "How often (in seconds) a service has to be marked as healthy if its check is TTL or how often the check should run. Default is 5 seconds.",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "defaultValue": 5,
- "deprecated": true,
- "deprecation": {}
- },
- {
- "name": "camel.cloud.consul.check-ttl",
- "type": "java.lang.Integer",
- "description": "The time (in seconds) to live for TTL checks. Default is 1 minute.",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "defaultValue": 60,
- "deprecated": true,
- "deprecation": {}
- },
- {
- "name": "camel.cloud.consul.deregister-after",
- "type": "java.lang.Integer",
- "description": "How long (in seconds) to wait to deregister a service in case of unclean shutdown. Default is 1 hour.",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "defaultValue": 3600,
- "deprecated": true,
- "deprecation": {}
- },
- {
- "name": "camel.cloud.consul.deregister-services-on-stop",
- "type": "java.lang.Boolean",
- "description": "Should we remove all the registered services know by this registry on stop?",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "defaultValue": true,
- "deprecated": true,
- "deprecation": {}
- },
- {
- "name": "camel.cloud.consul.override-service-host",
- "type": "java.lang.Boolean",
- "description": "Should we override the service host if given ?",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "defaultValue": true,
- "deprecated": true,
- "deprecation": {}
- },
- {
- "name": "camel.cloud.consul.service-host",
- "type": "java.lang.String",
- "description": "Service host.",
- "sourceType": "org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryConfiguration",
- "deprecated": true,
- "deprecation": {}
}
],
"hints": [],
diff --git a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceDiscoveryAutoConfiguration.java b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceDiscoveryAutoConfiguration.java
deleted file mode 100644
index 055997bdc11..00000000000
--- a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceDiscoveryAutoConfiguration.java
+++ /dev/null
@@ -1,104 +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.component.consul.springboot.cloud;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import jakarta.annotation.PostConstruct;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.cloud.ServiceDiscovery;
-import org.apache.camel.component.consul.cloud.ConsulServiceDiscoveryFactory;
-import org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationCommon;
-import org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties;
-import org.apache.camel.spi.BeanIntrospection;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.apache.camel.support.PluginHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnBean({ CamelAutoConfiguration.class, CamelContext.class })
-@Conditional(ConsulServiceDiscoveryAutoConfiguration.Condition.class)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties(ConsulServiceCallServiceDiscoveryConfigurationProperties.class)
-public class ConsulServiceDiscoveryAutoConfiguration {
- @Autowired
- private CamelContext camelContext;
- @Autowired
- private ConsulServiceCallServiceDiscoveryConfigurationProperties configuration;
- @Autowired
- private ConfigurableBeanFactory beanFactory;
-
- @Lazy
- @Bean(name = "consul-service-discovery")
- public ServiceDiscovery configureServiceDiscoveryFactory() throws Exception {
- ConsulServiceDiscoveryFactory factory = new ConsulServiceDiscoveryFactory();
-
- CamelPropertiesHelper.setCamelProperties(camelContext, factory,
- CamelPropertiesHelper.getNonNullProperties(camelContext, configuration), false);
-
- return factory.newInstance(camelContext);
- }
-
- @PostConstruct
- public void postConstruct() {
- if (beanFactory != null) {
- Map<String, Object> parameters = new HashMap<>();
-
- for (Map.Entry<String, ConsulServiceCallServiceDiscoveryConfigurationCommon> entry : configuration
- .getConfigurations().entrySet()) {
- // clean up params
- parameters.clear();
-
- // The instance factory
- ConsulServiceDiscoveryFactory factory = new ConsulServiceDiscoveryFactory();
-
- BeanIntrospection bi = PluginHelper.getBeanIntrospection(camelContext);
- try {
- bi.getProperties(entry.getValue(), parameters, null, false);
- CamelPropertiesHelper.setCamelProperties(camelContext, factory, parameters, false);
-
- beanFactory.registerSingleton(entry.getKey(), factory.newInstance(camelContext));
- } catch (Exception e) {
- throw new BeanCreationException(entry.getKey(), e.getMessage(), e);
- }
- }
- }
- }
-
- // *******************************
- // Condition
- // *******************************
-
- public static class Condition extends GroupCondition {
- public Condition() {
- super("camel.cloud.consul", "camel.cloud.consul.service-discovery");
- }
- }
-}
diff --git a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceRegistryAutoConfiguration.java b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceRegistryAutoConfiguration.java
deleted file mode 100644
index 3a940bacbf1..00000000000
--- a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceRegistryAutoConfiguration.java
+++ /dev/null
@@ -1,52 +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.component.consul.springboot.cloud;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.consul.cloud.ConsulServiceRegistry;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureBefore(CamelAutoConfiguration.class)
-@ConditionalOnProperty(prefix = "camel.cloud.consul", name = "enabled")
-@EnableConfigurationProperties(ConsulServiceRegistryConfiguration.class)
-public class ConsulServiceRegistryAutoConfiguration {
-
- @Autowired
- private CamelContext camelContext;
-
- @Bean(name = "consul-service-registry")
- @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
- public ConsulServiceRegistry consulServiceRegistry(ConsulServiceRegistryConfiguration configuration)
- throws Exception {
- ConsulServiceRegistry service = new ConsulServiceRegistry();
-
- CamelPropertiesHelper.setCamelProperties(camelContext, service,
- CamelPropertiesHelper.getNonNullProperties(camelContext, configuration), false);
-
- return service;
- }
-}
diff --git a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceRegistryConfiguration.java b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceRegistryConfiguration.java
deleted file mode 100644
index 1517cd157e7..00000000000
--- a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceRegistryConfiguration.java
+++ /dev/null
@@ -1,254 +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.component.consul.springboot.cloud;
-
-import java.math.BigInteger;
-import java.time.Duration;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.kiwiproject.consul.option.ConsistencyMode;
-
-import org.apache.camel.support.jsse.SSLContextParameters;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "camel.cloud.consul")
-public class ConsulServiceRegistryConfiguration
- extends org.apache.camel.component.consul.cloud.ConsulServiceRegistryConfiguration {
-
- /**
- * Sets if the consul service registry should be enabled or not, default is false.
- */
- private boolean enabled;
-
- /**
- * Service Registry ID
- */
- private String id;
-
- /**
- * Custom service attributes.
- */
- private Map<String, Object> attributes;
-
- /**
- * Service lookup order/priority.
- */
- private Integer order;
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Map<String, Object> getAttributes() {
- return attributes;
- }
-
- public void setAttributes(Map<String, Object> attributes) {
- this.attributes = attributes;
- }
-
- public Integer getOrder() {
- return order;
- }
-
- public void setOrder(Integer order) {
- this.order = order;
- }
-
- //
- // Fields copied from org.apache.camel.component.consul.cloud.ConsulServiceRegistryConfiguration
- // to add javadoc which is used by spring-boot-configuration-processor
- // to generate descritpions for inherited properties
- // ----------------
-
- /**
- * Should we remove all the registered services know by this registry on stop?
- */
- private boolean deregisterServicesOnStop = true;
-
- /**
- * Should we override the service host if given ?
- */
- private boolean overrideServiceHost = true;
-
- /**
- * Service host.
- */
- private String serviceHost;
-
- /**
- * The time (in seconds) to live for TTL checks. Default is 1 minute.
- */
- private int checkTtl = 60;
-
- /**
- * How often (in seconds) a service has to be marked as healthy if its check is TTL or how often the check should
- * run. Default is 5 seconds.
- */
- private int checkInterval = 5;
-
- /**
- * How long (in seconds) to wait to deregister a service in case of unclean shutdown. Default is 1 hour.
- */
- private int deregisterAfter = 3600;
-
- //
- // Fields copied from org.apache.camel.component.consul.cluster.ConsulClusterConfiguration
- // ------------------------------------------
- /**
- *
- */
- private int sessionTtl = 60;
-
- /**
- *
- */
- private int sessionLockDelay = 5;
-
- /**
- *
- */
- private int sessionRefreshInterval = 5;
-
- /**
- *
- */
- private String rootPath = "/camel";
-
- //
- // Fields copied from org.apache.camel.component.consul.ConsulClientConfiguration
- // ---------------
-
- /**
- * The Consul agent URL
- */
- private String url;
-
- /**
- * Use datacenter instead
- */
- private String dc;
-
- /**
- * The data center
- */
- private String datacenter;
-
- /**
- * The near node to use for queries.
- */
- private String nearNode;
-
- /**
- * The note meta-data to use for queries.
- */
- private List<String> nodeMeta;
-
- /**
- * The consistencyMode used for queries, default ConsistencyMode.DEFAULT
- */
- private ConsistencyMode consistencyMode = ConsistencyMode.DEFAULT;
-
- /**
- * Set tags. You can separate multiple tags by comma.
- */
- private Set<String> tags;
-
- /**
- * SSL configuration using an org.apache.camel.support.jsse.SSLContextParameters instance.
- */
- private SSLContextParameters sslContextParameters;
-
- /**
- * 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;
-
- /**
- * Use connectTimeout instead
- */
- private Long connectTimeoutMillis;
-
- /**
- * Connect timeout for OkHttpClient
- */
- private Duration connectTimeout;
-
- /**
- * Use readTimeout instead.
- */
- private Long readTimeoutMillis;
-
- /**
- * Read timeout for OkHttpClient
- */
- private Duration readTimeout;
-
- /**
- * Use writeTimeout instead.
- */
- private Long writeTimeoutMillis;
-
- /**
- * Write timeout for OkHttpClient
- */
- private Duration writeTimeout;
-
- /**
- * Configure if the AgentClient should attempt a ping before returning the Consul instance
- */
- private boolean pingInstance = true;
-
- /**
- * The time (in seconds) to wait for a watch event, default 10 seconds
- */
- private Integer blockSeconds = 10;
-
- /**
- * The first index for watch for, default 0
- */
- private BigInteger firstIndex = BigInteger.valueOf(0L);
-
- /**
- * Recursively watch, default false
- */
- private boolean recursive;
-}
diff --git a/components-starter/camel-consul-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-consul-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index e484ca4addb..95b2aa6dfd8 100644
--- a/components-starter/camel-consul-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/components-starter/camel-consul-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -14,8 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-
org.apache.camel.component.consul.springboot.ConsulComponentConverter
org.apache.camel.component.consul.springboot.ConsulComponentAutoConfiguration
-org.apache.camel.component.consul.springboot.cloud.ConsulServiceDiscoveryAutoConfiguration
-org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryAutoConfiguration
\ No newline at end of file
diff --git a/components-starter/camel-consul-starter/src/test/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceDiscoveryTest.java b/components-starter/camel-consul-starter/src/test/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceDiscoveryTest.java
deleted file mode 100644
index 57584370a62..00000000000
--- a/components-starter/camel-consul-starter/src/test/java/org/apache/camel/component/consul/springboot/cloud/ConsulServiceDiscoveryTest.java
+++ /dev/null
@@ -1,53 +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.component.consul.springboot.cloud;
-
-import org.apache.camel.cloud.ServiceDiscovery;
-import org.apache.camel.model.cloud.springboot.ConsulServiceCallServiceDiscoveryConfigurationProperties;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class ConsulServiceDiscoveryTest {
- @Test
- public void testConsulServiceDiscoveryDisabled() {
- new ApplicationContextRunner().withUserConfiguration(TestConfiguration.class)
- .withPropertyValues("spring.main.banner-mode=off", "camel.cloud.consul.service-discovery.enabled=false")
- .run(context -> {
- assertThat(context).doesNotHaveBean(ConsulServiceCallServiceDiscoveryConfigurationProperties.class);
- assertThat(context).getBeans(ServiceDiscovery.class).doesNotContainKeys("consul-service-discovery");
- });
- }
-
- @Test
- public void testConsulServiceDiscoveryEnabled() {
- new ApplicationContextRunner().withUserConfiguration(TestConfiguration.class)
- .withPropertyValues("spring.main.banner-mode=off", "camel.cloud.consul.service-discovery.enabled=true")
- .run(context -> {
- assertThat(context).hasSingleBean(ConsulServiceCallServiceDiscoveryConfigurationProperties.class);
- assertThat(context).getBeans(ServiceDiscovery.class).containsKeys("consul-service-discovery");
- });
- }
-
- @EnableAutoConfiguration
- @Configuration
- public static class TestConfiguration {
- }
-}
diff --git a/components-starter/camel-consul-starter/src/test/resources/application.properties b/components-starter/camel-consul-starter/src/test/resources/application.properties
deleted file mode 100644
index 2f91fc32820..00000000000
--- a/components-starter/camel-consul-starter/src/test/resources/application.properties
+++ /dev/null
@@ -1,17 +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.
-## ---------------------------------------------------------------------------
-spring.main.banner-mode=off
diff --git a/components-starter/camel-consul-starter/src/test/resources/logback.xml b/components-starter/camel-consul-starter/src/test/resources/logback.xml
deleted file mode 100644
index 972efdc05c5..00000000000
--- a/components-starter/camel-consul-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- <file>target/camel-consul-starter-test.log</file>
- </appender>
-
- <root level="INFO">
- <!--<appender-ref ref="STDOUT"/>-->
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/components-starter/camel-dns-starter/pom.xml b/components-starter/camel-dns-starter/pom.xml
index 53bcb7e1f2a..62a13a49f90 100644
--- a/components-starter/camel-dns-starter/pom.xml
+++ b/components-starter/camel-dns-starter/pom.xml
@@ -26,8 +26,7 @@
</parent>
<artifactId>camel-dns-starter</artifactId>
<packaging>jar</packaging>
- <name>Camel SB Starters :: DNS</name>
- <description>Spring-Boot Starter for Camel DNS support</description>
+ <name>Camel SB Starters :: dns</name>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/cloud/DnsCloudAutoConfiguration.java b/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/cloud/DnsCloudAutoConfiguration.java
deleted file mode 100644
index 25bbbf923b1..00000000000
--- a/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/cloud/DnsCloudAutoConfiguration.java
+++ /dev/null
@@ -1,106 +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.component.dns.springboot.cloud;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import jakarta.annotation.PostConstruct;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.cloud.ServiceDiscovery;
-import org.apache.camel.component.dns.cloud.DnsServiceDiscoveryFactory;
-import org.apache.camel.model.cloud.springboot.DnsServiceCallServiceDiscoveryConfigurationCommon;
-import org.apache.camel.model.cloud.springboot.DnsServiceCallServiceDiscoveryConfigurationProperties;
-import org.apache.camel.spi.BeanIntrospection;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.apache.camel.support.PluginHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnBean(CamelAutoConfiguration.class)
-@Conditional(DnsCloudAutoConfiguration.Condition.class)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties(DnsServiceCallServiceDiscoveryConfigurationProperties.class)
-public class DnsCloudAutoConfiguration {
- @Autowired
- private CamelContext camelContext;
- @Autowired
- private DnsServiceCallServiceDiscoveryConfigurationProperties configuration;
- @Autowired
- private ConfigurableBeanFactory beanFactory;
-
- @Lazy
- @Bean(name = "dns-service-discovery")
- @ConditionalOnClass(CamelContext.class)
- public ServiceDiscovery configureServiceDiscoveryFactory() throws Exception {
- DnsServiceDiscoveryFactory factory = new DnsServiceDiscoveryFactory();
-
- CamelPropertiesHelper.setCamelProperties(camelContext, factory,
- CamelPropertiesHelper.getNonNullProperties(camelContext, configuration), false);
-
- return factory.newInstance(camelContext);
- }
-
- @PostConstruct
- public void postConstruct() {
- if (beanFactory != null) {
- Map<String, Object> parameters = new HashMap<>();
-
- for (Map.Entry<String, DnsServiceCallServiceDiscoveryConfigurationCommon> entry : configuration
- .getConfigurations().entrySet()) {
- // clean up params
- parameters.clear();
-
- // The instance factory
- DnsServiceDiscoveryFactory factory = new DnsServiceDiscoveryFactory();
-
- BeanIntrospection bi = PluginHelper.getBeanIntrospection(camelContext);
- try {
- bi.getProperties(entry.getValue(), parameters, null, false);
- CamelPropertiesHelper.setCamelProperties(camelContext, factory, parameters, false);
-
- beanFactory.registerSingleton(entry.getKey(), factory.newInstance(camelContext));
- } catch (Exception e) {
- throw new BeanCreationException(entry.getKey(), e.getMessage(), e);
- }
- }
- }
- }
-
- // *******************************
- // Condition
- // *******************************
-
- public static class Condition extends GroupCondition {
- public Condition() {
- super("camel.cloud.dns", "camel.cloud.dns.service-discovery");
- }
- }
-}
diff --git a/components-starter/camel-dns-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-dns-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 31c9e89fbbc..ad5914172fe 100644
--- a/components-starter/camel-dns-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/components-starter/camel-dns-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -14,6 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-
org.apache.camel.component.dns.springboot.DnsComponentAutoConfiguration
-org.apache.camel.component.dns.springboot.cloud.DnsCloudAutoConfiguration
\ No newline at end of file
diff --git a/components-starter/camel-dns-starter/src/test/java/org/apache/camel/component/dns/springboot/cloud/DnsServiceDiscoveryTest.java b/components-starter/camel-dns-starter/src/test/java/org/apache/camel/component/dns/springboot/cloud/DnsServiceDiscoveryTest.java
deleted file mode 100644
index a32bdf5caf2..00000000000
--- a/components-starter/camel-dns-starter/src/test/java/org/apache/camel/component/dns/springboot/cloud/DnsServiceDiscoveryTest.java
+++ /dev/null
@@ -1,53 +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.component.dns.springboot.cloud;
-
-import org.apache.camel.cloud.ServiceDiscovery;
-import org.apache.camel.model.cloud.springboot.DnsServiceCallServiceDiscoveryConfigurationProperties;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class DnsServiceDiscoveryTest {
- @Test
- public void testServiceDiscoveryDisabled() {
- new ApplicationContextRunner().withUserConfiguration(TestConfiguration.class)
- .withPropertyValues("spring.main.banner-mode=off", "camel.cloud.dns.service-discovery.enabled=false")
- .run(context -> {
- assertThat(context).doesNotHaveBean(DnsServiceCallServiceDiscoveryConfigurationProperties.class);
- assertThat(context).getBeans(ServiceDiscovery.class).doesNotContainKeys("dns-service-discovery");
- });
- }
-
- @Test
- public void testServiceDiscoveryEnabled() {
- new ApplicationContextRunner().withUserConfiguration(TestConfiguration.class)
- .withPropertyValues("spring.main.banner-mode=off", "camel.cloud.dns.service-discovery.enabled=true")
- .run(context -> {
- assertThat(context).hasSingleBean(DnsServiceCallServiceDiscoveryConfigurationProperties.class);
- assertThat(context).getBeans(ServiceDiscovery.class).containsKeys("dns-service-discovery");
- });
- }
-
- @EnableAutoConfiguration
- @Configuration
- public static class TestConfiguration {
- }
-}
diff --git a/components-starter/camel-dns-starter/src/test/resources/application.properties b/components-starter/camel-dns-starter/src/test/resources/application.properties
deleted file mode 100644
index 71e1678fa96..00000000000
--- a/components-starter/camel-dns-starter/src/test/resources/application.properties
+++ /dev/null
@@ -1,18 +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.
-## ---------------------------------------------------------------------------
-
-spring.main.banner-mode=off
diff --git a/components-starter/camel-dns-starter/src/test/resources/logback.xml b/components-starter/camel-dns-starter/src/test/resources/logback.xml
deleted file mode 100644
index ff4c133004d..00000000000
--- a/components-starter/camel-dns-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- <file>target/camel-dns-starter-test.log</file>
- </appender>
-
- <root level="INFO">
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/components-starter/camel-file-cluster-service-starter/pom.xml b/components-starter/camel-file-cluster-service-starter/pom.xml
deleted file mode 100644
index d178b2f1ece..00000000000
--- a/components-starter/camel-file-cluster-service-starter/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>components-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-file-cluster-service-starter</artifactId>
- <packaging>jar</packaging>
- <name>Camel SB Starters :: File Cluster Service</name>
- <description>Spring-Boot Starter for Camel Cluster Service based on File lock</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-file-starter</artifactId>
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git a/components-starter/camel-file-cluster-service-starter/src/main/docs/file-cluster-service.json b/components-starter/camel-file-cluster-service-starter/src/main/docs/file-cluster-service.json
deleted file mode 100644
index cb127f57ffc..00000000000
--- a/components-starter/camel-file-cluster-service-starter/src/main/docs/file-cluster-service.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "groups": [
- {
- "name": "camel.cluster.file",
- "type": "org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceConfiguration",
- "sourceType": "org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceConfiguration"
- }
- ],
- "properties": [
- {
- "name": "camel.cluster.file.acquire-lock-delay",
- "type": "java.lang.String",
- "description": "The time to wait before starting to try to acquire the cluster lock. Note that if FileLockClusterService determines no cluster members are running or cannot reliably determine the cluster state, the initial delay is computed from the acquireLockInterval.",
- "sourceType": "org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.file.acquire-lock-interval",
- "type": "java.lang.String",
- "description": "The time to wait between attempts to try to acquire the cluster lock evaluated using wall-clock time. All cluster members must use the same value so leadership checks and leader liveness detection remain consistent.",
- "sourceType": "org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.file.attributes",
- "type": "java.util.Map<java.lang.String,java.lang.Object>",
- "description": "Custom service attributes.",
- "sourceType": "org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.file.cluster-data-task-max-attempts",
- "type": "java.lang.Integer",
- "description": "The number of times a cluster data task will run, counting both the first execution and subsequent retries in case of failure or timeout. <p> This can be useful when the cluster data root is on network based file storage, where I\/O operations may occasionally block for long or unpredictable periods.",
- "sourceType": "org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.file.cluster-data-task-timeout",
- "type": "java.lang.Long",
- "description": "The timeout for a cluster data task (reading or writing cluster data). <p> Timeouts are useful when the cluster data root is on network storage, where I\/O operations may occasionally block for long or unpredictable periods.",
- "sourceType": "org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.file.enabled",
- "type": "java.lang.Boolean",
- "description": "Sets if the file cluster service should be enabled or not, default is true.",
- "sourceType": "org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.cluster.file.heartbeat-timeout-multiplier",
- "type": "java.lang.Integer",
- "description": "Multiplier applied to the cluster leader acquireLockInterval to determine how long followers should wait before considering the leader \"stale\". For example, if the leader updates its heartbeat every 2 seconds and the heartbeatTimeoutMultiplier is 3, followers will tolerate up to 2s * 3 = 6s of silence before declaring the leader unavailable.",
- "sourceType": "org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.file.id",
- "type": "java.lang.String",
- "description": "Cluster Service ID",
- "sourceType": "org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.file.order",
- "type": "java.lang.Integer",
- "description": "Service lookup order\/priority.",
- "sourceType": "org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.file.root",
- "type": "java.lang.String",
- "description": "The root path.",
- "sourceType": "org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceConfiguration"
- }
- ],
- "hints": [],
- "ignored": {
- "properties": []
- }
-}
\ No newline at end of file
diff --git a/components-starter/camel-file-cluster-service-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java b/components-starter/camel-file-cluster-service-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java
deleted file mode 100644
index c7edcb008d2..00000000000
--- a/components-starter/camel-file-cluster-service-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceAutoConfiguration.java
+++ /dev/null
@@ -1,63 +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.component.file.springboot.cluster;
-
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.camel.cluster.CamelClusterService;
-import org.apache.camel.component.file.cluster.FileLockClusterService;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
-import org.apache.camel.spring.boot.cluster.TimePatternConverter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-@Configuration
-@AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
-@ConditionalOnProperty(prefix = "camel.cluster.file", name = "enabled", matchIfMissing = true)
-@EnableConfigurationProperties(FileLockClusterServiceConfiguration.class)
-public class FileLockClusterServiceAutoConfiguration {
- @Autowired
- private FileLockClusterServiceConfiguration configuration;
-
- @Bean(name = "file-lock-cluster-service")
- @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
- public CamelClusterService fileClusterService() throws Exception {
- FileLockClusterService service = new FileLockClusterService();
-
- Optional.ofNullable(configuration.getId()).ifPresent(service::setId);
- Optional.ofNullable(configuration.getRoot()).ifPresent(service::setRoot);
- Optional.ofNullable(configuration.getOrder()).ifPresent(service::setOrder);
- Optional.ofNullable(configuration.getAttributes()).ifPresent(service::setAttributes);
- Optional.ofNullable(configuration.getAcquireLockDelay()).map(TimePatternConverter::toMilliSeconds)
- .ifPresent(v -> service.setAcquireLockDelay(v, TimeUnit.MILLISECONDS));
- Optional.ofNullable(configuration.getAcquireLockInterval()).map(TimePatternConverter::toMilliSeconds)
- .ifPresent(v -> service.setAcquireLockInterval(v, TimeUnit.MILLISECONDS));
- Optional.ofNullable(configuration.getHeartbeatTimeoutMultiplier()).ifPresent(service::setHeartbeatTimeoutMultiplier);
- Optional.ofNullable(configuration.getClusterDataTaskMaxAttempts()).ifPresent(service::setClusterDataTaskMaxAttempts);
- Optional.ofNullable(configuration.getClusterDataTaskTimeout()).ifPresent(service::setClusterDataTaskTimeout);
-
- return service;
- }
-}
diff --git a/components-starter/camel-file-cluster-service-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceConfiguration.java b/components-starter/camel-file-cluster-service-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceConfiguration.java
deleted file mode 100644
index 39b5b5ad71e..00000000000
--- a/components-starter/camel-file-cluster-service-starter/src/main/java/org/apache/camel/component/file/springboot/cluster/FileLockClusterServiceConfiguration.java
+++ /dev/null
@@ -1,167 +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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.component.file.springboot.cluster;
-
-import java.util.Map;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "camel.cluster.file")
-public class FileLockClusterServiceConfiguration {
- /**
- * Sets if the file cluster service should be enabled or not, default is true.
- */
- private boolean enabled = true;
-
- /**
- * Cluster Service ID
- */
- private String id;
-
- /**
- * The root path.
- */
- private String root;
-
- /**
- * The time to wait before starting to try to acquire the cluster lock. Note that if FileLockClusterService
- * determines no cluster members are running or cannot reliably determine the cluster state, the initial delay is
- * computed from the acquireLockInterval.
- */
- private String acquireLockDelay;
-
- /**
- * The time to wait between attempts to try to acquire the cluster lock evaluated using wall-clock time. All cluster
- * members must use the same value so leadership checks and leader liveness detection remain consistent.
- */
- private String acquireLockInterval;
-
- /**
- * Custom service attributes.
- */
- private Map<String, Object> attributes;
-
- /**
- * Multiplier applied to the cluster leader acquireLockInterval to determine how long followers should wait
- * before considering the leader "stale".
- * For example, if the leader updates its heartbeat every 2 seconds and the heartbeatTimeoutMultiplier is 3,
- * followers will tolerate up to 2s * 3 = 6s of silence before declaring the leader unavailable.
- */
- private Integer heartbeatTimeoutMultiplier;
-
- /**
- * The number of times a cluster data task will run, counting both the first execution and subsequent retries in
- * case of failure or timeout.
- * <p>
- * This can be useful when the cluster data root is on network based file storage, where I/O operations may
- * occasionally block for long or unpredictable periods.
- */
- private Integer clusterDataTaskMaxAttempts;
-
- /**
- * The timeout for a cluster data task (reading or writing cluster data).
- * <p>
- * Timeouts are useful when the cluster data root is on network storage, where I/O operations may occasionally block
- * for long or unpredictable periods.
- */
- private Long clusterDataTaskTimeout;
-
- /**
- * Service lookup order/priority.
- */
- private Integer order;
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getRoot() {
- return root;
- }
-
- public void setRoot(String root) {
- this.root = root;
- }
-
- public String getAcquireLockDelay() {
- return acquireLockDelay;
- }
-
- public void setAcquireLockDelay(String acquireLockDelay) {
- this.acquireLockDelay = acquireLockDelay;
- }
-
- public String getAcquireLockInterval() {
- return acquireLockInterval;
- }
-
- public void setAcquireLockInterval(String acquireLockInterval) {
- this.acquireLockInterval = acquireLockInterval;
- }
-
- public Map<String, Object> getAttributes() {
- return attributes;
- }
-
- public void setAttributes(Map<String, Object> attributes) {
- this.attributes = attributes;
- }
-
- public Integer getOrder() {
- return order;
- }
-
- public void setOrder(Integer order) {
- this.order = order;
- }
-
- public Integer getHeartbeatTimeoutMultiplier() {
- return heartbeatTimeoutMultiplier;
- }
-
- public void setHeartbeatTimeoutMultiplier(Integer heartbeatTimeoutMultiplier) {
- this.heartbeatTimeoutMultiplier = heartbeatTimeoutMultiplier;
- }
-
- public Integer getClusterDataTaskMaxAttempts() {
- return clusterDataTaskMaxAttempts;
- }
-
- public void setClusterDataTaskMaxAttempts(Integer clusterDataTaskMaxAttempts) {
- this.clusterDataTaskMaxAttempts = clusterDataTaskMaxAttempts;
- }
-
- public Long getClusterDataTaskTimeout() {
- return clusterDataTaskTimeout;
- }
-
- public void setClusterDataTaskTimeout(Long clusterDataTaskTimeout) {
- this.clusterDataTaskTimeout = clusterDataTaskTimeout;
- }
-}
diff --git a/components-starter/camel-file-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-file-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b1270ff0..00000000000
--- a/components-starter/camel-file-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
diff --git a/components-starter/camel-file-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-file-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf2e6b..00000000000
--- a/components-starter/camel-file-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git a/components-starter/camel-file-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-file-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 37264e4ab79..00000000000
--- a/components-starter/camel-file-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,18 +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.
-## ---------------------------------------------------------------------------
-
-org.apache.camel.component.file.springboot.cluster.FileLockClusterServiceAutoConfiguration
\ No newline at end of file
diff --git a/components-starter/camel-file-cluster-service-starter/src/test/java/org/apache/camel/component/file/springboot/cluster/FileClusterServiceAutoConfigurationTest.java b/components-starter/camel-file-cluster-service-starter/src/test/java/org/apache/camel/component/file/springboot/cluster/FileClusterServiceAutoConfigurationTest.java
deleted file mode 100644
index 95cb2965fb3..00000000000
--- a/components-starter/camel-file-cluster-service-starter/src/test/java/org/apache/camel/component/file/springboot/cluster/FileClusterServiceAutoConfigurationTest.java
+++ /dev/null
@@ -1,68 +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.component.file.springboot.cluster;
-
-import org.apache.camel.component.file.cluster.FileLockClusterService;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class FileClusterServiceAutoConfigurationTest {
-
- @Test
- public void testDisable() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(FileLockClusterServiceAutoConfiguration.class))
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cluster.file.enabled=false")
- .run(
- context -> {
- assertThat(context).doesNotHaveBean(FileLockClusterService.class);
- });
- }
-
- /**
- * Testing that the service can be enabled and configured completely.
- */
- @Test
- public void testPropertiesMapped() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(FileLockClusterServiceAutoConfiguration.class))
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cluster.file.id=myid1")
- .run(
- context -> {
- final FileLockClusterService clusterService = context.getBean(FileLockClusterService.class);
-
- assertEquals("myid1", clusterService.getId());
- });
- }
-
- @EnableAutoConfiguration
- @Configuration
- public static class TestConfiguration {
- }
-}
diff --git a/components-starter/camel-file-cluster-service-starter/src/test/resources/logback.xml b/components-starter/camel-file-cluster-service-starter/src/test/resources/logback.xml
deleted file mode 100644
index 6048df82ff8..00000000000
--- a/components-starter/camel-file-cluster-service-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- <file>target/camel-file-cluster-service-starter-test.log</file>
- </appender>
-
- <root level="INFO">
- <!--<appender-ref ref="STDOUT"/>-->
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/components-starter/camel-infinispan-cluster-service-starter/pom.xml b/components-starter/camel-infinispan-cluster-service-starter/pom.xml
deleted file mode 100644
index f585e82e925..00000000000
--- a/components-starter/camel-infinispan-cluster-service-starter/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>components-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-infinispan-cluster-service-starter</artifactId>
- <packaging>jar</packaging>
- <name>Camel SB Starters :: Infinispan Cluster Service</name>
- <description>Spring-Boot Starter for Camel Cluster Service based on Infinispan</description>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.infinispan</groupId>
- <artifactId>infinispan-bom</artifactId>
- <version>${infinispan-version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-infinispan-starter</artifactId>
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git a/components-starter/camel-infinispan-cluster-service-starter/src/main/docs/infinispan-cluster-service.json b/components-starter/camel-infinispan-cluster-service-starter/src/main/docs/infinispan-cluster-service.json
deleted file mode 100644
index 272ab62655c..00000000000
--- a/components-starter/camel-infinispan-cluster-service-starter/src/main/docs/infinispan-cluster-service.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
- "groups": [
- {
- "name": "camel.cluster.infinispan.remote",
- "type": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- }
- ],
- "properties": [
- {
- "name": "camel.cluster.infinispan.remote.attributes",
- "type": "java.util.Map<java.lang.String,java.lang.Object>",
- "description": "Custom service attributes.",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.cache-container",
- "type": "org.infinispan.client.hotrod.RemoteCacheManager",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.cache-container-configuration",
- "type": "org.infinispan.client.hotrod.configuration.Configuration",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.configuration-properties",
- "type": "java.util.Map<java.lang.String,java.lang.String>",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.configuration-uri",
- "type": "java.lang.String",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.enabled",
- "type": "java.lang.Boolean",
- "description": "Sets if the zookeeper cluster service should be enabled or not, default is true.",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.cluster.infinispan.remote.hosts",
- "type": "java.lang.String",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.id",
- "type": "java.lang.String",
- "description": "Cluster Service ID",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.lifespan",
- "type": "java.lang.Long",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.lifespan-time-unit",
- "type": "java.util.concurrent.TimeUnit",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.order",
- "type": "java.lang.Integer",
- "description": "Service lookup order\/priority.",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.password",
- "type": "java.lang.String",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.sasl-mechanism",
- "type": "java.lang.String",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.secure",
- "type": "java.lang.Boolean",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.security-realm",
- "type": "java.lang.String",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.security-server-name",
- "type": "java.lang.String",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.infinispan.remote.username",
- "type": "java.lang.String",
- "sourceType": "org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceConfiguration"
- }
- ],
- "hints": [],
- "ignored": {
- "properties": []
- }
-}
\ No newline at end of file
diff --git a/components-starter/camel-infinispan-cluster-service-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/cluster/InfinispanRemoteClusterServiceAutoConfiguration.java b/components-starter/camel-infinispan-cluster-service-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/cluster/InfinispanRemoteClusterServiceAutoConfiguration.java
deleted file mode 100644
index f6d729848d6..00000000000
--- a/components-starter/camel-infinispan-cluster-service-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/cluster/InfinispanRemoteClusterServiceAutoConfiguration.java
+++ /dev/null
@@ -1,55 +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.component.infinispan.remote.springboot.cluster;
-
-import org.apache.camel.cluster.CamelClusterService;
-import org.apache.camel.component.infinispan.remote.cluster.InfinispanRemoteClusterService;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-import java.util.Optional;
-
-@Configuration
-@AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
-@ConditionalOnProperty(prefix = "camel.cluster.infinispan.remote", name = "enabled", matchIfMissing = true)
-@EnableConfigurationProperties(InfinispanRemoteClusterServiceConfiguration.class)
-public class InfinispanRemoteClusterServiceAutoConfiguration {
-
- @Autowired
- private InfinispanRemoteClusterServiceConfiguration configuration;
-
- @Bean(name = "infinispan-remote-cluster-service")
- @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
- public CamelClusterService infinispanRemoteClusterService() {
- InfinispanRemoteClusterService service = new InfinispanRemoteClusterService();
-
- Optional.ofNullable(configuration.getId()).ifPresent(service::setId);
- Optional.ofNullable(configuration.getOrder()).ifPresent(service::setOrder);
- Optional.ofNullable(configuration.getAttributes()).ifPresent(service::setAttributes);
- service.setConfiguration(configuration);
-
- return service;
- }
-}
diff --git a/components-starter/camel-infinispan-cluster-service-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/cluster/InfinispanRemoteClusterServiceConfiguration.java b/components-starter/camel-infinispan-cluster-service-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/cluster/InfinispanRemoteClusterServiceConfiguration.java
deleted file mode 100644
index 0c6c2d0c5ca..00000000000
--- a/components-starter/camel-infinispan-cluster-service-starter/src/main/java/org/apache/camel/component/infinispan/remote/springboot/cluster/InfinispanRemoteClusterServiceConfiguration.java
+++ /dev/null
@@ -1,169 +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.component.infinispan.remote.springboot.cluster;
-
-import org.apache.camel.component.infinispan.remote.cluster.InfinispanRemoteClusterConfiguration;
-import org.infinispan.client.hotrod.RemoteCacheManager;
-import org.infinispan.client.hotrod.configuration.Configuration;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-import java.util.Map;
-
-@ConfigurationProperties(prefix = "camel.cluster.infinispan.remote")
-public class InfinispanRemoteClusterServiceConfiguration extends InfinispanRemoteClusterConfiguration {
- /**
- * Sets if the zookeeper cluster service should be enabled or not, default is true.
- */
- private boolean enabled = true;
-
- /**
- * Cluster Service ID
- */
- private String id;
-
- /**
- * Custom service attributes.
- */
- private Map<String, Object> attributes;
-
- /**
- * Service lookup order/priority.
- */
- private Integer order;
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Map<String, Object> getAttributes() {
- return attributes;
- }
-
- public void setAttributes(Map<String, Object> attributes) {
- this.attributes = attributes;
- }
-
- public Integer getOrder() {
- return order;
- }
-
- public void setOrder(Integer order) {
- this.order = order;
- }
-
- //
- // Fields copied from InifnispanRemoteConfiguration to add
- // javadoc which is used by spring-boot-configuration-processor
- // to generate descritpions for inherited properties
- // ------------------------------------------
-
- public String getHosts() {
- return getConfiguration().getHosts();
- }
-
- public void setHosts(String hosts) {
- getConfiguration().setHosts(hosts);
- }
-
- public boolean isSecure() {
- return getConfiguration().isSecure();
- }
-
- public void setSecure(boolean secure) {
- getConfiguration().setSecure(secure);
- }
-
- public String getUsername() {
- return getConfiguration().getUsername();
- }
-
- public void setUsername(String username) {
- getConfiguration().setUsername(username);
- }
-
- public String getPassword() {
- return getConfiguration().getPassword();
- }
-
- public void setPassword(String password) {
- getConfiguration().setPassword(password);
- }
-
- public String getSaslMechanism() {
- return getConfiguration().getSaslMechanism();
- }
-
- public void setSaslMechanism(String saslMechanism) {
- getConfiguration().setSaslMechanism(saslMechanism);
- }
-
- public String getSecurityRealm() {
- return getConfiguration().getSecurityRealm();
- }
-
- public void setSecurityRealm(String securityRealm) {
- getConfiguration().setSecurityRealm(securityRealm);
- }
-
- public String getSecurityServerName() {
- return getConfiguration().getSecurityServerName();
- }
-
- public void setSecurityServerName(String securityServerName) {
- getConfiguration().setSecurityServerName(securityServerName);
- }
-
- public Map<String, String> getConfigurationProperties() {
- return getConfiguration().getConfigurationProperties();
- }
-
- public void setConfigurationProperties(Map<String, String> configurationProperties) {
- getConfiguration().setConfigurationProperties(configurationProperties);
- }
-
- public void addConfigurationProperty(String key, String value) {
- getConfiguration().addConfigurationProperty(key, value);
- }
-
- public RemoteCacheManager getCacheContainer() {
- return getConfiguration().getCacheContainer();
- }
-
- public void setCacheContainer(RemoteCacheManager cacheContainer) {
- getConfiguration().setCacheContainer(cacheContainer);
- }
-
- public Configuration getCacheContainerConfiguration() {
- return getConfiguration().getCacheContainerConfiguration();
- }
-
- public void setCacheContainerConfiguration(Configuration cacheContainerConfiguration) {
- getConfiguration().setCacheContainerConfiguration(cacheContainerConfiguration);
- }
-}
diff --git a/components-starter/camel-infinispan-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-infinispan-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b1270ff0..00000000000
--- a/components-starter/camel-infinispan-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
diff --git a/components-starter/camel-infinispan-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-infinispan-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf2e6b..00000000000
--- a/components-starter/camel-infinispan-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git a/components-starter/camel-infinispan-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-infinispan-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 43ffce36fe4..00000000000
--- a/components-starter/camel-infinispan-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,18 +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.
-## ---------------------------------------------------------------------------
-
-org.apache.camel.component.infinispan.remote.springboot.cluster.InfinispanRemoteClusterServiceAutoConfiguration
diff --git a/components-starter/camel-infinispan-cluster-service-starter/src/test/java/org/apache/camel/component/infinispan/remote/springboot/cluster/InfinispanEmbeddedClusterServiceAutoConfigurationTest.java b/components-starter/camel-infinispan-cluster-service-starter/src/test/java/org/apache/camel/component/infinispan/remote/springboot/cluster/InfinispanEmbeddedClusterServiceAutoConfigurationTest.java
deleted file mode 100644
index fd99889b03e..00000000000
--- a/components-starter/camel-infinispan-cluster-service-starter/src/test/java/org/apache/camel/component/infinispan/remote/springboot/cluster/InfinispanEmbeddedClusterServiceAutoConfigurationTest.java
+++ /dev/null
@@ -1,68 +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.component.infinispan.remote.springboot.cluster;
-
-import org.apache.camel.component.infinispan.remote.cluster.InfinispanRemoteClusterService;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class InfinispanEmbeddedClusterServiceAutoConfigurationTest {
-
- @Test
- public void testDisable() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(InfinispanRemoteClusterServiceAutoConfiguration.class))
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cluster.infinispan.remote.enabled=false")
- .run(
- context -> {
- assertThat(context).doesNotHaveBean(InfinispanRemoteClusterService.class);
- });
- }
-
- /**
- * Testing that the service can be enabled and configured completely.
- */
- @Test
- public void testPropertiesMapped() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(InfinispanRemoteClusterServiceAutoConfiguration.class))
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cluster.infinispan.remote.id=myid1")
- .run(
- context -> {
- final InfinispanRemoteClusterService clusterService = context.getBean(InfinispanRemoteClusterService.class);
-
- assertEquals("myid1", clusterService.getId());
- });
- }
-
- @EnableAutoConfiguration
- @Configuration
- public static class TestConfiguration {
- }
-}
diff --git a/components-starter/camel-infinispan-cluster-service-starter/src/test/resources/logback.xml b/components-starter/camel-infinispan-cluster-service-starter/src/test/resources/logback.xml
deleted file mode 100644
index 222b855d15b..00000000000
--- a/components-starter/camel-infinispan-cluster-service-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- <file>target/camel-infinispan-cluster-service-starter-test.log</file>
- </appender>
-
- <root level="INFO">
- <!--<appender-ref ref="STDOUT"/>-->
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/components-starter/camel-jgroups-raft-cluster-service-starter/pom.xml b/components-starter/camel-jgroups-raft-cluster-service-starter/pom.xml
deleted file mode 100644
index 10ca5491847..00000000000
--- a/components-starter/camel-jgroups-raft-cluster-service-starter/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>components-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-jgroups-raft-cluster-service-starter</artifactId>
- <packaging>jar</packaging>
- <name>Camel SB Starters :: JGroups Raft Cluster Service</name>
- <description>Spring-Boot Starter for Camel Cluster Service based on JGroups Raft</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-jgroups-raft-starter</artifactId>
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/docs/jgroups-raft-cluster-service.json b/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/docs/jgroups-raft-cluster-service.json
deleted file mode 100644
index acefcd91f2a..00000000000
--- a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/docs/jgroups-raft-cluster-service.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "groups": [
- {
- "name": "camel.cluster.jgroups-raft",
- "type": "org.apache.camel.component.jgroups.raft.springboot.cluster.JGroupsRaftClusterServiceConfiguration",
- "sourceType": "org.apache.camel.component.jgroups.raft.springboot.cluster.JGroupsRaftClusterServiceConfiguration"
- }
- ],
- "properties": [
- {
- "name": "camel.cluster.jgroups-raft.enabled",
- "type": "java.lang.Boolean",
- "description": "Sets if the jgroups raft cluster service should be enabled or not, default is true.",
- "sourceType": "org.apache.camel.component.jgroups.raft.springboot.cluster.JGroupsRaftClusterServiceConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.cluster.jgroups-raft.id",
- "type": "java.lang.String",
- "description": "Cluster Service ID",
- "sourceType": "org.apache.camel.component.jgroups.raft.springboot.cluster.JGroupsRaftClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.jgroups-raft.jgroups-raft-cluster-name",
- "type": "java.lang.String",
- "description": "JGroups Cluster name",
- "sourceType": "org.apache.camel.component.jgroups.raft.springboot.cluster.JGroupsRaftClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.jgroups-raft.jgroups-raft-config",
- "type": "java.lang.String",
- "description": "JGrups-raft configuration File name",
- "sourceType": "org.apache.camel.component.jgroups.raft.springboot.cluster.JGroupsRaftClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.jgroups-raft.raft-id",
- "type": "java.lang.String",
- "description": "JGroups-raft ID",
- "sourceType": "org.apache.camel.component.jgroups.raft.springboot.cluster.JGroupsRaftClusterServiceConfiguration"
- }
- ],
- "hints": [],
- "ignored": {
- "properties": []
- }
-}
\ No newline at end of file
diff --git a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/JGroupsRaftClusterServiceAutoConfiguration.java b/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/JGroupsRaftClusterServiceAutoConfiguration.java
deleted file mode 100644
index 2abefa1332e..00000000000
--- a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/JGroupsRaftClusterServiceAutoConfiguration.java
+++ /dev/null
@@ -1,55 +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.component.jgroups.raft.springboot.cluster;
-
-import org.apache.camel.cluster.CamelClusterService;
-import org.apache.camel.component.jgroups.raft.cluster.JGroupsRaftClusterService;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-import java.util.Optional;
-
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
-@ConditionalOnProperty(prefix = "camel.cluster.jgroups-raft", name = "enabled", matchIfMissing = true)
-@EnableConfigurationProperties(JGroupsRaftClusterServiceConfiguration.class)
-public class JGroupsRaftClusterServiceAutoConfiguration {
-
- @Autowired
- private JGroupsRaftClusterServiceConfiguration configuration;
-
- @Bean(name = "jgroups-raft-cluster-service")
- @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
- public CamelClusterService jgroupsRaftClusterService() throws Exception {
- JGroupsRaftClusterService service = new JGroupsRaftClusterService();
-
- Optional.ofNullable(configuration.getId()).ifPresent(service::setId);
- Optional.ofNullable(configuration.getRaftId()).ifPresent(service::setRaftId);
- Optional.ofNullable(configuration.getJgroupsRaftClusterName()).ifPresent(service::setJgroupsClusterName);
- Optional.ofNullable(configuration.getJgroupsRaftConfig()).ifPresent(service::setJgroupsConfig);
-
- return service;
- }
-}
diff --git a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/JGroupsRaftClusterServiceConfiguration.java b/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/JGroupsRaftClusterServiceConfiguration.java
deleted file mode 100644
index ec2c548e8ba..00000000000
--- a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/raft/springboot/cluster/JGroupsRaftClusterServiceConfiguration.java
+++ /dev/null
@@ -1,88 +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.component.jgroups.raft.springboot.cluster;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "camel.cluster.jgroups-raft")
-public class JGroupsRaftClusterServiceConfiguration {
-
- /**
- * Sets if the jgroups raft cluster service should be enabled or not, default is true.
- */
- private boolean enabled = true;
-
- /**
- * Cluster Service ID
- */
- private String id;
-
- /**
- * JGroups-raft ID
- */
- private String raftId;
-
- /**
- * JGrups-raft configuration File name
- */
- private String jgroupsRaftConfig;
-
- /**
- * JGroups Cluster name
- */
- private String jgroupsRaftClusterName;
-
- public String getRaftId() {
- return raftId;
- }
-
- public void setRaftId(String raftId) {
- this.raftId = raftId;
- }
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getJgroupsRaftConfig() {
- return jgroupsRaftConfig;
- }
-
- public void setJgroupsRaftConfig(String jgroupsRaftConfig) {
- this.jgroupsRaftConfig = jgroupsRaftConfig;
- }
-
- public String getJgroupsRaftClusterName() {
- return jgroupsRaftClusterName;
- }
-
- public void setJgroupsRaftClusterName(String jgroupsRaftClusterName) {
- this.jgroupsRaftClusterName = jgroupsRaftClusterName;
- }
-}
diff --git a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b1270ff0..00000000000
--- a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
diff --git a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf2e6b..00000000000
--- a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index e9a542bcd3c..00000000000
--- a/components-starter/camel-jgroups-raft-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,18 +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.
-## ---------------------------------------------------------------------------
-
-org.apache.camel.component.jgroups.raft.springboot.cluster.JGroupsRaftClusterServiceAutoConfiguration
\ No newline at end of file
diff --git a/components-starter/camel-jgroups-raft-cluster-service-starter/src/test/java/org/apache/camel/component/jgroups/raft/springboot/cluster/JGroupsRaftClusterServiceAutoConfigurationTest.java b/components-starter/camel-jgroups-raft-cluster-service-starter/src/test/java/org/apache/camel/component/jgroups/raft/springboot/cluster/JGroupsRaftClusterServiceAutoConfigurationTest.java
deleted file mode 100644
index b2cc86f9b51..00000000000
--- a/components-starter/camel-jgroups-raft-cluster-service-starter/src/test/java/org/apache/camel/component/jgroups/raft/springboot/cluster/JGroupsRaftClusterServiceAutoConfigurationTest.java
+++ /dev/null
@@ -1,69 +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.component.jgroups.raft.springboot.cluster;
-
-import org.apache.camel.component.jgroups.raft.cluster.JGroupsRaftClusterService;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-public class JGroupsRaftClusterServiceAutoConfigurationTest {
-
- @Test
- public void testDisable() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(JGroupsRaftClusterServiceAutoConfiguration.class))
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cluster.jgroups-raft.enabled=false")
- .run(
- context -> {
- assertThat(context).doesNotHaveBean(JGroupsRaftClusterService.class);
- });
- }
-
- /**
- * Testing that the service can be enabled and configured completely.
- */
- @Test
- public void testPropertiesMapped() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(JGroupsRaftClusterServiceAutoConfiguration.class))
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cluster.jgroups-raft.id=myid1")
- .run(
- context -> {
- final JGroupsRaftClusterService clusterService = context.getBean(JGroupsRaftClusterService.class);
-
- assertEquals("myid1", clusterService.getId());
- });
- }
-
- @EnableAutoConfiguration
- @Configuration
- public static class TestConfiguration {
- }
-}
diff --git a/components-starter/camel-jgroups-raft-cluster-service-starter/src/test/resources/logback.xml b/components-starter/camel-jgroups-raft-cluster-service-starter/src/test/resources/logback.xml
deleted file mode 100644
index 16a9e00dce0..00000000000
--- a/components-starter/camel-jgroups-raft-cluster-service-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- <file>target/camel-jgroups-raft-cluster-service-starter-test.log</file>
- </appender>
-
- <root level="INFO">
- <!--<appender-ref ref="STDOUT"/>-->
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/components-starter/camel-kubernetes-cluster-service-starter/pom.xml b/components-starter/camel-kubernetes-cluster-service-starter/pom.xml
deleted file mode 100644
index 0cf5c9632ea..00000000000
--- a/components-starter/camel-kubernetes-cluster-service-starter/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>components-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-kubernetes-cluster-service-starter</artifactId>
- <packaging>jar</packaging>
- <name>Camel SB Starters :: Kubernetes Cluster Service</name>
- <description>Spring-Boot Starter for Camel Cluster Service based on Kubernetes</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-kubernetes-starter</artifactId>
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git a/components-starter/camel-kubernetes-cluster-service-starter/src/main/docs/kubernetes-cluster-service.json b/components-starter/camel-kubernetes-cluster-service-starter/src/main/docs/kubernetes-cluster-service.json
deleted file mode 100644
index 88958ee4f27..00000000000
--- a/components-starter/camel-kubernetes-cluster-service-starter/src/main/docs/kubernetes-cluster-service.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
- "groups": [
- {
- "name": "camel.cluster.kubernetes",
- "type": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- }
- ],
- "properties": [
- {
- "name": "camel.cluster.kubernetes.attributes",
- "type": "java.util.Map<java.lang.String,java.lang.Object>",
- "description": "Custom service attributes.",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.kubernetes.cluster-labels",
- "type": "java.util.Map<java.lang.String,java.lang.String>",
- "description": "Set the labels used to identify the pods composing the cluster.",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.kubernetes.config-map-name",
- "type": "java.lang.String",
- "description": "Set the name of the ConfigMap used to do optimistic locking (defaults to 'leaders').",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.kubernetes.connection-timeout-millis",
- "type": "java.lang.Integer",
- "description": "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.kubernetes.enabled",
- "type": "java.lang.Boolean",
- "description": "Sets if the Kubernetes cluster service should be enabled or not, default is true.",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.cluster.kubernetes.id",
- "type": "java.lang.String",
- "description": "Cluster Service ID",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.kubernetes.jitter-factor",
- "type": "java.lang.Double",
- "description": "A jitter factor to apply in order to prevent all pods to call Kubernetes APIs in the same instant.",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.kubernetes.kubernetes-namespace",
- "type": "java.lang.String",
- "description": "Set the name of the Kubernetes namespace containing the pods and the configmap (autodetected by default)",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.kubernetes.lease-duration-millis",
- "type": "java.lang.Long",
- "description": "The default duration of the lease for the current leader.",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.kubernetes.master-url",
- "type": "java.lang.String",
- "description": "Set the URL of the Kubernetes master (read from Kubernetes client properties by default).",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.kubernetes.order",
- "type": "java.lang.Integer",
- "description": "Service lookup order\/priority.",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.kubernetes.pod-name",
- "type": "java.lang.String",
- "description": "Set the name of the current pod (autodetected from container host name by default).",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.kubernetes.renew-deadline-millis",
- "type": "java.lang.Long",
- "description": "The deadline after which the leader must stop its services because it may have lost the leadership.",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.kubernetes.retry-period-millis",
- "type": "java.lang.Long",
- "description": "The time between two subsequent attempts to check and acquire the leadership. It is randomized using the jitter factor.",
- "sourceType": "org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceConfiguration"
- }
- ],
- "hints": [],
- "ignored": {
- "properties": []
- }
-}
\ No newline at end of file
diff --git a/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java b/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java
deleted file mode 100644
index 131b58120fb..00000000000
--- a/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceAutoConfiguration.java
+++ /dev/null
@@ -1,64 +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.component.kubernetes.springboot.cluster;
-
-import java.util.Optional;
-
-import org.apache.camel.cluster.CamelClusterService;
-import org.apache.camel.component.kubernetes.cluster.KubernetesClusterService;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-@Configuration(proxyBeanMethods = false)
-@AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
-@ConditionalOnProperty(prefix = "camel.cluster.kubernetes", name = "enabled", matchIfMissing = true)
-@EnableConfigurationProperties(KubernetesClusterServiceConfiguration.class)
-public class KubernetesClusterServiceAutoConfiguration {
-
- @Autowired
- private KubernetesClusterServiceConfiguration configuration;
-
- @Bean(name = "kubernetes-cluster-service")
- @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
- public CamelClusterService kubernetesClusterService() throws Exception {
- KubernetesClusterService service = new KubernetesClusterService();
-
- Optional.ofNullable(configuration.getId()).ifPresent(service::setId);
- Optional.ofNullable(configuration.getRetryPeriodMillis()).ifPresent(service::setRetryPeriodMillis);
- Optional.ofNullable(configuration.getOrder()).ifPresent(service::setOrder);
- Optional.ofNullable(configuration.getAttributes()).ifPresent(service::setAttributes);
- Optional.ofNullable(configuration.getClusterLabels()).ifPresent(service::setClusterLabels);
- Optional.ofNullable(configuration.getKubernetesNamespace()).ifPresent(service::setNamespace);
- Optional.ofNullable(configuration.getConfigMapName()).ifPresent(service::setKubernetesResourceName);
- Optional.ofNullable(configuration.getConnectionTimeoutMillis()).ifPresent(service::setConnectionTimeout);
- Optional.ofNullable(configuration.getJitterFactor()).ifPresent(service::setJitterFactor);
- Optional.ofNullable(configuration.getLeaseDurationMillis()).ifPresent(service::setLeaseDurationMillis);
- Optional.ofNullable(configuration.getMasterUrl()).ifPresent(service::setMasterUrl);
- Optional.ofNullable(configuration.getRenewDeadlineMillis()).ifPresent(service::setRenewDeadlineMillis);
- Optional.ofNullable(configuration.getPodName()).ifPresent(service::setPodName);
-
- return service;
- }
-}
diff --git a/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceConfiguration.java b/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceConfiguration.java
deleted file mode 100644
index b7a1e6a7b72..00000000000
--- a/components-starter/camel-kubernetes-cluster-service-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cluster/KubernetesClusterServiceConfiguration.java
+++ /dev/null
@@ -1,208 +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.component.kubernetes.springboot.cluster;
-
-import java.util.Map;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "camel.cluster.kubernetes")
-public class KubernetesClusterServiceConfiguration {
-
- /**
- * Sets if the Kubernetes cluster service should be enabled or not, default is true.
- */
- private boolean enabled = true;
-
- /**
- * Cluster Service ID
- */
- private String id;
-
- /**
- * Set the URL of the Kubernetes master (read from Kubernetes client properties by default).
- */
- private String masterUrl;
-
- /**
- * Connection timeout in milliseconds to use when making requests to the Kubernetes API server.
- */
- private Integer connectionTimeoutMillis;
-
- /**
- * Set the name of the Kubernetes namespace containing the pods and the configmap (autodetected by default)
- */
- private String kubernetesNamespace;
-
- /**
- * Set the name of the ConfigMap used to do optimistic locking (defaults to 'leaders').
- */
- private String configMapName;
-
- /**
- * Set the name of the current pod (autodetected from container host name by default).
- */
- private String podName;
-
- /**
- * Set the labels used to identify the pods composing the cluster.
- */
- private Map<String, String> clusterLabels;
-
- /**
- * A jitter factor to apply in order to prevent all pods to call Kubernetes APIs in the same instant.
- */
- private Double jitterFactor;
-
- /**
- * The default duration of the lease for the current leader.
- */
- private Long leaseDurationMillis;
-
- /**
- * The deadline after which the leader must stop its services because it may have lost the leadership.
- */
- private Long renewDeadlineMillis;
-
- /**
- * The time between two subsequent attempts to check and acquire the leadership. It is randomized using the jitter
- * factor.
- */
- private Long retryPeriodMillis;
-
- /**
- * Custom service attributes.
- */
- private Map<String, Object> attributes;
-
- /**
- * Service lookup order/priority.
- */
- private Integer order;
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getMasterUrl() {
- return masterUrl;
- }
-
- public void setMasterUrl(String masterUrl) {
- this.masterUrl = masterUrl;
- }
-
- public Integer getConnectionTimeoutMillis() {
- return connectionTimeoutMillis;
- }
-
- public void setConnectionTimeoutMillis(Integer connectionTimeoutMillis) {
- this.connectionTimeoutMillis = connectionTimeoutMillis;
- }
-
- public String getKubernetesNamespace() {
- return kubernetesNamespace;
- }
-
- public void setKubernetesNamespace(String kubernetesNamespace) {
- this.kubernetesNamespace = kubernetesNamespace;
- }
-
- public String getConfigMapName() {
- return configMapName;
- }
-
- public void setConfigMapName(String configMapName) {
- this.configMapName = configMapName;
- }
-
- public String getPodName() {
- return podName;
- }
-
- public void setPodName(String podName) {
- this.podName = podName;
- }
-
- public Map<String, String> getClusterLabels() {
- return clusterLabels;
- }
-
- public void setClusterLabels(Map<String, String> clusterLabels) {
- this.clusterLabels = clusterLabels;
- }
-
- public Double getJitterFactor() {
- return jitterFactor;
- }
-
- public void setJitterFactor(Double jitterFactor) {
- this.jitterFactor = jitterFactor;
- }
-
- public Long getLeaseDurationMillis() {
- return leaseDurationMillis;
- }
-
- public void setLeaseDurationMillis(Long leaseDurationMillis) {
- this.leaseDurationMillis = leaseDurationMillis;
- }
-
- public Long getRenewDeadlineMillis() {
- return renewDeadlineMillis;
- }
-
- public void setRenewDeadlineMillis(Long renewDeadlineMillis) {
- this.renewDeadlineMillis = renewDeadlineMillis;
- }
-
- public Long getRetryPeriodMillis() {
- return retryPeriodMillis;
- }
-
- public void setRetryPeriodMillis(Long retryPeriodMillis) {
- this.retryPeriodMillis = retryPeriodMillis;
- }
-
- public Map<String, Object> getAttributes() {
- return attributes;
- }
-
- public void setAttributes(Map<String, Object> attributes) {
- this.attributes = attributes;
- }
-
- public Integer getOrder() {
- return order;
- }
-
- public void setOrder(Integer order) {
- this.order = order;
- }
-}
diff --git a/components-starter/camel-kubernetes-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-kubernetes-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b1270ff0..00000000000
--- a/components-starter/camel-kubernetes-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
diff --git a/components-starter/camel-kubernetes-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-kubernetes-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf2e6b..00000000000
--- a/components-starter/camel-kubernetes-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git a/components-starter/camel-kubernetes-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-kubernetes-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 8377414c0f7..00000000000
--- a/components-starter/camel-kubernetes-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,18 +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.
-## ---------------------------------------------------------------------------
-
-org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceAutoConfiguration
diff --git a/components-starter/camel-kubernetes-cluster-service-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java b/components-starter/camel-kubernetes-cluster-service-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java
deleted file mode 100644
index 6d5c4d2d4b0..00000000000
--- a/components-starter/camel-kubernetes-cluster-service-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cluster/KubernetesClusterServiceAutoConfigurationTest.java
+++ /dev/null
@@ -1,95 +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.component.kubernetes.springboot.test.cluster;
-
-import org.apache.camel.component.kubernetes.cluster.KubernetesClusterService;
-import org.apache.camel.component.kubernetes.springboot.cluster.KubernetesClusterServiceAutoConfiguration;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-public class KubernetesClusterServiceAutoConfigurationTest {
-
- @Test
- public void testDisable() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(KubernetesClusterServiceAutoConfiguration.class))
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cluster.kubernetes.enabled=false")
- .run(
- context -> {
- assertThat(context).doesNotHaveBean(KubernetesClusterService.class);
- });
- }
-
- /**
- * Testing that the service can be enabled and configured completely.
- */
- @Test
- public void testPropertiesMapped() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(KubernetesClusterServiceAutoConfiguration.class))
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cluster.kubernetes.id=myid1",
- "camel.cluster.kubernetes.master-url=http://myurl:9000",
- "camel.cluster.kubernetes.connection-timeout-millis=1234",
- "camel.cluster.kubernetes.kubernetes-namespace=ns1",
- "camel.cluster.kubernetes.config-map-name=cm",
- "camel.cluster.kubernetes.pod-name=mypod1",
- "camel.cluster.kubernetes.cluster-labels.app=myapp",
- "camel.cluster.kubernetes.cluster-labels.provider=myprovider",
- "camel.cluster.kubernetes.lease-duration-millis=10000",
- "camel.cluster.kubernetes.renew-deadline-millis=8000",
- "camel.cluster.kubernetes.retry-period-millis=4000")
- .run(
- context -> {
- final KubernetesClusterService clusterService = context.getBean(KubernetesClusterService.class);
-
- assertEquals("myid1", clusterService.getId());
- assertEquals("http://myurl:9000", clusterService.getMasterUrl());
- assertEquals(Integer.valueOf(1234), clusterService.getConnectionTimeout());
- assertEquals("ns1", clusterService.getNamespace());
- assertEquals("cm", clusterService.getKubernetesResourceName());
- assertEquals("mypod1", clusterService.getPodName());
-
- assertNotNull(clusterService.getClusterLabels());
- assertEquals(2, clusterService.getClusterLabels().size());
- assertEquals("myapp", clusterService.getClusterLabels().get("app"));
- assertEquals("myprovider", clusterService.getClusterLabels().get("provider"));
-
- assertEquals(1.2, clusterService.getJitterFactor(), 1e-10);
- assertEquals(10000, clusterService.getLeaseDurationMillis());
- assertEquals(8000, clusterService.getRenewDeadlineMillis());
- assertEquals(4000, clusterService.getRetryPeriodMillis());
- });
- }
-
- @EnableAutoConfiguration
- @Configuration
- public static class TestConfiguration {
- }
-}
diff --git a/components-starter/camel-kubernetes-cluster-service-starter/src/test/resources/logback.xml b/components-starter/camel-kubernetes-cluster-service-starter/src/test/resources/logback.xml
deleted file mode 100644
index 8ab89a882de..00000000000
--- a/components-starter/camel-kubernetes-cluster-service-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- <file>target/camel-kubernetes-cluster-service-starter-test.log</file>
- </appender>
-
- <root level="INFO">
- <!--<appender-ref ref="STDOUT"/>-->
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/components-starter/camel-kubernetes-starter/pom.xml b/components-starter/camel-kubernetes-starter/pom.xml
index 5104afe39c2..3ec29195c3e 100644
--- a/components-starter/camel-kubernetes-starter/pom.xml
+++ b/components-starter/camel-kubernetes-starter/pom.xml
@@ -26,8 +26,7 @@
</parent>
<artifactId>camel-kubernetes-starter</artifactId>
<packaging>jar</packaging>
- <name>Camel SB Starters :: Kubernetes</name>
- <description>Spring-Boot Starter for Camel Components</description>
+ <name>Camel SB Starters :: kubernetes</name>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -39,11 +38,6 @@
<artifactId>camel-kubernetes</artifactId>
<version>${camel-version}</version>
</dependency>
- <dependency>
- <groupId>org.hibernate.validator</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>${hibernate-validator-version}</version>
- </dependency>
<!--START OF GENERATED CODE-->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cloud/KubernetesServiceDiscoveryAutoConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cloud/KubernetesServiceDiscoveryAutoConfiguration.java
deleted file mode 100644
index d482b421467..00000000000
--- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/springboot/cloud/KubernetesServiceDiscoveryAutoConfiguration.java
+++ /dev/null
@@ -1,104 +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.component.kubernetes.springboot.cloud;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import jakarta.annotation.PostConstruct;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.cloud.ServiceDiscovery;
-import org.apache.camel.component.kubernetes.cloud.KubernetesServiceDiscoveryFactory;
-import org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationCommon;
-import org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties;
-import org.apache.camel.spi.BeanIntrospection;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.apache.camel.support.PluginHelper;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnBean({ CamelAutoConfiguration.class, CamelContext.class })
-@Conditional(KubernetesServiceDiscoveryAutoConfiguration.Condition.class)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties(KubernetesServiceCallServiceDiscoveryConfigurationProperties.class)
-public class KubernetesServiceDiscoveryAutoConfiguration {
- @Autowired
- private CamelContext camelContext;
- @Autowired
- private KubernetesServiceCallServiceDiscoveryConfigurationProperties configuration;
- @Autowired
- private ConfigurableBeanFactory beanFactory;
-
- @Lazy
- @Bean(name = "kubernetes-service-discovery")
- public ServiceDiscovery configureServiceDiscoveryFactory() throws Exception {
- KubernetesServiceDiscoveryFactory factory = new KubernetesServiceDiscoveryFactory();
-
- CamelPropertiesHelper.setCamelProperties(camelContext, factory,
- CamelPropertiesHelper.getNonNullProperties(camelContext, configuration), false);
-
- return factory.newInstance(camelContext);
- }
-
- @PostConstruct
- public void postConstruct() {
- if (beanFactory != null) {
- Map<String, Object> parameters = new HashMap<>();
-
- for (Map.Entry<String, KubernetesServiceCallServiceDiscoveryConfigurationCommon> entry : configuration
- .getConfigurations().entrySet()) {
- // clean up params
- parameters.clear();
-
- // The instance factory
- KubernetesServiceDiscoveryFactory factory = new KubernetesServiceDiscoveryFactory();
-
- BeanIntrospection bi = PluginHelper.getBeanIntrospection(camelContext);
- try {
- bi.getProperties(entry.getValue(), parameters, null, false);
- CamelPropertiesHelper.setCamelProperties(camelContext, factory, parameters, true);
-
- beanFactory.registerSingleton(entry.getKey(), factory.newInstance(camelContext));
- } catch (Exception e) {
- throw new BeanCreationException(entry.getKey(), e.getMessage(), e);
- }
- }
- }
- }
-
- // *******************************
- // Condition
- // *******************************
-
- public static class Condition extends GroupCondition {
- public Condition() {
- super("camel.cloud.kubernetes", "camel.cloud.kubernetes.service-discovery");
- }
- }
-}
diff --git a/components-starter/camel-kubernetes-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-kubernetes-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index ec2d95f7aab..7cdf40e3801 100644
--- a/components-starter/camel-kubernetes-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/components-starter/camel-kubernetes-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -14,7 +14,6 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-
org.apache.camel.component.kubernetes.services.springboot.KubernetesServicesComponentConverter
org.apache.camel.component.kubernetes.services.springboot.KubernetesServicesComponentAutoConfiguration
org.apache.camel.component.kubernetes.namespaces.springboot.KubernetesNamespacesComponentConverter
@@ -29,6 +28,8 @@ org.apache.camel.component.kubernetes.deployments.springboot.KubernetesDeploymen
org.apache.camel.component.kubernetes.deployments.springboot.KubernetesDeploymentsComponentAutoConfiguration
org.apache.camel.component.kubernetes.replication_controllers.springboot.KubernetesReplicationControllersComponentConverter
org.apache.camel.component.kubernetes.replication_controllers.springboot.KubernetesReplicationControllersComponentAutoConfiguration
+org.apache.camel.component.kubernetes.cronjob.springboot.KubernetesCronJobComponentConverter
+org.apache.camel.component.kubernetes.cronjob.springboot.KubernetesCronJobComponentAutoConfiguration
org.apache.camel.component.kubernetes.persistent_volumes.springboot.KubernetesPersistentVolumesComponentConverter
org.apache.camel.component.kubernetes.persistent_volumes.springboot.KubernetesPersistentVolumesComponentAutoConfiguration
org.apache.camel.component.kubernetes.events.springboot.KubernetesEventsComponentConverter
@@ -53,7 +54,3 @@ org.apache.camel.component.openshift.build_configs.springboot.OpenshiftBuildConf
org.apache.camel.component.openshift.build_configs.springboot.OpenshiftBuildConfigsComponentAutoConfiguration
org.apache.camel.component.kubernetes.service_accounts.springboot.KubernetesServiceAccountsComponentConverter
org.apache.camel.component.kubernetes.service_accounts.springboot.KubernetesServiceAccountsComponentAutoConfiguration
-org.apache.camel.component.kubernetes.springboot.cloud.KubernetesServiceDiscoveryAutoConfiguration
-org.apache.camel.component.kubernetes.deployments.springboot.KubernetesDeploymentsComponentAutoConfiguration
-org.apache.camel.component.kubernetes.cronjob.springboot.KubernetesCronJobComponentConverter
-org.apache.camel.component.kubernetes.cronjob.springboot.KubernetesCronJobComponentAutoConfiguration
diff --git a/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cloud/KubernetesServiceDiscoveryAutoConfigurationTest.java b/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cloud/KubernetesServiceDiscoveryAutoConfigurationTest.java
deleted file mode 100644
index 13d3ec2357e..00000000000
--- a/components-starter/camel-kubernetes-starter/src/test/java/org/apache/camel/component/kubernetes/springboot/test/cloud/KubernetesServiceDiscoveryAutoConfigurationTest.java
+++ /dev/null
@@ -1,129 +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.component.kubernetes.springboot.test.cloud;
-
-import org.apache.camel.cloud.ServiceDiscovery;
-import org.apache.camel.component.kubernetes.cloud.KubernetesClientServiceDiscovery;
-import org.apache.camel.component.kubernetes.cloud.KubernetesDnsServiceDiscovery;
-import org.apache.camel.component.kubernetes.cloud.KubernetesDnsSrvServiceDiscovery;
-import org.apache.camel.component.kubernetes.cloud.KubernetesEnvServiceDiscovery;
-import org.apache.camel.model.cloud.springboot.KubernetesServiceCallServiceDiscoveryConfigurationProperties;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class KubernetesServiceDiscoveryAutoConfigurationTest {
-
- @Test
- public void testServiceDiscoveryDisabled() {
- new ApplicationContextRunner().withUserConfiguration(TestConfiguration.class)
- .withPropertyValues("spring.main.banner-mode=off",
- "camel.cloud.kubernetes.service-discovery.enabled=false")
- .run(context -> {
- assertThat(context)
- .doesNotHaveBean(KubernetesServiceCallServiceDiscoveryConfigurationProperties.class);
- assertThat(context).getBeans(ServiceDiscovery.class)
- .doesNotContainKeys("kubernetes-service-discovery");
- });
- }
-
- @Test
- public void testServiceDiscoveryEnabled() {
- new ApplicationContextRunner().withUserConfiguration(TestConfiguration.class).withPropertyValues(
- "spring.main.banner-mode=off", "camel.cloud.kubernetes.service-discovery.enabled=true").run(context -> {
- assertThat(context)
- .hasSingleBean(KubernetesServiceCallServiceDiscoveryConfigurationProperties.class);
- assertThat(context).getBeans(ServiceDiscovery.class).containsKeys("kubernetes-service-discovery");
- assertThat(context).getBean("kubernetes-service-discovery")
- .isInstanceOf(KubernetesEnvServiceDiscovery.class);
- });
- }
-
- @Test
- public void testServiceDiscoveryWithEnv() {
- new ApplicationContextRunner().withUserConfiguration(TestConfiguration.class)
- .withPropertyValues("spring.main.banner-mode=off",
- "camel.cloud.kubernetes.service-discovery.enabled=true",
- "camel.cloud.kubernetes.service-discovery.lookup=env")
- .run(context -> {
- assertThat(context)
- .hasSingleBean(KubernetesServiceCallServiceDiscoveryConfigurationProperties.class);
- assertThat(context).getBeans(ServiceDiscovery.class).containsKeys("kubernetes-service-discovery");
- assertThat(context).getBean("kubernetes-service-discovery")
- .isInstanceOf(KubernetesEnvServiceDiscovery.class);
- });
- }
-
- @Test
- public void testServiceDiscoveryWithDns() {
- new ApplicationContextRunner().withUserConfiguration(TestConfiguration.class)
- .withPropertyValues("spring.main.banner-mode=off",
- "camel.cloud.kubernetes.service-discovery.enabled=true",
- "camel.cloud.kubernetes.service-discovery.lookup=dns",
- "camel.cloud.kubernetes.service-discovery.dns-domain=mydomain",
- "camel.cloud.kubernetes.service-discovery.namespace=mynamespace")
- .run(context -> {
- assertThat(context)
- .hasSingleBean(KubernetesServiceCallServiceDiscoveryConfigurationProperties.class);
- assertThat(context).getBeans(ServiceDiscovery.class).containsKeys("kubernetes-service-discovery");
- assertThat(context).getBean("kubernetes-service-discovery")
- .isInstanceOf(KubernetesDnsServiceDiscovery.class);
- });
- }
-
- @Test
- public void testServiceDiscoveryWithDnsSrv() {
- new ApplicationContextRunner().withUserConfiguration(TestConfiguration.class)
- .withPropertyValues("spring.main.banner-mode=off",
- "camel.cloud.kubernetes.service-discovery.enabled=true",
- "camel.cloud.kubernetes.service-discovery.lookup=dnssrv",
- "camel.cloud.kubernetes.service-discovery.port-name=myportname",
- "camel.cloud.kubernetes.service-discovery.port-proocole=myportproto",
- "camel.cloud.kubernetes.service-discovery.dns-domain=mydomain",
- "camel.cloud.kubernetes.service-discovery.namespace=mynamespace")
- .run(context -> {
- assertThat(context)
- .hasSingleBean(KubernetesServiceCallServiceDiscoveryConfigurationProperties.class);
- assertThat(context).getBeans(ServiceDiscovery.class).containsKeys("kubernetes-service-discovery");
- assertThat(context).getBean("kubernetes-service-discovery")
- .isInstanceOf(KubernetesDnsSrvServiceDiscovery.class);
- });
- }
-
- @Test
- public void testServiceDiscoveryWithClient() {
- new ApplicationContextRunner().withUserConfiguration(TestConfiguration.class)
- .withPropertyValues("spring.main.banner-mode=off",
- "camel.cloud.kubernetes.service-discovery.enabled=true",
- "camel.cloud.kubernetes.service-discovery.lookup=client")
- .run(context -> {
- assertThat(context)
- .hasSingleBean(KubernetesServiceCallServiceDiscoveryConfigurationProperties.class);
- assertThat(context).getBeans(ServiceDiscovery.class).containsKeys("kubernetes-service-discovery");
- assertThat(context).getBean("kubernetes-service-discovery")
- .isInstanceOf(KubernetesClientServiceDiscovery.class);
- });
- }
-
- @EnableAutoConfiguration
- @Configuration
- public static class TestConfiguration {
- }
-}
diff --git a/components-starter/camel-kubernetes-starter/src/test/resources/logback.xml b/components-starter/camel-kubernetes-starter/src/test/resources/logback.xml
deleted file mode 100644
index 29ad9de925b..00000000000
--- a/components-starter/camel-kubernetes-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- <file>target/camel-kubernetes-starter-test.log</file>
- </appender>
-
- <root level="INFO">
- <!--<appender-ref ref="STDOUT"/>-->
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/components-starter/camel-service-starter/pom.xml b/components-starter/camel-service-starter/pom.xml
deleted file mode 100644
index 231f7efba1d..00000000000
--- a/components-starter/camel-service-starter/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>components-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-service-starter</artifactId>
- <packaging>jar</packaging>
- <name>Camel SB Starters :: Service</name>
- <description>Spring-Boot Starter for Camel service Support</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-service</artifactId>
- <version>${camel-version}</version>
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git a/components-starter/camel-service-starter/src/main/docs/service.json b/components-starter/camel-service-starter/src/main/docs/service.json
deleted file mode 100644
index 231b81e487f..00000000000
--- a/components-starter/camel-service-starter/src/main/docs/service.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
- "groups": [
- {
- "name": "camel.component.service",
- "type": "org.apache.camel.component.service.springboot.ServiceComponentConfiguration",
- "sourceType": "org.apache.camel.component.service.springboot.ServiceComponentConfiguration"
- },
- {
- "name": "camel.component.service.customizer",
- "type": "org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties",
- "sourceType": "org.apache.camel.component.service.springboot.ServiceComponentConfiguration",
- "sourceMethod": "getCustomizer()"
- }
- ],
- "properties": [
- {
- "name": "camel.component.service.autowired-enabled",
- "type": "java.lang.Boolean",
- "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.",
- "sourceType": "org.apache.camel.component.service.springboot.ServiceComponentConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.component.service.bridge-error-handler",
- "type": "java.lang.Boolean",
- "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. Important: This is only possible if the 3rd party component allows Camel to be alerted if an exception was thrown. Some components handle this internally only, and therefore bridgeErrorHandler is n [...]
- "sourceType": "org.apache.camel.component.service.springboot.ServiceComponentConfiguration",
- "defaultValue": false
- },
- {
- "name": "camel.component.service.customizer.enabled",
- "type": "java.lang.Boolean",
- "sourceType": "org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties"
- },
- {
- "name": "camel.component.service.enabled",
- "type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the service component. This is enabled by default.",
- "sourceType": "org.apache.camel.component.service.springboot.ServiceComponentConfiguration"
- },
- {
- "name": "camel.component.service.service",
- "type": "org.apache.camel.cloud.ServiceRegistry",
- "description": "Inject the service to use. The option is a org.apache.camel.cloud.ServiceRegistry type.",
- "sourceType": "org.apache.camel.component.service.springboot.ServiceComponentConfiguration"
- },
- {
- "name": "camel.component.service.service-selector",
- "type": "org.apache.camel.cloud.ServiceRegistry$Selector",
- "description": "Inject the service selector used to lookup the ServiceRegistry to use. The option is a org.apache.camel.cloud.ServiceRegistry.Selector type.",
- "sourceType": "org.apache.camel.component.service.springboot.ServiceComponentConfiguration"
- }
- ],
- "hints": [],
- "ignored": {
- "properties": []
- }
-}
\ No newline at end of file
diff --git a/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentAutoConfiguration.java b/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentAutoConfiguration.java
deleted file mode 100644
index 55dada2aa8d..00000000000
--- a/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentAutoConfiguration.java
+++ /dev/null
@@ -1,77 +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.component.service.springboot;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Component;
-import org.apache.camel.component.service.ServiceComponent;
-import org.apache.camel.spi.ComponentCustomizer;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ComponentConfigurationProperties;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
-import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Configuration(proxyBeanMethods = false)
-@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
-@EnableConfigurationProperties({ComponentConfigurationProperties.class,ServiceComponentConfiguration.class})
-@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.service"})
-@AutoConfigureAfter({CamelAutoConfiguration.class, ServiceComponentConverter.class})
-public class ServiceComponentAutoConfiguration {
-
- @Autowired
- private ApplicationContext applicationContext;
- private final CamelContext camelContext;
- @Autowired
- private ServiceComponentConfiguration configuration;
-
- public ServiceComponentAutoConfiguration(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
-
- @Lazy
- @Bean
- public ComponentCustomizer configureServiceComponent() {
- return new ComponentCustomizer() {
- @Override
- public void configure(String name, Component target) {
- CamelPropertiesHelper.copyProperties(camelContext, configuration, target);
- }
- @Override
- public boolean isEnabled(String name, Component target) {
- return HierarchicalPropertiesEvaluator.evaluate(
- applicationContext,
- "camel.component.customizer",
- "camel.component.service.customizer")
- && target instanceof ServiceComponent;
- }
- };
- }
-}
\ No newline at end of file
diff --git a/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConfiguration.java b/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConfiguration.java
deleted file mode 100644
index a02dd250e45..00000000000
--- a/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConfiguration.java
+++ /dev/null
@@ -1,105 +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.component.service.springboot;
-
-import org.apache.camel.cloud.ServiceRegistry;
-import org.apache.camel.cloud.ServiceRegistry.Selector;
-import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Register a Camel endpoint to a Service Registry (such as Consul, Etcd) and
- * delegate to it.
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@ConfigurationProperties(prefix = "camel.component.service")
-public class ServiceComponentConfiguration
- extends
- ComponentConfigurationPropertiesCommon {
-
- /**
- * Whether to enable auto configuration of the service component. This is
- * enabled by default.
- */
- private Boolean enabled;
- /**
- * Allows for bridging the consumer to the Camel routing Error Handler,
- * which mean any exceptions (if possible) occurred while the Camel consumer
- * is trying to pickup incoming messages, or the likes, will now be
- * processed as a message and handled by the routing Error Handler.
- * Important: This is only possible if the 3rd party component allows Camel
- * to be alerted if an exception was thrown. Some components handle this
- * internally only, and therefore bridgeErrorHandler is not possible. In
- * other situations we may improve the Camel component to hook into the 3rd
- * party component and make this possible for future releases. By default
- * the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
- * with exceptions, that will be logged at WARN or ERROR level and ignored.
- */
- private Boolean bridgeErrorHandler = false;
- /**
- * Whether autowiring is enabled. This is used for automatic autowiring
- * options (the option must be marked as autowired) by looking up in the
- * registry to find if there is a single instance of matching type, which
- * then gets configured on the component. This can be used for automatic
- * configuring JDBC data sources, JMS connection factories, AWS Clients,
- * etc.
- */
- private Boolean autowiredEnabled = true;
- /**
- * Inject the service to use. The option is a
- * org.apache.camel.cloud.ServiceRegistry type.
- */
- private ServiceRegistry service;
- /**
- * Inject the service selector used to lookup the ServiceRegistry to use.
- * The option is a org.apache.camel.cloud.ServiceRegistry.Selector type.
- */
- private Selector serviceSelector;
-
- public Boolean getBridgeErrorHandler() {
- return bridgeErrorHandler;
- }
-
- public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
- this.bridgeErrorHandler = bridgeErrorHandler;
- }
-
- public Boolean getAutowiredEnabled() {
- return autowiredEnabled;
- }
-
- public void setAutowiredEnabled(Boolean autowiredEnabled) {
- this.autowiredEnabled = autowiredEnabled;
- }
-
- public ServiceRegistry getService() {
- return service;
- }
-
- public void setService(ServiceRegistry service) {
- this.service = service;
- }
-
- public Selector getServiceSelector() {
- return serviceSelector;
- }
-
- public void setServiceSelector(Selector serviceSelector) {
- this.serviceSelector = serviceSelector;
- }
-}
\ No newline at end of file
diff --git a/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConverter.java b/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConverter.java
deleted file mode 100644
index db2c01c2668..00000000000
--- a/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConverter.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.component.service.springboot;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.convert.TypeDescriptor;
-import org.springframework.core.convert.converter.GenericConverter;
-import org.springframework.stereotype.Component;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Configuration(proxyBeanMethods = false)
-@ConfigurationPropertiesBinding
-@Component
-public class ServiceComponentConverter implements GenericConverter {
-
- @Autowired
- private ApplicationContext applicationContext;
-
- public Set<ConvertiblePair> getConvertibleTypes() {
- Set<ConvertiblePair> answer = new LinkedHashSet<>();
- answer.add(new ConvertiblePair(String.class, org.apache.camel.cloud.ServiceRegistry.class));
- answer.add(new ConvertiblePair(String.class, org.apache.camel.cloud.ServiceRegistry.Selector.class));
- return answer;
- }
-
- public Object convert(
- Object source,
- TypeDescriptor sourceType,
- TypeDescriptor targetType) {
- if (source == null) {
- return null;
- }
- String ref = source.toString();
- if (!ref.startsWith("#")) {
- return null;
- }
- ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
- switch (targetType.getName()) {
- case "org.apache.camel.cloud.ServiceRegistry": return applicationContext.getBean(ref, org.apache.camel.cloud.ServiceRegistry.class);
- case "org.apache.camel.cloud.ServiceRegistry.Selector": return applicationContext.getBean(ref, org.apache.camel.cloud.ServiceRegistry.Selector.class);
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/components-starter/camel-service-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-service-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b1270ff0..00000000000
--- a/components-starter/camel-service-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
diff --git a/components-starter/camel-service-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-service-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf2e6b..00000000000
--- a/components-starter/camel-service-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git a/components-starter/camel-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 374e870b7c0..00000000000
--- a/components-starter/camel-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,19 +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.
-## ---------------------------------------------------------------------------
-
-org.apache.camel.component.service.springboot.ServiceComponentConverter
-org.apache.camel.component.service.springboot.ServiceComponentAutoConfiguration
diff --git a/components-starter/camel-zookeeper-cluster-service-starter/pom.xml b/components-starter/camel-zookeeper-cluster-service-starter/pom.xml
deleted file mode 100644
index 6ea48df06e9..00000000000
--- a/components-starter/camel-zookeeper-cluster-service-starter/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>components-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-zookeeper-cluster-service-starter</artifactId>
- <packaging>jar</packaging>
- <name>Camel SB Starters :: Zookeeper Cluster Service</name>
- <description>Spring-Boot Starter for Camel Cluster Service based on Zookeeper</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-zookeeper-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-test</artifactId>
- <version>${curator-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git a/components-starter/camel-zookeeper-cluster-service-starter/src/main/docs/zookeeper-cluster-service.json b/components-starter/camel-zookeeper-cluster-service-starter/src/main/docs/zookeeper-cluster-service.json
deleted file mode 100644
index 63b8b0484d9..00000000000
--- a/components-starter/camel-zookeeper-cluster-service-starter/src/main/docs/zookeeper-cluster-service.json
+++ /dev/null
@@ -1,141 +0,0 @@
-{
- "groups": [
- {
- "name": "camel.cluster.zookeeper",
- "type": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- }
- ],
- "properties": [
- {
- "name": "camel.cluster.zookeeper.attributes",
- "type": "java.util.Map<java.lang.String,java.lang.Object>",
- "description": "Custom service attributes.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.auth-info-list",
- "type": "java.util.List<org.apache.curator.framework.AuthInfo>",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.base-path",
- "type": "java.lang.String",
- "description": "The base path to store in ZooKeeper.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.connection-timeout",
- "type": "java.lang.Long",
- "description": "Connection timeout.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration",
- "defaultValue": 15000
- },
- {
- "name": "camel.cluster.zookeeper.connection-timeout-unit",
- "type": "java.util.concurrent.TimeUnit",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.curator-framework",
- "type": "org.apache.curator.framework.CuratorFramework",
- "description": "Zookeeper CuratorFramework-style client.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.enabled",
- "type": "java.lang.Boolean",
- "description": "Sets if the zookeeper cluster service should be enabled or not, default is true.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.cluster.zookeeper.id",
- "type": "java.lang.String",
- "description": "Cluster Service ID",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.max-close-wait",
- "type": "java.lang.Long",
- "description": "Time to wait during close to join background threads.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration",
- "defaultValue": 1000
- },
- {
- "name": "camel.cluster.zookeeper.max-close-wait-unit",
- "type": "java.util.concurrent.TimeUnit",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.namespace",
- "type": "java.lang.String",
- "description": "ZooKeeper namespace. If a namespace is set here, all paths will get pre-pended with the namespace.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.nodes",
- "type": "java.util.List<java.lang.String>",
- "description": "The Zookeeper server hosts (multiple servers can be separated by comma).",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.order",
- "type": "java.lang.Integer",
- "description": "Service lookup order\/priority.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.reconnect-base-sleep-time",
- "type": "java.lang.Long",
- "description": "Initial amount of time to wait between retries.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration",
- "defaultValue": 0
- },
- {
- "name": "camel.cluster.zookeeper.reconnect-base-sleep-time-unit",
- "type": "java.util.concurrent.TimeUnit",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.reconnect-max-retries",
- "type": "java.lang.Integer",
- "description": "Max number of times to retry.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration",
- "defaultValue": 3
- },
- {
- "name": "camel.cluster.zookeeper.reconnect-max-sleep-time",
- "type": "java.lang.Long",
- "description": "Max time to sleep on each retry. Default is Integer.MAX_VALUE.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.reconnect-max-sleep-time-unit",
- "type": "java.util.concurrent.TimeUnit",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.retry-policy",
- "type": "org.apache.curator.RetryPolicy",
- "description": "Retry policy to use.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.zookeeper.session-timeout",
- "type": "java.lang.Long",
- "description": "Session timeout.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration",
- "defaultValue": 60000
- },
- {
- "name": "camel.cluster.zookeeper.session-timeout-unit",
- "type": "java.util.concurrent.TimeUnit",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceConfiguration"
- }
- ],
- "hints": [],
- "ignored": {
- "properties": []
- }
-}
\ No newline at end of file
diff --git a/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceAutoConfiguration.java b/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceAutoConfiguration.java
deleted file mode 100644
index 97e93b82996..00000000000
--- a/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceAutoConfiguration.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.component.zookeeper.springboot.cluster;
-
-import org.apache.camel.cluster.CamelClusterService;
-import org.apache.camel.component.zookeeper.cluster.ZooKeeperClusterService;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-import java.util.Optional;
-
-@Configuration
-@AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class, CamelAutoConfiguration.class })
-@ConditionalOnProperty(prefix = "camel.cluster.zookeeper", name = "enabled", matchIfMissing = true)
-@EnableConfigurationProperties(ZooKeeperClusterServiceConfiguration.class)
-public class ZooKeeperClusterServiceAutoConfiguration {
-
- @Autowired
- private ZooKeeperClusterServiceConfiguration configuration;
-
- @Bean(name = "zookeeper-cluster-service")
- @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
- public CamelClusterService zookeeperClusterService() throws Exception {
- ZooKeeperClusterService service = new ZooKeeperClusterService();
-
- Optional.ofNullable(configuration.getId()).ifPresent(service::setId);
- Optional.ofNullable(configuration.getOrder()).ifPresent(service::setOrder);
- Optional.ofNullable(configuration.getAttributes()).ifPresent(service::setAttributes);
- Optional.ofNullable(configuration.getBasePath()).ifPresent(service::setBasePath);
- Optional.ofNullable(configuration.getNamespace()).ifPresent(service::setNamespace);
- Optional.of(configuration.getConnectionTimeout()).ifPresent(service::setConnectTimeout);
- Optional.ofNullable(configuration.getCuratorFramework()).ifPresent(service::setCuratorFramework);
- Optional.of(configuration.getMaxCloseWait()).ifPresent(service::setMaxCloseWait);
- Optional.ofNullable(configuration.getNodes()).ifPresent(n -> service.setNodes(String.join(",", n)));
- Optional.of(configuration.getReconnectBaseSleepTime()).ifPresent(service::setReconnectBaseSleepTime);
- Optional.of(configuration.getReconnectMaxRetries()).ifPresent(service::setReconnectMaxRetries);
- Optional.ofNullable(configuration.getRetryPolicy()).ifPresent(service::setRetryPolicy);
- Optional.of(configuration.getSessionTimeout()).ifPresent(service::setSessionTimeout);
- service.setConfiguration(configuration);
-
- return service;
- }
-}
diff --git a/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceConfiguration.java b/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceConfiguration.java
deleted file mode 100644
index fa1659d537c..00000000000
--- a/components-starter/camel-zookeeper-cluster-service-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceConfiguration.java
+++ /dev/null
@@ -1,144 +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.component.zookeeper.springboot.cluster;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.camel.component.zookeeper.ZooKeeperCuratorConfiguration;
-import org.apache.curator.RetryPolicy;
-import org.apache.curator.framework.AuthInfo;
-import org.apache.curator.framework.CuratorFramework;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "camel.cluster.zookeeper")
-public class ZooKeeperClusterServiceConfiguration extends ZooKeeperCuratorConfiguration {
- /**
- * Sets if the zookeeper cluster service should be enabled or not, default is true.
- */
- private boolean enabled = true;
-
- /**
- * Cluster Service ID
- */
- private String id;
-
- /**
- * Custom service attributes.
- */
- private Map<String, Object> attributes;
-
- /**
- * Service lookup order/priority.
- */
- private Integer order;
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Map<String, Object> getAttributes() {
- return attributes;
- }
-
- public void setAttributes(Map<String, Object> attributes) {
- this.attributes = attributes;
- }
-
- public Integer getOrder() {
- return order;
- }
-
- public void setOrder(Integer order) {
- this.order = order;
- }
-
- //
- // Fields copied from ZooKeeperCuratorConfiguration to add
- // javadoc which is used by spring-boot-configuration-processor
- // to generate descriptions for inherited properties
- // ------------------------------------------
-
- /**
- * The Zookeeper server hosts (multiple servers can be separated by comma).
- */
- private String nodes;
-
- /**
- * The base path to store in ZooKeeper.
- */
- private String basePath;
-
- /**
- * ZooKeeper namespace. If a namespace is set here, all paths will get pre-pended with the namespace.
- */
- private String namespace;
-
- /**
- * Initial amount of time to wait between retries.
- */
- private long reconnectBaseSleepTime;
-
- /**
- * Max number of times to retry.
- */
- private int reconnectMaxRetries = 3;
-
- /**
- * Max time to sleep on each retry. Default is Integer.MAX_VALUE.
- */
- private long reconnectMaxSleepTime = Integer.MAX_VALUE;
-
- /**
- * Session timeout.
- */
- private long sessionTimeout = 60000;
-
- /**
- * Connection timeout.
- */
- private long connectionTimeout = 15000;
-
- /**
- * Time to wait during close to join background threads.
- */
- private long maxCloseWait = 1000;
-
- /**
- * Zookeeper CuratorFramework-style client.
- */
- private CuratorFramework curatorFramework;
-
- /**
- * Retry policy to use.
- */
- private RetryPolicy retryPolicy;
-
-}
diff --git a/components-starter/camel-zookeeper-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-zookeeper-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b1270ff0..00000000000
--- a/components-starter/camel-zookeeper-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
diff --git a/components-starter/camel-zookeeper-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-zookeeper-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf2e6b..00000000000
--- a/components-starter/camel-zookeeper-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git a/components-starter/camel-zookeeper-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-zookeeper-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 1c867baba86..00000000000
--- a/components-starter/camel-zookeeper-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,18 +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.
-## ---------------------------------------------------------------------------
-
-org.apache.camel.component.zookeeper.springboot.cluster.ZooKeeperClusterServiceAutoConfiguration
\ No newline at end of file
diff --git a/components-starter/camel-zookeeper-cluster-service-starter/src/test/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceTest.java b/components-starter/camel-zookeeper-cluster-service-starter/src/test/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceTest.java
deleted file mode 100644
index d70a731b3b4..00000000000
--- a/components-starter/camel-zookeeper-cluster-service-starter/src/test/java/org/apache/camel/component/zookeeper/springboot/cluster/ZooKeeperClusterServiceTest.java
+++ /dev/null
@@ -1,91 +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.component.zookeeper.springboot.cluster;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.util.UUID;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.cluster.CamelClusterService;
-import org.apache.camel.component.zookeeper.cluster.ZooKeeperClusterService;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.curator.test.TestingServer;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class ZooKeeperClusterServiceTest {
- private static final String SERVICE_PATH = "/camel";
-
- @TempDir
- Path temporaryFolder;
-
-
- @Test
- public void testDisable() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(ZooKeeperClusterServiceAutoConfiguration.class))
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cluster.zookeeper.enabled=false")
- .run(
- context -> {
- assertThat(context).doesNotHaveBean(ZooKeeperClusterService.class);
- });
- }
-
- @Test
- public void testClusterService() throws Exception {
- final int zkPort = AvailablePortFinder.getNextAvailable();
- final File zkDir = temporaryFolder.toFile();
-
- try (TestingServer zkServer = new TestingServer(zkPort, zkDir)) {
- zkServer.start();
-
- new ApplicationContextRunner().withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=OFF",
- "spring.application.name=" + UUID.randomUUID(),
- "camel.cluster.zookeeper.nodes=localhost:" + zkPort,
- "camel.cluster.zookeeper.id=" + UUID.randomUUID(),
- "camel.cluster.zookeeper.base-path=" + SERVICE_PATH)
- .run(context -> {
- assertThat(context).hasSingleBean(CamelContext.class);
- assertThat(context).hasSingleBean(CamelClusterService.class);
-
- final CamelClusterService clusterService = context.getBean(CamelClusterService.class);
-
- assertThat(clusterService).isNotNull();
- clusterService.start();
-
- assertThat(clusterService).isInstanceOf(ZooKeeperClusterService.class);
- });
- }
- }
-
- @EnableAutoConfiguration
- @Configuration
- public static class TestConfiguration {
- }
-}
diff --git a/components-starter/camel-zookeeper-cluster-service-starter/src/test/resources/logback.xml b/components-starter/camel-zookeeper-cluster-service-starter/src/test/resources/logback.xml
deleted file mode 100644
index c2d17c45149..00000000000
--- a/components-starter/camel-zookeeper-cluster-service-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- <file>target/camel-zookeeper-cluster-service-starter-test.log</file>
- </appender>
-
- <root level="INFO">
- <!--<appender-ref ref="STDOUT"/>-->
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/components-starter/camel-zookeeper-starter/pom.xml b/components-starter/camel-zookeeper-starter/pom.xml
index c0297dc5f5c..20a7178b04a 100644
--- a/components-starter/camel-zookeeper-starter/pom.xml
+++ b/components-starter/camel-zookeeper-starter/pom.xml
@@ -26,8 +26,7 @@
</parent>
<artifactId>camel-zookeeper-starter</artifactId>
<packaging>jar</packaging>
- <name>Camel SB Starters :: Zookeeper</name>
- <description>Spring-Boot Starter for Camel Zookeeper Support</description>
+ <name>Camel SB Starters :: zookeeper</name>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -39,18 +38,6 @@
<artifactId>camel-zookeeper</artifactId>
<version>${camel-version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-test</artifactId>
- <version>${curator-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- </exclusions>
- <scope>test</scope>
- </dependency>
<!--START OF GENERATED CODE-->
<dependency>
<groupId>org.apache.camel.springboot</groupId>
diff --git a/components-starter/camel-zookeeper-starter/src/main/docs/zookeeper.json b/components-starter/camel-zookeeper-starter/src/main/docs/zookeeper.json
index 69ecea1e196..d34fb43bca7 100644
--- a/components-starter/camel-zookeeper-starter/src/main/docs/zookeeper.json
+++ b/components-starter/camel-zookeeper-starter/src/main/docs/zookeeper.json
@@ -1,10 +1,5 @@
{
"groups": [
- {
- "name": "camel.cloud.zookeeper",
- "type": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration"
- },
{
"name": "camel.component.zookeeper",
"type": "org.apache.camel.component.zookeeper.springboot.ZooKeeperComponentConfiguration",
@@ -18,143 +13,6 @@
}
],
"properties": [
- {
- "name": "camel.cloud.zookeeper.attributes",
- "type": "java.util.Map<java.lang.String,java.lang.Object>",
- "description": "Custom service attributes.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.zookeeper.auth-info-list",
- "type": "java.util.List<org.apache.curator.framework.AuthInfo>",
- "description": "List of AuthInfo objects with scheme and auth.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.zookeeper.base-path",
- "type": "java.lang.String",
- "description": "The base path to store in ZooKeeper.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.zookeeper.connection-timeout",
- "type": "java.lang.Long",
- "description": "Connection timeout.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "defaultValue": 15000
- },
- {
- "name": "camel.cloud.zookeeper.connection-timeout-unit",
- "type": "java.util.concurrent.TimeUnit",
- "description": "Connection timeout TimeUnit. Default is TimeUnit.MILLISECONDS.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "defaultValue": "milliseconds"
- },
- {
- "name": "camel.cloud.zookeeper.curator-framework",
- "type": "org.apache.curator.framework.CuratorFramework",
- "description": "Zookeeper CuratorFramework-style client.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.zookeeper.enabled",
- "type": "java.lang.Boolean",
- "description": "Sets if the zookeeper service registry should be enabled or not, default is false.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "defaultValue": false
- },
- {
- "name": "camel.cloud.zookeeper.id",
- "type": "java.lang.String",
- "description": "Service Registry ID",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.zookeeper.max-close-wait",
- "type": "java.lang.Long",
- "description": "Time to wait during close to join background threads.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "defaultValue": 1000
- },
- {
- "name": "camel.cloud.zookeeper.max-close-wait-unit",
- "type": "java.util.concurrent.TimeUnit",
- "description": "MaxCloseWait TimeUnit. Default is TimeUnit.MILLISECONDS.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "defaultValue": "milliseconds"
- },
- {
- "name": "camel.cloud.zookeeper.namespace",
- "type": "java.lang.String",
- "description": "ZooKeeper namespace. If a namespace is set here, all paths will get pre-pended with the namespace.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.zookeeper.nodes",
- "type": "java.util.List<java.lang.String>",
- "description": "The Zookeeper server hosts (multiple servers can be separated by comma).",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.zookeeper.order",
- "type": "java.lang.Integer",
- "description": "Service lookup order\/priority.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.zookeeper.reconnect-base-sleep-time",
- "type": "java.lang.Long",
- "description": "Initial amount of time to wait between retries.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "defaultValue": 0
- },
- {
- "name": "camel.cloud.zookeeper.reconnect-base-sleep-time-unit",
- "type": "java.util.concurrent.TimeUnit",
- "description": "ReconnectBaseSleepTime TimeUnit. Default is TimeUnit.MILLISECONDS.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "defaultValue": "milliseconds"
- },
- {
- "name": "camel.cloud.zookeeper.reconnect-max-retries",
- "type": "java.lang.Integer",
- "description": "Max number of times to retry.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "defaultValue": 3
- },
- {
- "name": "camel.cloud.zookeeper.reconnect-max-sleep-time",
- "type": "java.lang.Long",
- "description": "Max time to sleep on each retry. Default is Integer.MAX_VALUE.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.zookeeper.reconnect-max-sleep-time-unit",
- "type": "java.util.concurrent.TimeUnit",
- "description": "ReconnectMaxSleepTimeUnit TimeUnit. Default is TimeUnit.MILLISECONDS.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "defaultValue": "milliseconds"
- },
- {
- "name": "camel.cloud.zookeeper.retry-policy",
- "type": "org.apache.curator.RetryPolicy",
- "description": "Retry policy to use.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration"
- },
- {
- "name": "camel.cloud.zookeeper.session-timeout",
- "type": "java.lang.Long",
- "description": "Session timeout.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "defaultValue": 60000
- },
- {
- "name": "camel.cloud.zookeeper.session-timeout-unit",
- "type": "java.util.concurrent.TimeUnit",
- "description": "Session timeout TimeUnit. Default is TimeUnit.MILLISECONDS.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "defaultValue": "milliseconds"
- },
{
"name": "camel.component.zookeeper.autowired-enabled",
"type": "java.lang.Boolean",
@@ -241,32 +99,6 @@
"description": "The time interval to wait on connection before timing out.",
"sourceType": "org.apache.camel.component.zookeeper.springboot.ZooKeeperComponentConfiguration",
"defaultValue": 5000
- },
- {
- "name": "camel.cloud.zookeeper.deregister-services-on-stop",
- "type": "java.lang.Boolean",
- "description": "Should we remove all the registered services know by this registry on stop ? Default is true.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "defaultValue": true,
- "deprecated": true,
- "deprecation": {}
- },
- {
- "name": "camel.cloud.zookeeper.override-service-host",
- "type": "java.lang.Boolean",
- "description": "Should we override the service host if given ? Default is true.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "defaultValue": true,
- "deprecated": true,
- "deprecation": {}
- },
- {
- "name": "camel.cloud.zookeeper.service-host",
- "type": "java.lang.String",
- "description": "Service host.",
- "sourceType": "org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryConfiguration",
- "deprecated": true,
- "deprecation": {}
}
],
"hints": [],
diff --git a/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cloud/ZooKeeperServiceRegistryAutoConfiguration.java b/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cloud/ZooKeeperServiceRegistryAutoConfiguration.java
deleted file mode 100644
index 650028aa337..00000000000
--- a/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cloud/ZooKeeperServiceRegistryAutoConfiguration.java
+++ /dev/null
@@ -1,52 +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.component.zookeeper.springboot.cloud;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.zookeeper.cloud.ZooKeeperServiceRegistry;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-@Configuration
-@AutoConfigureBefore(CamelAutoConfiguration.class)
-@ConditionalOnProperty(prefix = "camel.cloud.zookeeper", name = "enabled")
-@EnableConfigurationProperties(ZooKeeperServiceRegistryConfiguration.class)
-public class ZooKeeperServiceRegistryAutoConfiguration {
-
- @Autowired
- private CamelContext camelContext;
-
- @Bean(name = "zookeeper-service-registry")
- @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
- public ZooKeeperServiceRegistry zookeeperServiceRegistry(ZooKeeperServiceRegistryConfiguration configuration)
- throws Exception {
- ZooKeeperServiceRegistry service = new ZooKeeperServiceRegistry();
-
- CamelPropertiesHelper.setCamelProperties(camelContext, service,
- CamelPropertiesHelper.getNonNullProperties(camelContext, configuration), false);
-
- return service;
- }
-}
diff --git a/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cloud/ZooKeeperServiceRegistryConfiguration.java b/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cloud/ZooKeeperServiceRegistryConfiguration.java
deleted file mode 100644
index 6fe30dd1322..00000000000
--- a/components-starter/camel-zookeeper-starter/src/main/java/org/apache/camel/component/zookeeper/springboot/cloud/ZooKeeperServiceRegistryConfiguration.java
+++ /dev/null
@@ -1,188 +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.component.zookeeper.springboot.cloud;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.curator.RetryPolicy;
-import org.apache.curator.framework.AuthInfo;
-import org.apache.curator.framework.CuratorFramework;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "camel.cloud.zookeeper")
-public class ZooKeeperServiceRegistryConfiguration
- extends org.apache.camel.component.zookeeper.cloud.ZooKeeperServiceRegistryConfiguration {
-
- /**
- * Sets if the zookeeper service registry should be enabled or not, default is false.
- */
- private boolean enabled;
-
- /**
- * Service Registry ID
- */
- private String id;
-
- /**
- * Custom service attributes.
- */
- private Map<String, Object> attributes;
-
- /**
- * Service lookup order/priority.
- */
- private Integer order;
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Map<String, Object> getAttributes() {
- return attributes;
- }
-
- public void setAttributes(Map<String, Object> attributes) {
- this.attributes = attributes;
- }
-
- public Integer getOrder() {
- return order;
- }
-
- public void setOrder(Integer order) {
- this.order = order;
- }
-
- //
- // Fields copied from ZooKeeperServiceRegistryConfiguration to add
- // javadoc which is used by spring-boot-configuration-processor
- // to generate descritpions for inherited properties
- // ------------------------------------------
- /**
- * Should we remove all the registered services know by this registry on stop ? Default is true.
- */
- private boolean deregisterServicesOnStop = true;
-
- /**
- * Should we override the service host if given ? Default is true.
- */
- private boolean overrideServiceHost = true;
-
- /**
- * Service host.
- */
- private String serviceHost;
-
- /**
- * The Zookeeper server hosts (multiple servers can be separated by comma).
- */
- private List<String> nodes;
-
- /**
- * The base path to store in ZooKeeper.
- */
- private String basePath;
-
- /**
- * ZooKeeper namespace. If a namespace is set here, all paths will get pre-pended with the namespace.
- */
- private String namespace;
-
- /**
- * Initial amount of time to wait between retries.
- */
- private long reconnectBaseSleepTime;
-
- /**
- * ReconnectBaseSleepTime TimeUnit. Default is TimeUnit.MILLISECONDS.
- */
- private TimeUnit reconnectBaseSleepTimeUnit = TimeUnit.MILLISECONDS;
-
- /**
- * Max number of times to retry.
- */
- private int reconnectMaxRetries = 3;
-
- /**
- * Max time to sleep on each retry. Default is Integer.MAX_VALUE.
- */
- private long reconnectMaxSleepTime = Integer.MAX_VALUE;
-
- /**
- * ReconnectMaxSleepTimeUnit TimeUnit. Default is TimeUnit.MILLISECONDS.
- */
- private TimeUnit reconnectMaxSleepTimeUnit = TimeUnit.MILLISECONDS;
-
- /**
- * Session timeout.
- */
- private long sessionTimeout = 60000;
-
- /**
- * Session timeout TimeUnit. Default is TimeUnit.MILLISECONDS.
- */
- private TimeUnit sessionTimeoutUnit = TimeUnit.MILLISECONDS;
-
- /**
- * Connection timeout.
- */
- private long connectionTimeout = 15000;
-
- /**
- * Connection timeout TimeUnit. Default is TimeUnit.MILLISECONDS.
- */
- private TimeUnit connectionTimeoutUnit = TimeUnit.MILLISECONDS;
-
- /**
- * Time to wait during close to join background threads.
- */
- private long maxCloseWait = 1000;
-
- /**
- * MaxCloseWait TimeUnit. Default is TimeUnit.MILLISECONDS.
- */
- private TimeUnit maxCloseWaitUnit = TimeUnit.MILLISECONDS;
-
- /**
- * Zookeeper CuratorFramework-style client.
- */
- private CuratorFramework curatorFramework;
-
- /**
- * List of AuthInfo objects with scheme and auth.
- */
- private List<AuthInfo> authInfoList;
-
- /**
- * Retry policy to use.
- */
- private RetryPolicy retryPolicy;
-}
diff --git a/components-starter/camel-zookeeper-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-zookeeper-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index a023896faa1..8025e0db2cc 100644
--- a/components-starter/camel-zookeeper-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/components-starter/camel-zookeeper-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -14,7 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-
org.apache.camel.component.zookeeper.springboot.ZooKeeperComponentConverter
org.apache.camel.component.zookeeper.springboot.ZooKeeperComponentAutoConfiguration
-org.apache.camel.component.zookeeper.springboot.cloud.ZooKeeperServiceRegistryAutoConfiguration
\ No newline at end of file
diff --git a/components-starter/camel-zookeeper-starter/src/test/java/org/apache/camel/component/zookeeper/springboot/cloud/ZooKeeperServiceRegistryTest.java b/components-starter/camel-zookeeper-starter/src/test/java/org/apache/camel/component/zookeeper/springboot/cloud/ZooKeeperServiceRegistryTest.java
deleted file mode 100644
index ab76593929d..00000000000
--- a/components-starter/camel-zookeeper-starter/src/test/java/org/apache/camel/component/zookeeper/springboot/cloud/ZooKeeperServiceRegistryTest.java
+++ /dev/null
@@ -1,134 +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.component.zookeeper.springboot.cloud;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.UUID;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.cloud.ServiceRegistry;
-import org.apache.camel.component.zookeeper.cloud.MetaData;
-import org.apache.camel.impl.cloud.DefaultServiceDefinition;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.curator.framework.CuratorFramework;
-import org.apache.curator.framework.CuratorFrameworkFactory;
-import org.apache.curator.retry.ExponentialBackoffRetry;
-import org.apache.curator.test.TestingServer;
-import org.apache.curator.utils.CloseableUtils;
-import org.apache.curator.x.discovery.ServiceDiscovery;
-import org.apache.curator.x.discovery.ServiceDiscoveryBuilder;
-import org.apache.curator.x.discovery.ServiceInstance;
-import org.apache.curator.x.discovery.details.JsonInstanceSerializer;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class ZooKeeperServiceRegistryTest {
-
- private static final String SERVICE_PATH = "/camel";
- private static final String SERVICE_ID = UUID.randomUUID().toString();
- private static final String SERVICE_NAME = "my-service";
- private static final String SERVICE_HOST = "localhost";
- private static final int SERVICE_PORT = AvailablePortFinder.getNextAvailable();
-
- @TempDir
- Path temporaryFolder;
-
- @Test
- public void testServiceRegistry() throws Exception {
- final int zkPort = AvailablePortFinder.getNextAvailable();
- final File zkDir = temporaryFolder.toFile();
-
- try (final TestingServer zkServer = new TestingServer(zkPort, zkDir);
- final ZooKeeperTestClient zkClient = new ZooKeeperTestClient("localhost:" + zkPort)) {
- zkServer.start();
- zkClient.start();
- new ApplicationContextRunner().withUserConfiguration(TestConfiguration.class).withPropertyValues(
- "debug=false", "spring.main.banner-mode=OFF", "spring.application.name=" + UUID.randomUUID(),
- "camel.cloud.zookeeper.enabled=true", "camel.cloud.zookeeper.nodes=localhost:" + zkPort,
- "camel.cloud.zookeeper.id=" + UUID.randomUUID(), "camel.cloud.zookeeper.base-path=" + SERVICE_PATH,
- "camel.cloud.zookeeper.service-host=localhost").run(context -> {
- assertThat(context).hasSingleBean(CamelContext.class);
- assertThat(context).hasSingleBean(ServiceRegistry.class);
-
- final ServiceRegistry serviceRegistry = context.getBean(ServiceRegistry.class);
-
- assertThat(serviceRegistry).isNotNull();
- serviceRegistry.start();
- serviceRegistry.register(DefaultServiceDefinition.builder().withHost(SERVICE_HOST)
- .withPort(SERVICE_PORT).withName(SERVICE_NAME).withId(SERVICE_ID).build());
-
- try (ServiceDiscovery<MetaData> discovery = zkClient.discovery()) {
- final Collection<ServiceInstance<MetaData>> services = discovery
- .queryForInstances(SERVICE_NAME);
-
- assertThat(services).hasSize(1);
- assertThat(services).first().hasFieldOrPropertyWithValue("id", SERVICE_ID);
- assertThat(services).first().hasFieldOrPropertyWithValue("name", SERVICE_NAME);
- assertThat(services).first().hasFieldOrPropertyWithValue("address", SERVICE_HOST);
- assertThat(services).first().hasFieldOrPropertyWithValue("port", SERVICE_PORT);
- }
- });
- }
- }
-
- // *************************************
- // Config
- // *************************************
-
- @EnableAutoConfiguration
- @Configuration
- public static class TestConfiguration {
- }
-
- // *************************************
- // Helpers
- // *************************************
-
- public static class ZooKeeperTestClient implements AutoCloseable {
- private final CuratorFramework curator;
- private final ServiceDiscovery<MetaData> discovery;
-
- public ZooKeeperTestClient(String nodes) {
- curator = CuratorFrameworkFactory.builder().connectString(nodes)
- .retryPolicy(new ExponentialBackoffRetry(1000, 3)).build();
- discovery = ServiceDiscoveryBuilder.builder(MetaData.class).client(curator).basePath(SERVICE_PATH)
- .serializer(new JsonInstanceSerializer<>(MetaData.class)).build();
- }
-
- public ServiceDiscovery<MetaData> discovery() {
- return discovery;
- }
-
- public void start() throws Exception {
- curator.start();
- discovery.start();
- }
-
- @Override
- public void close() {
- CloseableUtils.closeQuietly(discovery);
- CloseableUtils.closeQuietly(curator);
- }
- }
-}
diff --git a/components-starter/camel-zookeeper-starter/src/test/resources/application.properties b/components-starter/camel-zookeeper-starter/src/test/resources/application.properties
deleted file mode 100644
index 2f91fc32820..00000000000
--- a/components-starter/camel-zookeeper-starter/src/test/resources/application.properties
+++ /dev/null
@@ -1,17 +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.
-## ---------------------------------------------------------------------------
-spring.main.banner-mode=off
diff --git a/components-starter/camel-zookeeper-starter/src/test/resources/logback.xml b/components-starter/camel-zookeeper-starter/src/test/resources/logback.xml
deleted file mode 100644
index 3e6fbd7b3a2..00000000000
--- a/components-starter/camel-zookeeper-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger - %msg%n</pattern>
- </encoder>
- <file>target/camel-zookeeper-starter-test.log</file>
- </appender>
-
- <root level="INFO">
- <!--<appender-ref ref="STDOUT"/>-->
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 362c9cb5616..25d1847cc47 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -181,7 +181,6 @@
<module>camel-coap-starter</module>
<module>camel-cometd-starter</module>
<module>camel-console-starter</module>
- <module>camel-consul-cluster-service-starter</module>
<module>camel-consul-starter</module>
<module>camel-controlbus-starter</module>
<module>camel-core-starter</module>
@@ -225,7 +224,6 @@
<module>camel-exec-starter</module>
<module>camel-fastjson-starter</module>
<module>camel-fhir-starter</module>
- <module>camel-file-cluster-service-starter</module>
<module>camel-file-starter</module>
<module>camel-file-watch-starter</module>
<module>camel-flatpack-starter</module>
@@ -281,7 +279,6 @@
<module>camel-iec60870-starter</module>
<module>camel-iggy-starter</module>
<module>camel-ignite-starter</module>
- <module>camel-infinispan-cluster-service-starter</module>
<module>camel-infinispan-embedded-starter</module>
<module>camel-infinispan-starter</module>
<module>camel-influxdb-starter</module>
@@ -302,7 +299,6 @@
<module>camel-jdbc-starter</module>
<module>camel-jetty-starter</module>
<module>camel-jfr-starter</module>
- <module>camel-jgroups-raft-cluster-service-starter</module>
<module>camel-jgroups-raft-starter</module>
<module>camel-jgroups-starter</module>
<module>camel-jira-starter</module>
@@ -329,7 +325,6 @@
<module>camel-keycloak-starter</module>
<module>camel-knative-starter</module>
<module>camel-kserve-starter</module>
- <module>camel-kubernetes-cluster-service-starter</module>
<module>camel-kubernetes-starter</module>
<module>camel-kudu-starter</module>
<module>camel-langchain4j-agent-starter</module>
@@ -426,7 +421,6 @@
<module>camel-scheduler-starter</module>
<module>camel-schematron-starter</module>
<module>camel-seda-starter</module>
- <module>camel-service-starter</module>
<module>camel-servicenow-starter</module>
<module>camel-servlet-starter</module>
<module>camel-shiro-starter</module>
@@ -508,7 +502,6 @@
<module>camel-zendesk-starter</module>
<module>camel-zip-deflater-starter</module>
<module>camel-zipfile-starter</module>
- <module>camel-zookeeper-cluster-service-starter</module>
<module>camel-zookeeper-master-starter</module>
<module>camel-zookeeper-starter</module>
</modules>
diff --git a/core/camel-spring-boot/pom.xml b/core/camel-spring-boot/pom.xml
index f3805a1183c..6385444cc58 100644
--- a/core/camel-spring-boot/pom.xml
+++ b/core/camel-spring-boot/pom.xml
@@ -86,10 +86,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-util-json</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-cloud</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cluster</artifactId>
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json b/core/camel-spring-boot/src/main/docs/spring-boot.json
index 0a56aef9fb4..ea018109a26 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -5,47 +5,6 @@
"type": "org.apache.camel.spring.boot.CamelConfigurationProperties",
"sourceType": "org.apache.camel.spring.boot.CamelConfigurationProperties"
},
- {
- "name": "camel.cloud",
- "type": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties"
- },
- {
- "name": "camel.cloud.load-balancer",
- "type": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$LoadBalancer",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties",
- "sourceMethod": "getLoadBalancer()"
- },
- {
- "name": "camel.cloud.service-call",
- "type": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceCall",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties",
- "sourceMethod": "getServiceCall()"
- },
- {
- "name": "camel.cloud.service-chooser",
- "type": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceChooser",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties",
- "sourceMethod": "getServiceChooser()"
- },
- {
- "name": "camel.cloud.service-discovery",
- "type": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceDiscovery",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties",
- "sourceMethod": "getServiceDiscovery()"
- },
- {
- "name": "camel.cloud.service-filter",
- "type": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceFilter",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties",
- "sourceMethod": "getServiceFilter()"
- },
- {
- "name": "camel.cloud.service-registry",
- "type": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceRegistry",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties",
- "sourceMethod": "getServiceRegistry()"
- },
{
"name": "camel.clustered.controller",
"type": "org.apache.camel.spring.boot.cluster.ClusteredRouteControllerConfiguration",
@@ -197,140 +156,6 @@
}
],
"properties": [
- {
- "name": "camel.cloud.enabled",
- "type": "java.lang.Boolean",
- "description": "Global option to enable\/disable Camel cloud support, default is true.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties",
- "defaultValue": true
- },
- {
- "name": "camel.cloud.load-balancer.enabled",
- "type": "java.lang.Boolean",
- "description": "Global option to enable\/disable Camel cloud load balancer, default is true.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$LoadBalancer",
- "defaultValue": true
- },
- {
- "name": "camel.cloud.service-call.component",
- "type": "java.lang.String",
- "description": "The Camel component to use for calling the service. The default is http component.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceCall"
- },
- {
- "name": "camel.cloud.service-call.default-load-balancer",
- "type": "java.lang.Boolean",
- "description": "Determine if the default load balancer should be used instead of any auto discovered one.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceCall",
- "defaultValue": false
- },
- {
- "name": "camel.cloud.service-call.expression",
- "type": "java.lang.String",
- "description": "The expression to use.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceCall"
- },
- {
- "name": "camel.cloud.service-call.expression-language",
- "type": "java.lang.String",
- "description": "The expression language to use, default is ref.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceCall",
- "defaultValue": "ref"
- },
- {
- "name": "camel.cloud.service-call.load-balancer",
- "type": "java.lang.String",
- "description": "A reference to the org.apache.camel.cloud.ServiceLoadBalancer to use.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceCall"
- },
- {
- "name": "camel.cloud.service-call.service-chooser",
- "type": "java.lang.String",
- "description": "A reference to the org.apache.camel.cloud.ServiceChooser to use.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceCall"
- },
- {
- "name": "camel.cloud.service-call.service-discovery",
- "type": "java.lang.String",
- "description": "A reference to the org.apache.camel.cloud.ServiceDiscovery to use.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceCall"
- },
- {
- "name": "camel.cloud.service-call.service-filter",
- "type": "java.lang.String",
- "description": "A reference to the org.apache.camel.cloud.ServiceFilter to use.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceCall"
- },
- {
- "name": "camel.cloud.service-call.uri",
- "type": "java.lang.String",
- "description": "The uri of the endpoint to send to. The uri can be dynamic computed using the simple language expression.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceCall"
- },
- {
- "name": "camel.cloud.service-chooser.enabled",
- "type": "java.lang.Boolean",
- "description": "Global option to enable\/disable Camel cloud service chooser, default is true.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceChooser",
- "defaultValue": true
- },
- {
- "name": "camel.cloud.service-discovery.configurations",
- "type": "java.util.Map<java.lang.String,org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceDiscoveryConfiguration>",
- "description": "Configure the service discovery rules.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceDiscovery"
- },
- {
- "name": "camel.cloud.service-discovery.enabled",
- "type": "java.lang.Boolean",
- "description": "Global option to enable\/disable Camel cloud service discovery, default is true.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceDiscovery",
- "defaultValue": true
- },
- {
- "name": "camel.cloud.service-discovery.service-definitions",
- "type": "java.util.Map<java.lang.String,java.util.List<org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceDefinitionConfiguration>>",
- "description": "Configure static service discovery with distinct id, host, port, and metadata properties.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceDiscovery"
- },
- {
- "name": "camel.cloud.service-discovery.services",
- "type": "java.util.Map<java.lang.String,java.util.List<java.lang.String>>",
- "description": "Configure static service discovery using simple host:port strings.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceDiscovery"
- },
- {
- "name": "camel.cloud.service-filter.blacklist",
- "type": "java.util.Map<java.lang.String,java.util.List<java.lang.String>>",
- "description": "Configure service filter blacklists.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceFilter"
- },
- {
- "name": "camel.cloud.service-filter.configurations",
- "type": "java.util.Map<java.lang.String,org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceFilterConfiguration>",
- "description": "Configure the service filtering rules.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceFilter"
- },
- {
- "name": "camel.cloud.service-filter.enabled",
- "type": "java.lang.Boolean",
- "description": "Global option to enable\/disable Camel cloud service filter, default is true.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceFilter",
- "defaultValue": true
- },
- {
- "name": "camel.cloud.service-registry.enabled",
- "type": "java.lang.Boolean",
- "description": "Configure if service registry should be enabled or not, default true.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceRegistry",
- "defaultValue": true
- },
- {
- "name": "camel.cloud.service-registry.service-host",
- "type": "java.lang.String",
- "description": "Configure the service listening address.",
- "sourceType": "org.apache.camel.spring.boot.cloud.CamelCloudConfigurationProperties$ServiceRegistry"
- },
{
"name": "camel.clustered.controller.cluster-service",
"type": "org.apache.camel.cluster.CamelClusterService",
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudAutoConfiguration.java
deleted file mode 100644
index f759775f7e4..00000000000
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudAutoConfiguration.java
+++ /dev/null
@@ -1,30 +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.spring.boot.cloud;
-
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnBean(CamelAutoConfiguration.class)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@ConditionalOnProperty(value = "camel.cloud.enabled", matchIfMissing = true)
-public class CamelCloudAutoConfiguration {
-}
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java
deleted file mode 100644
index 74ce28819d0..00000000000
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java
+++ /dev/null
@@ -1,401 +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.spring.boot.cloud;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.apache.camel.model.cloud.ServiceCallDefinitionConstants;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "camel.cloud")
-public class CamelCloudConfigurationProperties {
- /**
- * Global option to enable/disable Camel cloud support, default is true.
- */
- private boolean enabled = true;
- private ServiceCall serviceCall = new ServiceCall();
- private LoadBalancer loadBalancer = new LoadBalancer();
- private ServiceDiscovery serviceDiscovery = new ServiceDiscovery();
- private ServiceFilter serviceFilter = new ServiceFilter();
- private ServiceChooser serviceChooser = new ServiceChooser();
- private ServiceRegistry serviceRegistry = new ServiceRegistry();
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public ServiceCall getServiceCall() {
- return serviceCall;
- }
-
- public LoadBalancer getLoadBalancer() {
- return loadBalancer;
- }
-
- public ServiceDiscovery getServiceDiscovery() {
- return serviceDiscovery;
- }
-
- public ServiceFilter getServiceFilter() {
- return serviceFilter;
- }
-
- public ServiceChooser getServiceChooser() {
- return serviceChooser;
- }
-
- public ServiceRegistry getServiceRegistry() {
- return serviceRegistry;
- }
-
- // *****************************************
- // Service Call
- // *****************************************
-
- public class ServiceCall {
-
- /**
- * The uri of the endpoint to send to. The uri can be dynamic computed using the simple language expression.
- */
- private String uri;
-
- /**
- * The Camel component to use for calling the service. The default is http component.
- */
- private String component = ServiceCallDefinitionConstants.DEFAULT_COMPONENT;
-
- /**
- * A reference to the org.apache.camel.cloud.ServiceDiscovery to use.
- */
- private String serviceDiscovery;
-
- /**
- * A reference to the org.apache.camel.cloud.ServiceFilter to use.
- */
- private String serviceFilter;
-
- /**
- * A reference to the org.apache.camel.cloud.ServiceChooser to use.
- */
- private String serviceChooser;
-
- /**
- * A reference to the org.apache.camel.cloud.ServiceLoadBalancer to use.
- */
- private String loadBalancer;
-
- /**
- * Determine if the default load balancer should be used instead of any auto discovered one.
- */
- private boolean defaultLoadBalancer;
-
- /**
- * The expression to use.
- */
- private String expression;
-
- /**
- * The expression language to use, default is ref.
- */
- private String expressionLanguage = "ref";
-
- public String getUri() {
- return uri;
- }
-
- public void setUri(String uri) {
- this.uri = uri;
- }
-
- public String getComponent() {
- return component;
- }
-
- public void setComponent(String component) {
- this.component = component;
- }
-
- public String getServiceDiscovery() {
- return serviceDiscovery;
- }
-
- public void setServiceDiscovery(String serviceDiscovery) {
- this.serviceDiscovery = serviceDiscovery;
- }
-
- public String getServiceFilter() {
- return serviceFilter;
- }
-
- public void setServiceFilter(String serviceFilter) {
- this.serviceFilter = serviceFilter;
- }
-
- public String getServiceChooser() {
- return serviceChooser;
- }
-
- public void setServiceChooser(String serviceChooser) {
- this.serviceChooser = serviceChooser;
- }
-
- public String getLoadBalancer() {
- return loadBalancer;
- }
-
- public void setLoadBalancer(String loadBalancer) {
- this.loadBalancer = loadBalancer;
- }
-
- public boolean isDefaultLoadBalancer() {
- return defaultLoadBalancer;
- }
-
- public void setDefaultLoadBalancer(boolean defaultLoadBalancer) {
- this.defaultLoadBalancer = defaultLoadBalancer;
- }
-
- public String getExpression() {
- return expression;
- }
-
- public void setExpression(String expression) {
- this.expression = expression;
- }
-
- public String getExpressionLanguage() {
- return expressionLanguage;
- }
-
- public void setExpressionLanguage(String expressionLanguage) {
- this.expressionLanguage = expressionLanguage;
- }
- }
-
- // *****************************************
- // Load Balancer
- // *****************************************
-
- public static class LoadBalancer {
- /**
- * Global option to enable/disable Camel cloud load balancer, default is true.
- */
- private boolean enabled = true;
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
- }
-
- // *****************************************
- // Service Discovery
- // *****************************************
-
- public static class ServiceDiscoveryConfiguration {
- /**
- * Configure static service discovery using simple host:port strings.
- */
- private Map<String, List<String>> services = new HashMap<>();
-
- /**
- * Configure static service discovery with distinct id, host, port, and metadata properties.
- */
- private Map<String, List<ServiceDefinitionConfiguration>> serviceDefinitions = new HashMap<>();
-
- public Map<String, List<String>> getServices() {
- return services;
- }
-
- public Map<String, List<ServiceDefinitionConfiguration>> getServiceDefinitions() {
- return serviceDefinitions;
- }
- }
-
- public static class ServiceDiscovery extends ServiceDiscoveryConfiguration {
- /**
- * Global option to enable/disable Camel cloud service discovery, default is true.
- */
- private boolean enabled = true;
- /**
- * Configure the service discovery rules.
- */
- private Map<String, ServiceDiscoveryConfiguration> configurations = new HashMap<>();
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public Map<String, ServiceDiscoveryConfiguration> getConfigurations() {
- return configurations;
- }
- }
-
- public static class ServiceDefinitionConfiguration {
- /**
- * Service definition id.
- */
- private String id;
-
- /**
- * Service host.
- */
- private String host;
-
- /**
- * Service port.
- */
- private int port;
-
- /**
- * Service metadata to register with the service.
- */
- private Map<String, String> metadata;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getHost() {
- return host;
- }
-
- public void setHost(String host) {
- this.host = host;
- }
-
- public int getPort() {
- return port;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- public Map<String, String> getMetadata() {
- return metadata;
- }
-
- public void setMetadata(Map<String, String> metadata) {
- this.metadata = metadata;
- }
- }
-
- // *****************************************
- // Service Filter
- // *****************************************
-
- public static class ServiceFilterConfiguration {
- /**
- * Configure service filter blacklists.
- */
- private Map<String, List<String>> blacklist = new HashMap<>();
-
- public Map<String, List<String>> getBlacklist() {
- return blacklist;
- }
- }
-
- public static class ServiceFilter extends ServiceFilterConfiguration {
- /**
- * Global option to enable/disable Camel cloud service filter, default is true.
- */
- private boolean enabled = true;
- /**
- * Configure the service filtering rules.
- */
- private Map<String, ServiceFilterConfiguration> configurations = new HashMap<>();
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public Map<String, ServiceFilterConfiguration> getConfigurations() {
- return configurations;
- }
- }
-
- // *****************************************
- // Service Chooser
- // *****************************************
-
- public static class ServiceChooser {
- /**
- * Global option to enable/disable Camel cloud service chooser, default is true.
- */
- private boolean enabled = true;
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
- }
-
- // *****************************************
- // Service Registry
- // *****************************************
-
- public static class ServiceRegistry {
- /**
- * Configure if service registry should be enabled or not, default true.
- */
- private boolean enabled = true;
- /**
- * Configure the service listening address.
- */
- private String serviceHost;
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public String getServiceHost() {
- return serviceHost;
- }
-
- public void setServiceHost(String serviceHost) {
- this.serviceHost = serviceHost;
- }
- }
-}
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationAutoConfiguration.java
deleted file mode 100644
index 2d63b6ddfa2..00000000000
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationAutoConfiguration.java
+++ /dev/null
@@ -1,86 +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.spring.boot.cloud;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.model.cloud.ServiceCallConfigurationDefinition;
-import org.apache.camel.model.cloud.ServiceCallDefinitionConstants;
-import org.apache.camel.spi.Language;
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.apache.camel.util.ObjectHelper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnBean({ CamelCloudAutoConfiguration.class, CamelContext.class })
-@EnableConfigurationProperties(CamelCloudConfigurationProperties.class)
-@Conditional(CamelCloudServiceCallConfigurationAutoConfiguration.ServiceCallCondition.class)
-public class CamelCloudServiceCallConfigurationAutoConfiguration {
- @Autowired
- private CamelContext camelContext;
- @Autowired
- private CamelCloudConfigurationProperties configurationProperties;
-
- @Lazy
- @Bean(name = ServiceCallDefinitionConstants.DEFAULT_SERVICE_CALL_CONFIG_ID)
- @ConditionalOnMissingBean(name = ServiceCallDefinitionConstants.DEFAULT_SERVICE_CALL_CONFIG_ID)
- public ServiceCallConfigurationDefinition serviceCallConfiguration() throws Exception {
- final ServiceCallConfigurationDefinition definition = new ServiceCallConfigurationDefinition();
- final CamelCloudConfigurationProperties.ServiceCall serviceCall = configurationProperties.getServiceCall();
-
- ObjectHelper.ifNotEmpty(serviceCall.getComponent(), definition::setComponent);
- ObjectHelper.ifNotEmpty(serviceCall.getUri(), definition::setUri);
- ObjectHelper.ifNotEmpty(serviceCall.getServiceDiscovery(), definition::setServiceDiscoveryRef);
- ObjectHelper.ifNotEmpty(serviceCall.getServiceFilter(), definition::setServiceFilterRef);
- ObjectHelper.ifNotEmpty(serviceCall.getServiceChooser(), definition::setServiceChooserRef);
- ObjectHelper.ifNotEmpty(serviceCall.getLoadBalancer(), definition::setLoadBalancerRef);
-
- if (serviceCall.getLoadBalancer() == null && serviceCall.isDefaultLoadBalancer()) {
- definition.defaultLoadBalancer();
- }
-
- final String expression = serviceCall.getExpression();
- final String expressionLanguage = serviceCall.getExpressionLanguage();
-
- if (ObjectHelper.isNotEmpty(expression) && ObjectHelper.isNotEmpty(expressionLanguage)) {
- Language language = camelContext.resolveLanguage(expressionLanguage);
- if (language == null) {
- throw new IllegalArgumentException("Unable to resolve language: " + expressionLanguage);
- }
-
- definition.setExpression(language.createExpression(expression));
- }
-
- return definition;
- }
-
- // *******************************
- // Condition
- // *******************************
-
- public static class ServiceCallCondition extends GroupCondition {
- public ServiceCallCondition() {
- super("camel.cloud", "camel.cloud.service-call");
- }
- }
-}
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceChooserAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceChooserAutoConfiguration.java
deleted file mode 100644
index dae381c8621..00000000000
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceChooserAutoConfiguration.java
+++ /dev/null
@@ -1,40 +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.spring.boot.cloud;
-
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnBean(CamelCloudAutoConfiguration.class)
-@EnableConfigurationProperties(CamelCloudConfigurationProperties.class)
-@Conditional(CamelCloudServiceChooserAutoConfiguration.ServiceChooserCondition.class)
-public class CamelCloudServiceChooserAutoConfiguration {
-
- // *******************************
- // Condition
- // *******************************
-
- public static class ServiceChooserCondition extends GroupCondition {
- public ServiceChooserCondition() {
- super("camel.cloud", "camel.cloud.service-chooser");
- }
- }
-}
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscovery.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscovery.java
deleted file mode 100644
index 54d06195bca..00000000000
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscovery.java
+++ /dev/null
@@ -1,38 +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.spring.boot.cloud;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import org.apache.camel.cloud.ServiceDefinition;
-import org.apache.camel.cloud.ServiceDiscovery;
-import org.apache.camel.impl.cloud.CombinedServiceDiscovery;
-
-public class CamelCloudServiceDiscovery implements ServiceDiscovery {
- private ServiceDiscovery delegate;
-
- public CamelCloudServiceDiscovery(List<ServiceDiscovery> serviceDiscoveryList) {
- // Created a chained service discovery that collects services from multiple
- // ServiceDiscovery
- this.delegate = new CombinedServiceDiscovery(serviceDiscoveryList);
- }
-
- @Override
- public List<ServiceDefinition> getServices(String name) {
- return delegate.getServices(name);
- }
-}
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java
deleted file mode 100644
index 1796bea178d..00000000000
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java
+++ /dev/null
@@ -1,125 +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.spring.boot.cloud;
-
-import jakarta.annotation.PostConstruct;
-import java.util.List;
-import java.util.Map;
-import org.apache.camel.CamelContext;
-import org.apache.camel.NoTypeConversionAvailableException;
-import org.apache.camel.cloud.ServiceDiscovery;
-import org.apache.camel.impl.cloud.DefaultServiceDefinition;
-import org.apache.camel.impl.cloud.StaticServiceDiscovery;
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnBean(CamelCloudAutoConfiguration.class)
-@EnableConfigurationProperties(CamelCloudConfigurationProperties.class)
-@Conditional(CamelCloudServiceDiscoveryAutoConfiguration.Condition.class)
-public class CamelCloudServiceDiscoveryAutoConfiguration implements BeanFactoryAware {
- private static final Logger LOGGER = LoggerFactory.getLogger(CamelCloudServiceDiscoveryAutoConfiguration.class);
-
- private BeanFactory beanFactory;
-
- @Autowired
- private CamelContext camelContext;
- @Autowired
- private CamelCloudConfigurationProperties configurationProperties;
-
- @Override
- public void setBeanFactory(BeanFactory factory) throws BeansException {
- beanFactory = factory;
- }
-
- @Lazy
- @Bean(name = "static-service-discovery")
- public ServiceDiscovery staticServiceDiscovery() {
- return createStaticServiceDiscovery(configurationProperties.getServiceDiscovery());
- }
-
- @Lazy
- @Bean(name = "service-discovery")
- public CamelCloudServiceDiscovery serviceDiscovery(List<ServiceDiscovery> serviceDiscoveryList)
- throws NoTypeConversionAvailableException {
- return new CamelCloudServiceDiscovery(serviceDiscoveryList);
- }
-
- @PostConstruct
- public void addServiceDiscoveryConfigurations() {
- if (!(beanFactory instanceof ConfigurableBeanFactory)) {
- LOGGER.warn("BeanFactory is not of type ConfigurableBeanFactory");
- return;
- }
-
- final ConfigurableBeanFactory factory = (ConfigurableBeanFactory) beanFactory;
-
- configurationProperties.getServiceDiscovery().getConfigurations().entrySet().stream()
- .forEach(entry -> registerBean(factory, entry.getKey(), entry.getValue()));
- }
-
- // *******************************
- // Condition
- // *******************************
-
- public static class Condition extends GroupCondition {
- public Condition() {
- super("camel.cloud", "camel.cloud.service-discovery");
- }
- }
-
- // *******************************
- // Helper
- // *******************************
-
- private void registerBean(ConfigurableBeanFactory factory, String name,
- CamelCloudConfigurationProperties.ServiceDiscoveryConfiguration configuration) {
- factory.registerSingleton(name, createStaticServiceDiscovery(configuration));
- }
-
- private ServiceDiscovery createStaticServiceDiscovery(
- CamelCloudConfigurationProperties.ServiceDiscoveryConfiguration configuration) {
- StaticServiceDiscovery staticServiceDiscovery = new StaticServiceDiscovery();
-
- Map<String, List<String>> services = configuration.getServices();
- for (Map.Entry<String, List<String>> entry : services.entrySet()) {
- staticServiceDiscovery.addServers(entry.getKey(), entry.getValue());
- }
-
- configuration.getServiceDefinitions().entrySet().stream()
- .flatMap(serviceDefinitionEntry -> serviceDefinitionEntry.getValue().stream()
- .map(serviceDefinitionConf -> DefaultServiceDefinition.builder()
- .withName(serviceDefinitionEntry.getKey()).withId(serviceDefinitionConf.getId())
- .withHost(serviceDefinitionConf.getHost()).withPort(serviceDefinitionConf.getPort())
- .withMeta(serviceDefinitionConf.getMetadata()).build()))
- .forEach(staticServiceDiscovery::addServer);
-
- return staticServiceDiscovery;
- }
-}
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java
deleted file mode 100644
index dfc700d95ed..00000000000
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java
+++ /dev/null
@@ -1,36 +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.spring.boot.cloud;
-
-import java.util.List;
-import org.apache.camel.Exchange;
-import org.apache.camel.cloud.ServiceDefinition;
-import org.apache.camel.cloud.ServiceFilter;
-import org.apache.camel.impl.cloud.CombinedServiceFilter;
-
-public class CamelCloudServiceFilter implements ServiceFilter {
- private final CombinedServiceFilter serviceFilter;
-
- public CamelCloudServiceFilter(List<ServiceFilter> serviceFilterList) {
- this.serviceFilter = new CombinedServiceFilter(serviceFilterList);
- }
-
- @Override
- public List<ServiceDefinition> apply(Exchange exchange, List<ServiceDefinition> services) {
- return this.serviceFilter.apply(exchange, services);
- }
-}
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java
deleted file mode 100644
index 427a0b5c5fe..00000000000
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java
+++ /dev/null
@@ -1,120 +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.spring.boot.cloud;
-
-import jakarta.annotation.PostConstruct;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import org.apache.camel.CamelContext;
-import org.apache.camel.impl.cloud.BlacklistServiceFilter;
-import org.apache.camel.impl.cloud.DefaultServiceDefinition;
-import org.apache.camel.impl.cloud.HealthyServiceFilter;
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.StringHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnBean(CamelCloudAutoConfiguration.class)
-@EnableConfigurationProperties(CamelCloudConfigurationProperties.class)
-@Conditional(CamelCloudServiceFilterAutoConfiguration.Condition.class)
-public class CamelCloudServiceFilterAutoConfiguration implements BeanFactoryAware {
- private static final Logger LOGGER = LoggerFactory.getLogger(CamelCloudServiceFilterAutoConfiguration.class);
-
- private BeanFactory beanFactory;
-
- @Autowired
- private CamelContext camelContext;
- @Autowired
- private CamelCloudConfigurationProperties configurationProperties;
-
- @Override
- public void setBeanFactory(BeanFactory factory) throws BeansException {
- beanFactory = factory;
- }
-
- @Lazy
- @Bean(name = "service-filter")
- public CamelCloudServiceFilter serviceFilter() {
- return createServiceFilter(configurationProperties.getServiceFilter());
- }
-
- @PostConstruct
- public void addServiceFilterConfigurations() {
- if (!(beanFactory instanceof ConfigurableBeanFactory)) {
- LOGGER.warn("BeanFactory is not of type ConfigurableBeanFactory");
- return;
- }
-
- final ConfigurableBeanFactory factory = (ConfigurableBeanFactory) beanFactory;
-
- configurationProperties.getServiceFilter().getConfigurations().entrySet().stream()
- .forEach(entry -> registerBean(factory, entry.getKey(), entry.getValue()));
- }
-
- // *******************************
- // Condition
- // *******************************
-
- public static class Condition extends GroupCondition {
- public Condition() {
- super("camel.cloud", "camel.cloud.service-filter");
- }
- }
-
- // *******************************
- // Helper
- // *******************************
-
- private void registerBean(ConfigurableBeanFactory factory, String name,
- CamelCloudConfigurationProperties.ServiceFilterConfiguration configuration) {
- factory.registerSingleton(name, createServiceFilter(configuration));
- }
-
- private CamelCloudServiceFilter createServiceFilter(
- CamelCloudConfigurationProperties.ServiceFilterConfiguration configuration) {
- BlacklistServiceFilter blacklist = new BlacklistServiceFilter();
-
- Map<String, List<String>> services = configuration.getBlacklist();
- for (Map.Entry<String, List<String>> entry : services.entrySet()) {
- for (String part : entry.getValue()) {
- String host = StringHelper.before(part, ":");
- String port = StringHelper.after(part, ":");
-
- if (ObjectHelper.isNotEmpty(host) && ObjectHelper.isNotEmpty(port)) {
- blacklist.addServer(DefaultServiceDefinition.builder().withName(entry.getKey()).withHost(host)
- .withPort(Integer.parseInt(port)).build());
- }
- }
- }
-
- return new CamelCloudServiceFilter(Arrays.asList(new HealthyServiceFilter(), blacklist));
- }
-}
diff --git a/core/camel-spring-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/core/camel-spring-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 19e4724d726..e2dd68b6d89 100644
--- a/core/camel-spring-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/core/camel-spring-boot/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -23,11 +23,6 @@ org.apache.camel.spring.boot.actuate.health.AsyncHealthIndicatorAutoConfiguratio
org.apache.camel.spring.boot.actuate.health.CamelHealthCheckAutoConfiguration
org.apache.camel.spring.boot.actuate.health.CamelAvailabilityCheckAutoConfiguration
org.apache.camel.spring.boot.actuate.info.CamelInfoAutoConfiguration
-org.apache.camel.spring.boot.cloud.CamelCloudAutoConfiguration
-org.apache.camel.spring.boot.cloud.CamelCloudServiceCallConfigurationAutoConfiguration
-org.apache.camel.spring.boot.cloud.CamelCloudServiceDiscoveryAutoConfiguration
-org.apache.camel.spring.boot.cloud.CamelCloudServiceFilterAutoConfiguration
-org.apache.camel.spring.boot.cloud.CamelCloudServiceChooserAutoConfiguration
org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration
org.apache.camel.spring.boot.routecontroller.SupervisingRouteControllerAutoConfiguration
org.apache.camel.spring.boot.security.CamelSSLAutoConfiguration
diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationTest.java
deleted file mode 100644
index 063d2da761a..00000000000
--- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationTest.java
+++ /dev/null
@@ -1,109 +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.spring.boot.cloud;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.util.List;
-import java.util.Map;
-import org.apache.camel.cloud.ServiceChooser;
-import org.apache.camel.cloud.ServiceDefinition;
-import org.apache.camel.cloud.ServiceDiscovery;
-import org.apache.camel.cloud.ServiceFilter;
-import org.apache.camel.cloud.ServiceLoadBalancer;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.core.env.Environment;
-
-public class CamelCloudServiceCallConfigurationTest {
- @Test
- public void testConfiguration() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(CamelAutoConfiguration.class,
- CamelCloudAutoConfiguration.class, CamelCloudServiceChooserAutoConfiguration.class))
- .withPropertyValues("camel.cloud.enabled=false", "camel.cloud.service-discovery.enabled=false",
- "camel.cloud.service-filter.enabled=false", "camel.cloud.service-chooser.enabled=true",
- "camel.cloud.load-balancer.enabled=false", "debug=false")
- .run(context -> {
- Environment env = context.getEnvironment();
- assertFalse(env.getProperty("camel.cloud.enabled", Boolean.class));
- assertFalse(env.getProperty("camel.cloud.service-discovery.enabled", Boolean.class));
- assertFalse(env.getProperty("camel.cloud.service-filter.enabled", Boolean.class));
- assertTrue(env.getProperty("camel.cloud.service-chooser.enabled", Boolean.class));
- assertFalse(env.getProperty("camel.cloud.load-balancer.enabled", Boolean.class));
-
- assertTrue(context.getBeansOfType(ServiceDiscovery.class).isEmpty());
- assertTrue(context.getBeansOfType(ServiceFilter.class).isEmpty());
- assertTrue(context.getBeansOfType(ServiceChooser.class).isEmpty());
- assertTrue(context.getBeansOfType(ServiceLoadBalancer.class).isEmpty());
-
- });
- }
-
- @Test
- public void testStaticServiceDiscoveryConfigurationWithMetadata() {
- new ApplicationContextRunner()
- .withConfiguration(AutoConfigurations.of(CamelAutoConfiguration.class,
- CamelCloudAutoConfiguration.class, CamelCloudServiceChooserAutoConfiguration.class,
- CamelCloudServiceDiscoveryAutoConfiguration.class))
- .withPropertyValues("camel.cloud.enabled=true", "camel.cloud.service-discovery.enabled=true",
- "camel.cloud.service-discovery.services.first-service[0]=service1-1:80",
- "camel.cloud.service-discovery.services.first-service[1]=service1-2:80",
- "camel.cloud.service-discovery.services.second-service[0]=service2-1:80",
- "camel.cloud.service-discovery.service-definitions.third-service-with-metadata[0].id=service3-0",
- "camel.cloud.service-discovery.service-definitions.third-service-with-metadata[0].host=service3",
- "camel.cloud.service-discovery.service-definitions.third-service-with-metadata[0].port=80",
- "camel.cloud.service-discovery.service-definitions.third-service-with-metadata[0].metadata.foo=bar",
- "camel.cloud.service-discovery.configurations.my-static-service-discovery.services.fourth-service[0]=service4-1:80",
- "camel.cloud.service-discovery.configurations.my-static-service-discovery.service-definitions.fifth-service-with-metadata[0].host=service5",
- "camel.cloud.service-discovery.configurations.my-static-service-discovery.service-definitions.fifth-service-with-metadata[0].port=80",
- "camel.cloud.service-discovery.configurations.my-static-service-discovery.service-definitions.fifth-service-with-metadata[0].metadata.baz=gnarf",
- "camel.cloud.service-filter.enabled=false", "camel.cloud.service-chooser.enabled=false",
- "camel.cloud.load-balancer.enabled=false", "debug=false")
- .run(context -> {
- Map<String, ServiceDiscovery> serviceDiscoveryBeans = context
- .getBeansOfType(ServiceDiscovery.class);
-
- ServiceDiscovery staticServiceDiscovery = serviceDiscoveryBeans.get("static-service-discovery");
- assertEquals(2, staticServiceDiscovery.getServices("first-service").size());
- assertEquals(1, staticServiceDiscovery.getServices("second-service").size());
- List<ServiceDefinition> serviceDefinitionsWithMetadata = staticServiceDiscovery
- .getServices("third-service-with-metadata");
- assertEquals(1, serviceDefinitionsWithMetadata.size());
- ServiceDefinition serviceDefinition = serviceDefinitionsWithMetadata.get(0);
- assertEquals("third-service-with-metadata", serviceDefinition.getName());
- assertEquals("service3-0", serviceDefinition.getId());
- assertEquals("service3", serviceDefinition.getHost());
- assertEquals(80, serviceDefinition.getPort());
- assertEquals("bar", serviceDefinition.getMetadata().get("foo"));
-
- ServiceDiscovery myStaticServiceDiscovery = serviceDiscoveryBeans
- .get("my-static-service-discovery");
- assertEquals(myStaticServiceDiscovery.getServices("fourth-service").size(), 1);
- List<ServiceDefinition> services = myStaticServiceDiscovery
- .getServices("fifth-service-with-metadata");
- assertEquals(services.size(), 1);
- assertEquals(services.get(0).getMetadata().get("baz"), "gnarf");
-
- });
- }
-
-}
diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java
deleted file mode 100644
index 198d86d3bf3..00000000000
--- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java
+++ /dev/null
@@ -1,121 +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.spring.boot.cloud;
-
-import java.util.Properties;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.test.spring.junit6.CamelSpringBootTest;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.core.env.PropertiesPropertySource;
-import org.springframework.test.annotation.DirtiesContext;
-
-@DirtiesContext
-@CamelSpringBootTest
-@SpringBootApplication
-@SpringBootTest(classes = { CamelAutoConfiguration.class,
- CamelCloudServiceCallGlobalConfigurationTest.TestConfiguration.class,
- CamelCloudServiceCallGlobalConfigurationTest.SpringBootPropertySourceConfig.class, }
-
-)
-@Disabled("TODO: Fix me later")
-public class CamelCloudServiceCallGlobalConfigurationTest {
- @Autowired
- private ProducerTemplate template;
-
- @Test
- public void testServiceCall() throws Exception {
- Assertions.assertEquals(String.valueOf(SpringBootPropertyUtil.PORT1),
- template.requestBody("direct:start", null, String.class));
- Assertions.assertEquals(String.valueOf(SpringBootPropertyUtil.PORT3),
- template.requestBody("direct:start", null, String.class));
- }
-
- // *************************************
- // Config
- // *************************************
-
- @Configuration
- public static class TestConfiguration {
- @Bean
- public RouteBuilder myRouteBuilder() {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:start").serviceCall("{{service.name}}");
-
- fromF("jetty:http://localhost:%d/hello", SpringBootPropertyUtil.PORT1).transform()
- .constant(SpringBootPropertyUtil.PORT1);
- fromF("jetty:http://localhost:%d/hello", SpringBootPropertyUtil.PORT2).transform()
- .constant(SpringBootPropertyUtil.PORT2);
- fromF("jetty:http://localhost:%d/hello", SpringBootPropertyUtil.PORT3).transform()
- .constant(SpringBootPropertyUtil.PORT3);
- }
- };
- }
- }
-
- private static Properties getAllProperties() {
-
- Properties prop = new Properties();
- prop.put("service.name", "custom-svc-list");
- prop.put("camel.cloud.load-balancer.enabled", false);
- prop.put("camel.cloud.service-call.uri", "jetty:http://${service.name}/hello");
- prop.put("camel.cloud.service-call.service-discovery", "sd");
- prop.put("camel.cloud.service-call.service-filter", "sf");
- prop.put("camel.cloud.service-discovery.configurations[sd].services[custom-svc-list]",
- SpringBootPropertyUtil.getDiscoveryServices());
- prop.put("camel.cloud.service-filter.configurations[sf].blacklist[custom-svc-list]",
- SpringBootPropertyUtil.getServiceFilterBlacklist());
- prop.put("debug", false);
- return prop;
- }
-
- // *************************************
- // Config
- //
-
- @Configuration
- public static class SpringBootPropertySourceConfig {
-
- @Autowired
- private ConfigurableEnvironment env;
-
- @Bean
- @Lazy(false)
- public MutablePropertySources springBootPropertySource() {
-
- MutablePropertySources sources = env.getPropertySources();
- sources.addFirst(new PropertiesPropertySource("boot-test-property",
- CamelCloudServiceCallGlobalConfigurationTest.getAllProperties()));
- return sources;
-
- }
- }
-
-}
diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java
deleted file mode 100644
index 03732add8c3..00000000000
--- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java
+++ /dev/null
@@ -1,128 +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.spring.boot.cloud;
-
-import java.util.Properties;
-import org.apache.camel.Expression;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.model.language.SimpleExpression;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.test.spring.junit6.CamelSpringBootTest;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.core.env.PropertiesPropertySource;
-import org.springframework.test.annotation.DirtiesContext;
-
-@DirtiesContext
-@CamelSpringBootTest
-@SpringBootApplication
-@SpringBootTest(classes = { CamelAutoConfiguration.class,
- CamelCloudServiceCallRefExpressionTest.TestConfiguration.class,
- CamelCloudServiceCallRefExpressionTest.SpringBootPropertySourceConfig.class }
-
-)
-@Disabled("TODO: Fix me later")
-public class CamelCloudServiceCallRefExpressionTest {
- @Autowired
- private ProducerTemplate template;
-
- @Test
- public void testServiceCall() throws Exception {
- Assertions.assertEquals(String.valueOf(SpringBootPropertyUtil.PORT1),
- template.requestBody("direct:start", null, String.class));
- Assertions.assertEquals(String.valueOf(SpringBootPropertyUtil.PORT3),
- template.requestBody("direct:start", null, String.class));
- }
-
- // *************************************
- // Config
- // *************************************
-
- @Configuration
- public static class TestConfiguration {
- @Bean
- Expression myExpression() {
- return new SimpleExpression(
- "http://${header.CamelServiceCallServiceHost}:${header.CamelServiceCallServicePort}/hello");
- }
-
- @Bean
- public RouteBuilder myRouteBuilder() {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:start").serviceCall("{{service.name}}");
-
- fromF("jetty:http://localhost:%d/hello", SpringBootPropertyUtil.PORT1).transform()
- .constant(SpringBootPropertyUtil.PORT1);
- fromF("jetty:http://localhost:%d/hello", SpringBootPropertyUtil.PORT2).transform()
- .constant(SpringBootPropertyUtil.PORT2);
- fromF("jetty:http://localhost:%d/hello", SpringBootPropertyUtil.PORT3).transform()
- .constant(SpringBootPropertyUtil.PORT3);
- }
- };
- }
- }
-
- // *************************************
- // Config
- // *************************************
-
- @Configuration
- public static class SpringBootPropertySourceConfig {
-
- @Autowired
- private ConfigurableEnvironment env;
-
- @Bean
- @Lazy(false)
- public MutablePropertySources springBootPropertySource() {
-
- MutablePropertySources sources = env.getPropertySources();
- sources.addFirst(new PropertiesPropertySource("boot-test-property",
- CamelCloudServiceCallRefExpressionTest.getAllProperties()));
- return sources;
-
- }
- }
-
- private static Properties getAllProperties() {
-
- Properties prop = new Properties();
- prop.put("service.name", "custom-svc-list");
- prop.put("camel.cloud.service-call.expression", "myExpression");
- prop.put("camel.cloud.load-balancer.enabled", false);
- prop.put("camel.cloud.service-call.component", "http");
- prop.put("camel.cloud.service-discovery.services[custom-svc-list]",
- SpringBootPropertyUtil.getDiscoveryServices());
- prop.put("camel.cloud.service-filter.blacklist[custom-svc-list]",
- SpringBootPropertyUtil.getServiceFilterBlacklist());
- prop.put("debug", false);
- return prop;
- }
-
-}
diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java
deleted file mode 100644
index 512c524f7aa..00000000000
--- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java
+++ /dev/null
@@ -1,119 +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.spring.boot.cloud;
-
-import java.util.Properties;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.test.spring.junit6.CamelSpringBootTest;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.core.env.PropertiesPropertySource;
-import org.springframework.test.annotation.DirtiesContext;
-
-@DirtiesContext
-@CamelSpringBootTest
-@SpringBootApplication
-@SpringBootTest(classes = { CamelAutoConfiguration.class,
- CamelCloudServiceCallSimpleExpressionTest.TestConfiguration.class,
- CamelCloudServiceCallSimpleExpressionTest.SpringBootPropertySourceConfig.class })
-@Disabled("TODO: Fix me later")
-public class CamelCloudServiceCallSimpleExpressionTest {
- @Autowired
- private ProducerTemplate template;
-
- @Test
- public void testServiceCall() throws Exception {
- Assertions.assertEquals(String.valueOf(SpringBootPropertyUtil.PORT1),
- template.requestBody("direct:start", null, String.class));
- Assertions.assertEquals(String.valueOf(SpringBootPropertyUtil.PORT3),
- template.requestBody("direct:start", null, String.class));
- }
-
- // *************************************
- // Config
- // *************************************
-
- @Configuration
- public static class TestConfiguration {
- @Bean
- public RouteBuilder myRouteBuilder() {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:start").serviceCall("{{service.name}}");
-
- fromF("jetty:http://localhost:%d/hello", SpringBootPropertyUtil.PORT1).transform()
- .constant(SpringBootPropertyUtil.PORT1);
- fromF("jetty:http://localhost:%d/hello", SpringBootPropertyUtil.PORT2).transform()
- .constant(SpringBootPropertyUtil.PORT2);
- fromF("jetty:http://localhost:%d/hello", SpringBootPropertyUtil.PORT3).transform()
- .constant(SpringBootPropertyUtil.PORT3);
- }
- };
- }
- }
-
- private static Properties getAllProperties() {
-
- Properties prop = new Properties();
- prop.put("service.name", "custom-svc-list");
- prop.put("camel.cloud.load-balancer.enabled", false);
- prop.put("camel.cloud.service-call.component", "http");
- prop.put("camel.cloud.service-call.expression",
- "$simple{header.CamelServiceCallScheme}:$simple{header.CamelServiceCallServiceHost}:$simple{header.CamelServiceCallServicePort}/hello");
- prop.put("camel.cloud.service-call.expression-language", "simple");
- prop.put("camel.cloud.service-discovery.services[custom-svc-list]",
- SpringBootPropertyUtil.getDiscoveryServices());
- prop.put("camel.cloud.service-filter.blacklist[custom-svc-list]",
- SpringBootPropertyUtil.getServiceFilterBlacklist());
- prop.put("debug", false);
- return prop;
- }
-
- // *************************************
- // Config
- //
-
- @Configuration
- public static class SpringBootPropertySourceConfig {
-
- @Autowired
- private ConfigurableEnvironment env;
-
- @Bean
- @Lazy(false)
- public MutablePropertySources springBootPropertySource() {
-
- MutablePropertySources sources = env.getPropertySources();
- sources.addFirst(new PropertiesPropertySource("boot-test-property",
- CamelCloudServiceCallSimpleExpressionTest.getAllProperties()));
- return sources;
-
- }
- }
-}
diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java
deleted file mode 100644
index 6c79c0848a5..00000000000
--- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java
+++ /dev/null
@@ -1,118 +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.spring.boot.cloud;
-
-import java.util.Properties;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.test.spring.junit6.CamelSpringBootTest;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.core.env.PropertiesPropertySource;
-import org.springframework.test.annotation.DirtiesContext;
-
-@DirtiesContext
-@CamelSpringBootTest
-@SpringBootApplication
-@SpringBootTest(classes = { CamelAutoConfiguration.class, CamelCloudServiceCallTest.TestConfiguration.class,
- CamelCloudServiceCallTest.SpringBootPropertySourceConfig.class }
-
-)
-@Disabled("TODO: Fix me later")
-public class CamelCloudServiceCallTest {
- @Autowired
- private ProducerTemplate template;
-
- @Test
- public void testServiceCall() throws Exception {
- Assertions.assertEquals(String.valueOf(SpringBootPropertyUtil.PORT1),
- template.requestBody("direct:start", null, String.class));
- Assertions.assertEquals(String.valueOf(SpringBootPropertyUtil.PORT3),
- template.requestBody("direct:start", null, String.class));
- }
-
- // *************************************
- // Config
- // *************************************
-
- @Configuration
- public static class TestConfiguration {
- @Bean
- public RouteBuilder myRouteBuilder() {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:start").serviceCall("custom-svc-list/hello");
-
- fromF("jetty:http://localhost:%d/hello", SpringBootPropertyUtil.PORT1).transform()
- .constant(SpringBootPropertyUtil.PORT1);
- fromF("jetty:http://localhost:%d/hello", SpringBootPropertyUtil.PORT2).transform()
- .constant(SpringBootPropertyUtil.PORT2);
- fromF("jetty:http://localhost:%d/hello", SpringBootPropertyUtil.PORT3).transform()
- .constant(SpringBootPropertyUtil.PORT3);
- }
- };
- }
- }
-
- private static Properties getAllProperties() {
-
- Properties prop = new Properties();
- prop.put("service.name", "custom-svc-list");
- prop.put("camel.cloud.load-balancer.enabled", false);
- prop.put("camel.cloud.service-call.component", "http");
- prop.put("camel.cloud.service-discovery.services[custom-svc-list]",
- SpringBootPropertyUtil.getDiscoveryServices());
- prop.put("camel.cloud.service-filter.blacklist[custom-svc-list]",
- SpringBootPropertyUtil.getServiceFilterBlacklist());
- prop.put("debug", false);
- return prop;
- }
-
- // *************************************
- // Config
- //
-
- @Configuration
- public static class SpringBootPropertySourceConfig {
-
- @Autowired
- private ConfigurableEnvironment env;
-
- @Bean
- @Lazy(false)
- public MutablePropertySources springBootPropertySource() {
-
- MutablePropertySources sources = env.getPropertySources();
- sources.addFirst(
- new PropertiesPropertySource("boot-test-property", CamelCloudServiceCallTest.getAllProperties()));
- return sources;
-
- }
- }
-
-}
diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/SpringBootPropertyUtil.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/SpringBootPropertyUtil.java
deleted file mode 100644
index 6c49cae5087..00000000000
--- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/SpringBootPropertyUtil.java
+++ /dev/null
@@ -1,56 +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.spring.boot.cloud;
-
-import org.apache.camel.test.AvailablePortFinder;
-
-public final class SpringBootPropertyUtil {
-
- public static final int PORT1 = AvailablePortFinder.getNextAvailable();
- public static final int PORT2 = AvailablePortFinder.getNextAvailable();
- public static final int PORT3 = AvailablePortFinder.getNextAvailable();
- public static final String HOSTNAME = "localhost:";
-
- private SpringBootPropertyUtil() {
-
- }
-
- public static String getDiscoveryServices() {
-
- StringBuffer dservice = new StringBuffer();
- dservice.append(HOSTNAME);
- dservice.append(PORT1);
- dservice.append(",");
- dservice.append(HOSTNAME);
- dservice.append(PORT2);
- dservice.append(",");
- dservice.append(HOSTNAME);
- dservice.append(PORT3);
- return dservice.toString();
-
- }
-
- public static String getServiceFilterBlacklist() {
-
- StringBuffer filterBlacklistString = new StringBuffer();
- filterBlacklistString.append(HOSTNAME);
- filterBlacklistString.append(PORT2);
- return filterBlacklistString.toString();
-
- }
-
-}
diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml
index 31d58f31fa5..de4983a7b2c 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -433,11 +433,6 @@
<artifactId>camel-console-starter</artifactId>
<version>4.19.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-consul-cluster-service-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-consul-starter</artifactId>
@@ -663,11 +658,6 @@
<artifactId>camel-fhir-starter</artifactId>
<version>4.19.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-file-cluster-service-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-file-starter</artifactId>
@@ -943,11 +933,6 @@
<artifactId>camel-ignite-starter</artifactId>
<version>4.19.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-infinispan-cluster-service-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-infinispan-embedded-starter</artifactId>
@@ -1053,11 +1038,6 @@
<artifactId>camel-jfr-starter</artifactId>
<version>4.19.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-jgroups-raft-cluster-service-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-jgroups-raft-starter</artifactId>
@@ -1188,11 +1168,6 @@
<artifactId>camel-kserve-starter</artifactId>
<version>4.19.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-kubernetes-cluster-service-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-kubernetes-starter</artifactId>
@@ -1673,11 +1648,6 @@
<artifactId>camel-seda-starter</artifactId>
<version>4.19.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-service-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-servicenow-starter</artifactId>
@@ -2133,11 +2103,6 @@
<artifactId>camel-zipfile-starter</artifactId>
<version>4.19.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-zookeeper-cluster-service-starter</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-zookeeper-master-starter</artifactId>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index f3c99c9f5b5..1a379c65b5f 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -702,11 +702,6 @@
<artifactId>camel-console-starter</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-consul-cluster-service-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-consul-starter</artifactId>
@@ -932,11 +927,6 @@
<artifactId>camel-fhir-starter</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-file-cluster-service-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-file-starter</artifactId>
@@ -1212,11 +1202,6 @@
<artifactId>camel-ignite-starter</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-infinispan-cluster-service-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-infinispan-embedded-starter</artifactId>
@@ -1322,11 +1307,6 @@
<artifactId>camel-jfr-starter</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-jgroups-raft-cluster-service-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-jgroups-raft-starter</artifactId>
@@ -1457,11 +1437,6 @@
<artifactId>camel-kserve-starter</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-kubernetes-cluster-service-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-kubernetes-starter</artifactId>
@@ -1942,11 +1917,6 @@
<artifactId>camel-seda-starter</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-service-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-servicenow-starter</artifactId>
@@ -2387,11 +2357,6 @@
<artifactId>camel-zipfile-starter</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-zookeeper-cluster-service-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-zookeeper-master-starter</artifactId>
@@ -2853,11 +2818,6 @@
<artifactId>camel-clickup</artifactId>
<version>4.19.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-cloud</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cloudevents</artifactId>
@@ -4419,11 +4379,6 @@
<artifactId>camel-seda</artifactId>
<version>4.19.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-service</artifactId>
- <version>4.19.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-servicenow</artifactId>