You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2018/05/21 08:12:58 UTC
[camel] 01/03: CAMEL-12509: camel cloud: deprecate
ChainedServiceFilter and replace it with CombinedServiceFilter
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 20d39ef56ced32489f82143124af3de177c58eaa
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Sat May 19 16:15:58 2018 +0200
CAMEL-12509: camel cloud: deprecate ChainedServiceFilter and replace it with CombinedServiceFilter
---
.../camel/impl/cloud/ChainedServiceFilter.java | 38 ++-------
.../impl/cloud/ChainedServiceFilterFactory.java | 40 ++--------
...rviceFilter.java => CombinedServiceFilter.java} | 8 +-
...tory.java => CombinedServiceFilterFactory.java} | 6 +-
...ainedServiceCallServiceFilterConfiguration.java | 91 +++-------------------
...inedServiceCallServiceFilterConfiguration.java} | 22 +++---
.../cloud/ServiceCallConfigurationDefinition.java | 8 ++
.../camel/model/cloud/ServiceCallDefinition.java | 8 ++
.../org/apache/camel/cloud/combined-service-filter | 17 ++++
.../org/apache/camel/model/cloud/jaxb.index | 1 +
...terTest.java => CombinedServiceFilterTest.java} | 14 ++--
.../spring/boot/cloud/CamelCloudServiceFilter.java | 12 +--
12 files changed, 87 insertions(+), 178 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilter.java b/camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilter.java
index caeebbc..50cb538 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilter.java
@@ -16,42 +16,16 @@
*/
package org.apache.camel.impl.cloud;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
-import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.cloud.ServiceFilter;
-public class ChainedServiceFilter implements ServiceFilter {
- private final List<ServiceFilter> delegates;
- private final int delegatesSize;
-
+/**
+ * @deprecated use {@link CombinedServiceFilter}
+ */
+@Deprecated
+public class ChainedServiceFilter extends CombinedServiceFilter {
public ChainedServiceFilter(List<ServiceFilter> delegates) {
- this.delegates = Collections.unmodifiableList(new ArrayList<>(delegates));
- this.delegatesSize = this.delegates.size();
- }
-
- public List<ServiceFilter> getDelegates() {
- return this.delegates;
- }
-
-
- @Override
- public List<ServiceDefinition> apply(List<ServiceDefinition> services) {
- for (int i = 0; i < delegatesSize; i++) {
- services = delegates.get(i).apply(services);
- }
-
- return services;
- }
-
- // **********************
- // Helpers
- // **********************
-
- public static ChainedServiceFilter wrap(ServiceFilter... delegates) {
- return new ChainedServiceFilter(Arrays.asList(delegates));
+ super(delegates);
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilterFactory.java b/camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilterFactory.java
index 15c9af7..61ac21b 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilterFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilterFactory.java
@@ -16,39 +16,9 @@
*/
package org.apache.camel.impl.cloud;
-import java.util.List;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.cloud.ServiceFilter;
-import org.apache.camel.cloud.ServiceFilterFactory;
-import org.apache.camel.util.ObjectHelper;
-
-public class ChainedServiceFilterFactory implements ServiceFilterFactory {
- private List<ServiceFilter> serviceFilterList;
-
- public ChainedServiceFilterFactory() {
- }
-
- // *************************************************************************
- // Properties
- // *************************************************************************
-
- public List<ServiceFilter> getServiceFilterList() {
- return serviceFilterList;
- }
-
- public void setServiceFilterList(List<ServiceFilter> serviceFilterList) {
- this.serviceFilterList = serviceFilterList;
- }
-
- // *************************************************************************
- // Factory
- // *************************************************************************
-
- @Override
- public ServiceFilter newInstance(CamelContext camelContext) throws Exception {
- ObjectHelper.notNull(serviceFilterList, "ServiceFilter list");
-
- return new ChainedServiceFilter(serviceFilterList);
- }
+/**
+ * @deprecated use {@link CombinedServiceFilterFactory}
+ */
+@Deprecated
+public class ChainedServiceFilterFactory extends CombinedServiceFilterFactory {
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilter.java b/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilter.java
similarity index 86%
copy from camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilter.java
copy to camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilter.java
index caeebbc..7fd5016 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilter.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilter.java
@@ -24,11 +24,11 @@ import java.util.List;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.cloud.ServiceFilter;
-public class ChainedServiceFilter implements ServiceFilter {
+public class CombinedServiceFilter implements ServiceFilter {
private final List<ServiceFilter> delegates;
private final int delegatesSize;
- public ChainedServiceFilter(List<ServiceFilter> delegates) {
+ public CombinedServiceFilter(List<ServiceFilter> delegates) {
this.delegates = Collections.unmodifiableList(new ArrayList<>(delegates));
this.delegatesSize = this.delegates.size();
}
@@ -51,7 +51,7 @@ public class ChainedServiceFilter implements ServiceFilter {
// Helpers
// **********************
- public static ChainedServiceFilter wrap(ServiceFilter... delegates) {
- return new ChainedServiceFilter(Arrays.asList(delegates));
+ public static CombinedServiceFilter wrap(ServiceFilter... delegates) {
+ return new CombinedServiceFilter(Arrays.asList(delegates));
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilterFactory.java b/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java
similarity index 91%
copy from camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilterFactory.java
copy to camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java
index 15c9af7..bce36d6 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/cloud/ChainedServiceFilterFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cloud/CombinedServiceFilterFactory.java
@@ -23,10 +23,10 @@ import org.apache.camel.cloud.ServiceFilter;
import org.apache.camel.cloud.ServiceFilterFactory;
import org.apache.camel.util.ObjectHelper;
-public class ChainedServiceFilterFactory implements ServiceFilterFactory {
+public class CombinedServiceFilterFactory implements ServiceFilterFactory {
private List<ServiceFilter> serviceFilterList;
- public ChainedServiceFilterFactory() {
+ public CombinedServiceFilterFactory() {
}
// *************************************************************************
@@ -49,6 +49,6 @@ public class ChainedServiceFilterFactory implements ServiceFilterFactory {
public ServiceFilter newInstance(CamelContext camelContext) throws Exception {
ObjectHelper.notNull(serviceFilterList, "ServiceFilter list");
- return new ChainedServiceFilter(serviceFilterList);
+ return new CombinedServiceFilter(serviceFilterList);
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ChainedServiceCallServiceFilterConfiguration.java b/camel-core/src/main/java/org/apache/camel/model/cloud/ChainedServiceCallServiceFilterConfiguration.java
index e6e2ff3..8a87bef 100644
--- a/camel-core/src/main/java/org/apache/camel/model/cloud/ChainedServiceCallServiceFilterConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/model/cloud/ChainedServiceCallServiceFilterConfiguration.java
@@ -16,123 +16,54 @@
*/
package org.apache.camel.model.cloud;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.camel.CamelContext;
import org.apache.camel.cloud.ServiceFilter;
import org.apache.camel.spi.Metadata;
+/**
+ * @deprecated use {@link CombinedServiceCallServiceFilterConfiguration}
+ */
+@Deprecated
@Metadata(label = "routing,cloud,service-filter")
@XmlRootElement(name = "multiServiceFilter")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ChainedServiceCallServiceFilterConfiguration extends ServiceCallServiceFilterConfiguration {
- @XmlElements({
- @XmlElement(name = "blacklistServiceFilter", type = BlacklistServiceCallServiceFilterConfiguration.class),
- @XmlElement(name = "customServiceFilter", type = CustomServiceCallServiceFilterConfiguration.class),
- @XmlElement(name = "healthyServiceFilter", type = HealthyServiceCallServiceFilterConfiguration.class),
- @XmlElement(name = "passThroughServiceFilter", type = PassThroughServiceCallServiceFilterConfiguration.class) }
- )
- private List<ServiceCallServiceFilterConfiguration> serviceFilterConfigurations;
-
+public class ChainedServiceCallServiceFilterConfiguration extends CombinedServiceCallServiceFilterConfiguration {
public ChainedServiceCallServiceFilterConfiguration() {
- this(null);
+ super(null);
}
public ChainedServiceCallServiceFilterConfiguration(ServiceCallDefinition parent) {
- super(parent, "chained-service-filter");
- }
-
- // *************************************************************************
- // Properties
- // *************************************************************************
-
- public List<ServiceCallServiceFilterConfiguration> getServiceFilterConfigurations() {
- return serviceFilterConfigurations;
- }
-
- /**
- * List of ServiceFilter configuration to use
- * @param serviceFilterConfigurations
- */
- public void setServiceFilterConfigurations(List<ServiceCallServiceFilterConfiguration> serviceFilterConfigurations) {
- this.serviceFilterConfigurations = serviceFilterConfigurations;
- }
-
- /**
- * Add a ServiceFilter configuration
- */
- public void addServiceFilterConfiguration(ServiceCallServiceFilterConfiguration serviceFilterConfiguration) {
- if (serviceFilterConfigurations == null) {
- serviceFilterConfigurations = new ArrayList<>();
- }
-
- serviceFilterConfigurations.add(serviceFilterConfiguration);
- }
-
- // *************************************************************************
- // Fluent API
- // *************************************************************************
-
- /**
- * List of ServiceFilter configuration to use
- */
- public ChainedServiceCallServiceFilterConfiguration serviceFilterConfigurations(List<ServiceCallServiceFilterConfiguration> serviceFilterConfigurations) {
- setServiceFilterConfigurations(serviceFilterConfigurations);
- return this;
- }
-
- /**
- * Add a ServiceFilter configuration
- */
- public ChainedServiceCallServiceFilterConfiguration serviceFilterConfiguration(ServiceCallServiceFilterConfiguration serviceFilterConfiguration) {
- addServiceFilterConfiguration(serviceFilterConfiguration);
- return this;
+ super(parent);
}
// *****************************
// Shortcuts - ServiceFilter
// *****************************
+ @Override
public ChainedServiceCallServiceFilterConfiguration healthy() {
addServiceFilterConfiguration(new HealthyServiceCallServiceFilterConfiguration());
return this;
}
+ @Override
public ChainedServiceCallServiceFilterConfiguration passThrough() {
addServiceFilterConfiguration(new PassThroughServiceCallServiceFilterConfiguration());
return this;
}
+ @Override
public ChainedServiceCallServiceFilterConfiguration custom(String serviceFilter) {
addServiceFilterConfiguration(new CustomServiceCallServiceFilterConfiguration().serviceFilter(serviceFilter));
return this;
}
+ @Override
public ChainedServiceCallServiceFilterConfiguration custom(ServiceFilter serviceFilter) {
addServiceFilterConfiguration(new CustomServiceCallServiceFilterConfiguration().serviceFilter(serviceFilter));
return this;
}
-
- // *************************************************************************
- // Utilities
- // *************************************************************************
-
- @Override
- protected void postProcessFactoryParameters(final CamelContext camelContext, final Map<String, Object> parameters) throws Exception {
- if (serviceFilterConfigurations != null && !serviceFilterConfigurations.isEmpty()) {
- List<ServiceFilter> discoveries = new ArrayList<>(serviceFilterConfigurations.size());
- for (ServiceCallServiceFilterConfiguration conf : serviceFilterConfigurations) {
- discoveries.add(conf.newInstance(camelContext));
- }
-
- parameters.put("serviceFilterList", discoveries);
- }
- }
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ChainedServiceCallServiceFilterConfiguration.java b/camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
similarity index 83%
copy from camel-core/src/main/java/org/apache/camel/model/cloud/ChainedServiceCallServiceFilterConfiguration.java
copy to camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
index e6e2ff3..9332693 100644
--- a/camel-core/src/main/java/org/apache/camel/model/cloud/ChainedServiceCallServiceFilterConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/model/cloud/CombinedServiceCallServiceFilterConfiguration.java
@@ -30,9 +30,9 @@ import org.apache.camel.cloud.ServiceFilter;
import org.apache.camel.spi.Metadata;
@Metadata(label = "routing,cloud,service-filter")
-@XmlRootElement(name = "multiServiceFilter")
+@XmlRootElement(name = "combinedServiceFilter")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ChainedServiceCallServiceFilterConfiguration extends ServiceCallServiceFilterConfiguration {
+public class CombinedServiceCallServiceFilterConfiguration extends ServiceCallServiceFilterConfiguration {
@XmlElements({
@XmlElement(name = "blacklistServiceFilter", type = BlacklistServiceCallServiceFilterConfiguration.class),
@XmlElement(name = "customServiceFilter", type = CustomServiceCallServiceFilterConfiguration.class),
@@ -41,12 +41,12 @@ public class ChainedServiceCallServiceFilterConfiguration extends ServiceCallSer
)
private List<ServiceCallServiceFilterConfiguration> serviceFilterConfigurations;
- public ChainedServiceCallServiceFilterConfiguration() {
+ public CombinedServiceCallServiceFilterConfiguration() {
this(null);
}
- public ChainedServiceCallServiceFilterConfiguration(ServiceCallDefinition parent) {
- super(parent, "chained-service-filter");
+ public CombinedServiceCallServiceFilterConfiguration(ServiceCallDefinition parent) {
+ super(parent, "combined-service-filter");
}
// *************************************************************************
@@ -83,7 +83,7 @@ public class ChainedServiceCallServiceFilterConfiguration extends ServiceCallSer
/**
* List of ServiceFilter configuration to use
*/
- public ChainedServiceCallServiceFilterConfiguration serviceFilterConfigurations(List<ServiceCallServiceFilterConfiguration> serviceFilterConfigurations) {
+ public CombinedServiceCallServiceFilterConfiguration serviceFilterConfigurations(List<ServiceCallServiceFilterConfiguration> serviceFilterConfigurations) {
setServiceFilterConfigurations(serviceFilterConfigurations);
return this;
}
@@ -91,7 +91,7 @@ public class ChainedServiceCallServiceFilterConfiguration extends ServiceCallSer
/**
* Add a ServiceFilter configuration
*/
- public ChainedServiceCallServiceFilterConfiguration serviceFilterConfiguration(ServiceCallServiceFilterConfiguration serviceFilterConfiguration) {
+ public CombinedServiceCallServiceFilterConfiguration serviceFilterConfiguration(ServiceCallServiceFilterConfiguration serviceFilterConfiguration) {
addServiceFilterConfiguration(serviceFilterConfiguration);
return this;
}
@@ -100,22 +100,22 @@ public class ChainedServiceCallServiceFilterConfiguration extends ServiceCallSer
// Shortcuts - ServiceFilter
// *****************************
- public ChainedServiceCallServiceFilterConfiguration healthy() {
+ public CombinedServiceCallServiceFilterConfiguration healthy() {
addServiceFilterConfiguration(new HealthyServiceCallServiceFilterConfiguration());
return this;
}
- public ChainedServiceCallServiceFilterConfiguration passThrough() {
+ public CombinedServiceCallServiceFilterConfiguration passThrough() {
addServiceFilterConfiguration(new PassThroughServiceCallServiceFilterConfiguration());
return this;
}
- public ChainedServiceCallServiceFilterConfiguration custom(String serviceFilter) {
+ public CombinedServiceCallServiceFilterConfiguration custom(String serviceFilter) {
addServiceFilterConfiguration(new CustomServiceCallServiceFilterConfiguration().serviceFilter(serviceFilter));
return this;
}
- public ChainedServiceCallServiceFilterConfiguration custom(ServiceFilter serviceFilter) {
+ public CombinedServiceCallServiceFilterConfiguration custom(ServiceFilter serviceFilter) {
addServiceFilterConfiguration(new CustomServiceCallServiceFilterConfiguration().serviceFilter(serviceFilter));
return this;
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
index abd1eb4..f533665 100644
--- a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallConfigurationDefinition.java
@@ -82,6 +82,7 @@ public class ServiceCallConfigurationDefinition extends IdentifiedType {
@XmlElements({
@XmlElement(name = "blacklistServiceFilter", type = BlacklistServiceCallServiceFilterConfiguration.class),
@XmlElement(name = "chainedServiceFilter", type = ChainedServiceCallServiceFilterConfiguration.class),
+ @XmlElement(name = "combinedServiceFilter", type = CombinedServiceCallServiceFilterConfiguration.class),
@XmlElement(name = "customServiceFilter", type = CustomServiceCallServiceFilterConfiguration.class),
@XmlElement(name = "healthyServiceFilter", type = HealthyServiceCallServiceFilterConfiguration.class),
@XmlElement(name = "passThroughServiceFilter", type = PassThroughServiceCallServiceFilterConfiguration.class)}
@@ -605,6 +606,13 @@ public class ServiceCallConfigurationDefinition extends IdentifiedType {
return conf;
}
+ public CombinedServiceCallServiceFilterConfiguration combinedFilter() {
+ CombinedServiceCallServiceFilterConfiguration conf = new CombinedServiceCallServiceFilterConfiguration();
+ setServiceFilterConfiguration(conf);
+
+ return conf;
+ }
+
public BlacklistServiceCallServiceFilterConfiguration blacklistFilter() {
BlacklistServiceCallServiceFilterConfiguration conf = new BlacklistServiceCallServiceFilterConfiguration();
setServiceFilterConfiguration(conf);
diff --git a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
index 74ee07d..3f29ddd 100644
--- a/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/cloud/ServiceCallDefinition.java
@@ -111,6 +111,7 @@ public class ServiceCallDefinition extends NoOutputDefinition<ServiceCallDefinit
@XmlElements({
@XmlElement(name = "blacklistServiceFilter", type = BlacklistServiceCallServiceFilterConfiguration.class),
@XmlElement(name = "chainedServiceFilter", type = ChainedServiceCallServiceFilterConfiguration.class),
+ @XmlElement(name = "combinedServiceFilter", type = CombinedServiceCallServiceFilterConfiguration.class),
@XmlElement(name = "customServiceFilter", type = CustomServiceCallServiceFilterConfiguration.class),
@XmlElement(name = "healthyServiceFilter", type = HealthyServiceCallServiceFilterConfiguration.class),
@XmlElement(name = "passThroughServiceFilter", type = PassThroughServiceCallServiceFilterConfiguration.class)}
@@ -694,6 +695,13 @@ public class ServiceCallDefinition extends NoOutputDefinition<ServiceCallDefinit
return conf;
}
+ public CombinedServiceCallServiceFilterConfiguration combinedFilter() {
+ CombinedServiceCallServiceFilterConfiguration conf = new CombinedServiceCallServiceFilterConfiguration(this);
+ setServiceFilterConfiguration(conf);
+
+ return conf;
+ }
+
public BlacklistServiceCallServiceFilterConfiguration blacklistFilter() {
BlacklistServiceCallServiceFilterConfiguration conf = new BlacklistServiceCallServiceFilterConfiguration();
setServiceFilterConfiguration(conf);
diff --git a/camel-core/src/main/resources/META-INF/services/org/apache/camel/cloud/combined-service-filter b/camel-core/src/main/resources/META-INF/services/org/apache/camel/cloud/combined-service-filter
new file mode 100644
index 0000000..68cdfc2
--- /dev/null
+++ b/camel-core/src/main/resources/META-INF/services/org/apache/camel/cloud/combined-service-filter
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+class=org.apache.camel.impl.cloud.CombinedServiceFilterFactory
\ No newline at end of file
diff --git a/camel-core/src/main/resources/org/apache/camel/model/cloud/jaxb.index b/camel-core/src/main/resources/org/apache/camel/model/cloud/jaxb.index
index fb41af7..6be045a 100644
--- a/camel-core/src/main/resources/org/apache/camel/model/cloud/jaxb.index
+++ b/camel-core/src/main/resources/org/apache/camel/model/cloud/jaxb.index
@@ -22,6 +22,7 @@ ServiceCallServiceChooserConfiguration
ServiceCallServiceLoadBalancerConfiguration
BlacklistServiceCallServiceFilterConfiguration
ChainedServiceCallServiceFilterConfiguration
+CombinedServiceCallServiceFilterConfiguration
PassThroughServiceCallServiceFilterConfiguration
CachingServiceCallServiceDiscoveryConfiguration
ConsulServiceCallServiceDiscoveryConfiguration
diff --git a/camel-core/src/test/java/org/apache/camel/impl/cloud/ChainedServiceFilterTest.java b/camel-core/src/test/java/org/apache/camel/impl/cloud/CombinedServiceFilterTest.java
similarity index 84%
rename from camel-core/src/test/java/org/apache/camel/impl/cloud/ChainedServiceFilterTest.java
rename to camel-core/src/test/java/org/apache/camel/impl/cloud/CombinedServiceFilterTest.java
index adfb325..651fd4e 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/cloud/ChainedServiceFilterTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/cloud/CombinedServiceFilterTest.java
@@ -22,19 +22,19 @@ import java.util.stream.Collectors;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.cloud.ServiceDefinition;
-import org.apache.camel.model.cloud.ChainedServiceCallServiceFilterConfiguration;
+import org.apache.camel.model.cloud.CombinedServiceCallServiceFilterConfiguration;
import org.junit.Assert;
import org.junit.Test;
-public class ChainedServiceFilterTest extends ContextTestSupport {
+public class CombinedServiceFilterTest extends ContextTestSupport {
@Test
public void testMultiServiceFilterConfiguration() throws Exception {
- ChainedServiceCallServiceFilterConfiguration conf =
- new ChainedServiceCallServiceFilterConfiguration()
+ CombinedServiceCallServiceFilterConfiguration conf =
+ new CombinedServiceCallServiceFilterConfiguration()
.healthy()
.passThrough();
- ChainedServiceFilter filter = (ChainedServiceFilter)conf.newInstance(context);
+ CombinedServiceFilter filter = (CombinedServiceFilter)conf.newInstance(context);
Assert.assertEquals(2, filter.getDelegates().size());
Assert.assertTrue(filter.getDelegates().get(0) instanceof HealthyServiceFilter);
Assert.assertTrue(filter.getDelegates().get(1) instanceof PassThroughServiceFilter);
@@ -43,8 +43,8 @@ public class ChainedServiceFilterTest extends ContextTestSupport {
@Test
public void testMultiServiceFilter() throws Exception {
- ChainedServiceCallServiceFilterConfiguration conf =
- new ChainedServiceCallServiceFilterConfiguration()
+ CombinedServiceCallServiceFilterConfiguration conf =
+ new CombinedServiceCallServiceFilterConfiguration()
.healthy()
.custom(services -> services.stream().filter(s -> s.getPort() < 2000).collect(Collectors.toList())
);
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java
index 3f8928b..5a76911 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java
@@ -20,17 +20,17 @@ import java.util.List;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.cloud.ServiceFilter;
-import org.apache.camel.impl.cloud.ChainedServiceFilter;
+import org.apache.camel.impl.cloud.CombinedServiceFilter;
public class CamelCloudServiceFilter implements ServiceFilter {
- private final ChainedServiceFilter serviceFilter;
+ private final CombinedServiceFilter serviceFilter;
- public CamelCloudServiceFilter(List<ServiceFilter> blacklistServiceFilter) {
- this.serviceFilter = new ChainedServiceFilter(blacklistServiceFilter);
+ public CamelCloudServiceFilter(List<ServiceFilter> serviceFilterList) {
+ this.serviceFilter = new CombinedServiceFilter(serviceFilterList);
}
@Override
- public List<ServiceDefinition> apply(List<ServiceDefinition> serviceDefinitions) {
- return this.serviceFilter.apply(serviceDefinitions);
+ public List<ServiceDefinition> apply(List<ServiceDefinition> serviceDefinitionList) {
+ return this.serviceFilter.apply(serviceDefinitionList);
}
}
--
To stop receiving notification emails like this one, please contact
lburgazzoli@apache.org.