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 2023/04/05 12:31:11 UTC
[camel] branch main updated: Reacted on inspection "subsequent calls can be fused into Stream API chain" (#9822)
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.git
The following commit(s) were added to refs/heads/main by this push:
new eb2b1636b6f Reacted on inspection "subsequent calls can be fused into Stream API chain" (#9822)
eb2b1636b6f is described below
commit eb2b1636b6f11ea664ca18f75128729decf0b3ab
Author: dk2k <dk...@users.noreply.github.com>
AuthorDate: Wed Apr 5 15:31:03 2023 +0300
Reacted on inspection "subsequent calls can be fused into Stream API chain" (#9822)
Co-authored-by: dk2k <dk...@ya.ru>
---
.../component/salesforce/api/dto/composite/SObjectBatch.java | 10 ++++------
.../salesforce/api/dto/composite/SObjectComposite.java | 10 +++-------
.../component/salesforce/api/dto/composite/SObjectTree.java | 5 +----
.../component/zookeeper/ZooKeeperCuratorConfiguration.java | 3 +--
.../apache/camel/impl/engine/DefaultInflightRepository.java | 3 +--
.../org/apache/camel/impl/cloud/StaticServiceDiscovery.java | 8 +++-----
.../org/apache/camel/catalog/impl/AbstractCamelCatalog.java | 11 ++++-------
.../camel/component/extension/verifier/ResultErrorHelper.java | 4 ++--
.../org/apache/camel/support/component/ApiCollection.java | 8 +++-----
9 files changed, 22 insertions(+), 40 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatch.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatch.java
index bfcdf2627d2..03f0d667971 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatch.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectBatch.java
@@ -23,7 +23,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -350,12 +349,11 @@ public final class SObjectBatch implements Serializable {
* @return all object types in this batch
*/
public Class[] objectTypes() {
- final Set<Class<?>> types = Stream
- .concat(Stream.of(SObjectBatch.class, BatchRequest.class),
- batchRequests.stream().map(BatchRequest::getRichInput).filter(Objects::nonNull).map(Object::getClass))
- .collect(Collectors.toSet());
- return types.toArray(new Class[types.size()]);
+ return Stream
+ .concat(Stream.of(SObjectBatch.class, BatchRequest.class),
+ batchRequests.stream().map(BatchRequest::getRichInput).filter(Objects::nonNull)
+ .map(Object::getClass)).distinct().toArray(Class[]::new);
}
void addBatchRequest(final BatchRequest batchRequest) {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectComposite.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectComposite.java
index 6ef51627b7a..28b3be0b429 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectComposite.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectComposite.java
@@ -24,8 +24,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -340,13 +338,11 @@ public final class SObjectComposite implements Serializable {
*/
@SuppressWarnings("rawtypes")
public Class[] objectTypes() {
- final Set<Class<?>> types = Stream
+
+ return Stream
.concat(Stream.of(SObjectComposite.class, BatchRequest.class),
compositeRequests.stream().map(CompositeRequest::getBody).filter(Objects::nonNull)
- .map(Object::getClass))
- .collect(Collectors.toSet());
-
- return types.toArray(new Class[types.size()]);
+ .map(Object::getClass)).distinct().toArray(Class[]::new);
}
void addCompositeRequest(final CompositeRequest compositeRequest) {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectTree.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectTree.java
index 41dfb41358c..2e77cdb6c16 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectTree.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/composite/SObjectTree.java
@@ -27,9 +27,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
-import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
@@ -152,9 +150,8 @@ public final class SObjectTree implements Serializable {
}
public Class[] objectTypes() {
- final Set<Class> types = records.stream().flatMap(n -> n.objectTypes()).collect(Collectors.toSet());
- return types.toArray(new Class[types.size()]);
+ return records.stream().flatMap(SObjectNode::objectTypes).distinct().toArray(Class[]::new);
}
/**
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperCuratorConfiguration.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperCuratorConfiguration.java
index 193bb5e908d..73e3a82a77c 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperCuratorConfiguration.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperCuratorConfiguration.java
@@ -84,8 +84,7 @@ public class ZooKeeperCuratorConfiguration implements Cloneable {
}
public void setNodes(String nodes) {
- this.nodes = Collections.unmodifiableList(
- Arrays.stream(nodes.split(",")).collect(Collectors.toList()));
+ this.nodes = Arrays.stream(nodes.split(",")).collect(Collectors.toUnmodifiableList());
}
public void setNodes(List<String> nodes) {
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
index 6e18bde5398..212e59309cf 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java
@@ -160,8 +160,7 @@ public class DefaultInflightRepository extends ServiceSupport implements Infligh
values = values.limit(limit);
}
- List<InflightExchange> answer = values.map(InflightExchangeEntry::new).collect(Collectors.toList());
- return Collections.unmodifiableCollection(answer);
+ return values.map(InflightExchangeEntry::new).collect(Collectors.toUnmodifiableList());
}
@Override
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 ea2642ca07c..c4cc582a3bb 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
@@ -18,7 +18,6 @@ package org.apache.camel.impl.cloud;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.function.Predicate;
@@ -105,10 +104,9 @@ public class StaticServiceDiscovery extends DefaultServiceDiscovery {
@Override
public List<ServiceDefinition> getServices(String name) {
- return Collections.unmodifiableList(
- services.stream()
- .filter(s -> Objects.isNull(s.getName()) || Objects.equals(name, s.getName()))
- .collect(Collectors.toList()));
+ return services.stream()
+ .filter(s -> Objects.isNull(s.getName()) || Objects.equals(name, s.getName()))
+ .collect(Collectors.toUnmodifiableList());
}
// *************************************************************************
diff --git a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
index ff14fb7d358..2f76f063e91 100644
--- a/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
+++ b/core/camel-core-catalog/src/main/java/org/apache/camel/catalog/impl/AbstractCamelCatalog.java
@@ -357,8 +357,7 @@ public abstract class AbstractCamelCatalog {
ApiModel api = model.getApiOptions().stream().filter(o -> o.getName().equalsIgnoreCase(key1)).findFirst().orElse(null);
if (api == null) {
result.addInvalidEnum(apiSyntax[0], key1);
- List<String> choices = model.getApiOptions().stream().map(ApiModel::getName).collect(Collectors.toList());
- result.addInvalidEnumChoices(apiSyntax[0], choices.toArray(new String[choices.size()]));
+ result.addInvalidEnumChoices(apiSyntax[0], model.getApiOptions().stream().map(ApiModel::getName).toArray(String[]::new));
} else {
// walk each method and match against its name/alias
boolean found = false;
@@ -371,7 +370,8 @@ public abstract class AbstractCamelCatalog {
}
if (!found) {
result.addInvalidEnum(apiSyntax[1], key2);
- List<String> choices = api.getMethods().stream()
+
+ result.addInvalidEnumChoices(apiSyntax[1], api.getMethods().stream()
.map(m -> {
// favour using method alias in choices
String answer = apiMethodAlias(api, m);
@@ -379,10 +379,7 @@ public abstract class AbstractCamelCatalog {
answer = m.getName();
}
return answer;
- })
- .collect(Collectors.toList());
-
- result.addInvalidEnumChoices(apiSyntax[1], choices.toArray(new String[choices.size()]));
+ }).toArray(String[]::new));
}
}
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/ResultErrorHelper.java b/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/ResultErrorHelper.java
index 63ad08edde9..6552ce716cc 100644
--- a/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/ResultErrorHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/component/extension/verifier/ResultErrorHelper.java
@@ -154,8 +154,8 @@ public final class ResultErrorHelper {
}
static Set<String> parameters(final Set<String> options) {
- final Set<String> withoutExclusionMark = options.stream().map(o -> o.replaceFirst("!", "")).collect(Collectors.toSet());
- return new TreeSet<>(withoutExclusionMark);
+ return options.stream().map(o -> o.replaceFirst("!", ""))
+ .collect(Collectors.toCollection(TreeSet::new));
}
}
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/ApiCollection.java b/core/camel-support/src/main/java/org/apache/camel/support/component/ApiCollection.java
index 13687a70ca7..ccf63a985c2 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/ApiCollection.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/ApiCollection.java
@@ -72,11 +72,9 @@ public abstract class ApiCollection<E extends Enum<E> & ApiName, T> {
protected final void setApiHelpers(Map<E, ApiMethodHelper<? extends ApiMethod>> apiHelpers) {
this.apiHelpers = Collections.unmodifiableMap(apiHelpers);
- this.apiNames = Collections.unmodifiableSet(
- apiHelpers.keySet()
- .stream()
- .map(api -> api.getName())
- .collect(Collectors.toSet()));
+ this.apiNames = apiHelpers.keySet()
+ .stream()
+ .map(ApiName::getName).collect(Collectors.toUnmodifiableSet());
}
protected final void setApiMethods(Map<Class<? extends ApiMethod>, E> apiMethods) {