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 2022/12/12 06:06:15 UTC
[camel] branch main updated: (chores) replace raw empty collections by generic one (#8880)
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 91b73784025 (chores) replace raw empty collections by generic one (#8880)
91b73784025 is described below
commit 91b73784025b697247250bc1ee27c0153e5d8746
Author: Gilvan Filho <gi...@gmail.com>
AuthorDate: Mon Dec 12 03:06:09 2022 -0300
(chores) replace raw empty collections by generic one (#8880)
* (chores) camel-api: replace raw empty map by generic one
* (chores) camel-base-engine: replace raw empty collections by generic one
* (chores) camel-base: replace raw empty list by generic one
* (chores) camel-util: replace raw empty list by generic one
* (chores) camel-kamelet-main: replace raw empty list by generic one
* (chores) camel-package-maven-plugin: replace raw empty set by generic one
---
.../camel-api/src/main/java/org/apache/camel/cloud/ServiceHealth.java | 2 +-
.../main/java/org/apache/camel/impl/engine/AbstractCamelContext.java | 2 +-
.../java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java | 2 +-
.../org/apache/camel/impl/engine/ProvisionalEndpointRegistry.java | 2 +-
.../org/apache/camel/component/properties/PropertiesComponent.java | 3 +--
core/camel-util/src/main/java/org/apache/camel/util/OgnlHelper.java | 2 +-
core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java | 3 +--
.../apache/camel/main/download/KnownKameletRoutesBuilderLoader.java | 2 +-
.../org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java | 4 ++--
9 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceHealth.java b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceHealth.java
index 82a56f8ed70..c07ddd7158b 100644
--- a/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceHealth.java
+++ b/core/camel-api/src/main/java/org/apache/camel/cloud/ServiceHealth.java
@@ -27,7 +27,7 @@ public interface ServiceHealth {
* Gets a key/value metadata associated with the service.
*/
default Map<String, String> getMetadata() {
- return Collections.EMPTY_MAP;
+ return Collections.emptyMap();
}
/**
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index ef709b935de..031302fa49a 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -1687,7 +1687,7 @@ public abstract class AbstractCamelContext extends BaseService
@SuppressWarnings("unchecked")
public <T> Set<T> hasServices(Class<T> type) {
if (servicesToStop.isEmpty()) {
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
Set<T> set = new HashSet<>();
for (Service service : servicesToStop) {
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java
index c08ef1a178c..aeb6def207b 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractDynamicRegistry.java
@@ -189,7 +189,7 @@ public class AbstractDynamicRegistry<K, V> extends AbstractMap<K, V> implements
public Collection<V> getReadOnlyValues() {
if (isEmpty()) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
// we want to avoid any kind of locking in get/put methods
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/ProvisionalEndpointRegistry.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/ProvisionalEndpointRegistry.java
index 717268dbcf0..58afd9dc115 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/ProvisionalEndpointRegistry.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/ProvisionalEndpointRegistry.java
@@ -81,7 +81,7 @@ class ProvisionalEndpointRegistry extends HashMap<NormalizedUri, Endpoint> imple
@Override
public Collection<Endpoint> getReadOnlyValues() {
if (isEmpty()) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
// we want to avoid any kind of locking in get/put methods
diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
index f2ea6628935..ecbe3f1269f 100644
--- a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
@@ -329,10 +329,9 @@ public class PropertiesComponent extends ServiceSupport
}
@Override
- @SuppressWarnings("unchecked")
public List<String> getLocations() {
if (locations.isEmpty()) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
} else {
return locations.stream().map(PropertiesLocation::toString).collect(Collectors.toList());
}
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/OgnlHelper.java b/core/camel-util/src/main/java/org/apache/camel/util/OgnlHelper.java
index 417a62522cc..d97d8b5a600 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/OgnlHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/OgnlHelper.java
@@ -183,7 +183,7 @@ public final class OgnlHelper {
public static List<String> splitOgnl(String ognl) {
// return an empty list if ognl is empty
if (ognl == null || ognl.isEmpty() || ognl.trim().isEmpty()) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
List<String> methods = new ArrayList<>(4);
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
index e71c9458737..79862603bdc 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URIScanner.java
@@ -199,10 +199,9 @@ class URIScanner {
}
}
- @SuppressWarnings("unchecked")
public static List<Pair<Integer>> scanRaw(String str) {
if (str == null || ObjectHelper.isEmpty(str)) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
List<Pair<Integer>> answer = new ArrayList<>();
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownKameletRoutesBuilderLoader.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownKameletRoutesBuilderLoader.java
index 852bb4e6c5a..6f957cb1ce5 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownKameletRoutesBuilderLoader.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/KnownKameletRoutesBuilderLoader.java
@@ -76,6 +76,6 @@ public class KnownKameletRoutesBuilderLoader extends KameletRoutesBuilderLoader
}
}
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index a660809db55..de85e02121c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -572,7 +572,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
if (!Strings.isNullOrEmpty(apiName)) {
final UriParams uriParams = classElement.getAnnotation(UriParams.class);
String extraPrefix = uriParams != null ? uriParams.prefix() : "";
- findClassProperties(componentModel, classElement, Collections.EMPTY_SET, extraPrefix,
+ findClassProperties(componentModel, classElement, Collections.emptySet(), extraPrefix,
null, null, false);
}
}
@@ -956,7 +956,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
}
nestedTypeName = fieldTypeName;
nestedFieldName = fieldElement.getName();
- findClassProperties(componentModel, fieldTypeElement, Collections.EMPTY_SET, nestedPrefix,
+ findClassProperties(componentModel, fieldTypeElement, Collections.emptySet(), nestedPrefix,
nestedTypeName, nestedFieldName, true);
nestedTypeName = null;
nestedFieldName = null;