You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/05/19 14:53:32 UTC
[camel] 04/11: (chores) camel-cloud: use unmodifiable list when possible
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a213b16d047ef06d3b38c106f4e51ec2b6e70dfe
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri May 19 15:11:08 2023 +0200
(chores) camel-cloud: use unmodifiable list when possible
---
.../main/java/org/apache/camel/impl/cloud/BlacklistServiceFilter.java | 4 +---
.../java/org/apache/camel/impl/cloud/CombinedServiceDiscovery.java | 3 +--
.../main/java/org/apache/camel/impl/cloud/HealthyServiceFilter.java | 3 +--
.../main/java/org/apache/camel/impl/cloud/StaticServiceDiscovery.java | 3 +--
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilter.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilter.java
index 12e7780f988..709bda5e30b 100644
--- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilter.java
+++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/BlacklistServiceFilter.java
@@ -21,7 +21,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.function.Predicate;
-import java.util.stream.Collectors;
import org.apache.camel.Exchange;
import org.apache.camel.cloud.ServiceDefinition;
@@ -86,8 +85,7 @@ public class BlacklistServiceFilter implements ServiceFilter {
@Override
public List<ServiceDefinition> apply(Exchange exchange, List<ServiceDefinition> services) {
return services.stream().filter(
- s -> this.services.stream().noneMatch(b -> b.matches(s))).collect(
- Collectors.toList());
+ s -> this.services.stream().noneMatch(b -> b.matches(s))).toList();
}
List<ServiceDefinition> getBlacklistedServices() {
diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscovery.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscovery.java
index 7d1b297a5eb..e8488122ed0 100644
--- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscovery.java
+++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/CombinedServiceDiscovery.java
@@ -19,7 +19,6 @@ package org.apache.camel.impl.cloud;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import java.util.stream.Collectors;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.cloud.ServiceDiscovery;
@@ -39,7 +38,7 @@ public class CombinedServiceDiscovery implements ServiceDiscovery {
public List<ServiceDefinition> getServices(String name) {
return delegates.stream()
.flatMap(d -> d.getServices(name).stream())
- .collect(Collectors.toList());
+ .toList();
}
// **********************
diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilter.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilter.java
index 19c9c15e243..8a0f741020b 100644
--- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilter.java
+++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/HealthyServiceFilter.java
@@ -17,7 +17,6 @@
package org.apache.camel.impl.cloud;
import java.util.List;
-import java.util.stream.Collectors;
import org.apache.camel.Exchange;
import org.apache.camel.cloud.ServiceDefinition;
@@ -26,6 +25,6 @@ import org.apache.camel.cloud.ServiceFilter;
public class HealthyServiceFilter implements ServiceFilter {
@Override
public List<ServiceDefinition> apply(Exchange exchange, List<ServiceDefinition> services) {
- return services.stream().filter(s -> s.getHealth().isHealthy()).collect(Collectors.toList());
+ return services.stream().filter(s -> s.getHealth().isHealthy()).toList();
}
}
diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscovery.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscovery.java
index c4cc582a3bb..a836577dcc8 100644
--- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscovery.java
+++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/StaticServiceDiscovery.java
@@ -21,7 +21,6 @@ import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.function.Predicate;
-import java.util.stream.Collectors;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.util.ObjectHelper;
@@ -106,7 +105,7 @@ public class StaticServiceDiscovery extends DefaultServiceDiscovery {
public List<ServiceDefinition> getServices(String name) {
return services.stream()
.filter(s -> Objects.isNull(s.getName()) || Objects.equals(name, s.getName()))
- .collect(Collectors.toUnmodifiableList());
+ .toList();
}
// *************************************************************************