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
The following commit(s) were added to refs/heads/main by this push: new 9a803f3bed1 (chores) camel-tooling: use unmodifiable lists when possible (#11396) 9a803f3bed1 is described below commit 9a803f3bed1921899a959bd253a1052405a78517 Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com> AuthorDate: Thu Sep 14 13:39:14 2023 +0200 (chores) camel-tooling: use unmodifiable lists when possible (#11396) --- .../org/apache/camel/tooling/util/PackageHelperTest.java | 3 +-- .../org/apache/camel/maven/AbstractGeneratorMojoTest.java | 2 +- .../apache/camel/maven/packaging/AbstractGenerateMojo.java | 2 +- .../camel/maven/packaging/EndpointSchemaGeneratorMojo.java | 14 +++++++------- .../camel/maven/packaging/ModelXmlParserGeneratorMojo.java | 6 +++--- .../apache/camel/maven/packaging/PackageJandexMojo.java | 4 ++-- .../org/apache/camel/maven/packaging/PackageModelMojo.java | 3 +-- .../apache/camel/maven/packaging/PrepareCatalogMojo.java | 4 ++-- .../org/apache/camel/maven/packaging/SpiGeneratorMojo.java | 3 +-- .../camel/maven/packaging/UpdateSensitizeHelper.java | 3 +-- .../camel/maven/packaging/ValidateComponentMojo.java | 3 +-- .../camel/maven/sync/properties/SyncPropertiesMojo.java | 2 +- 12 files changed, 22 insertions(+), 27 deletions(-) diff --git a/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/PackageHelperTest.java b/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/PackageHelperTest.java index e94f5428323..7054cfe1780 100644 --- a/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/PackageHelperTest.java +++ b/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/PackageHelperTest.java @@ -19,7 +19,6 @@ package org.apache.camel.tooling.util; import java.io.File; import java.nio.file.Path; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.junit.jupiter.api.Test; @@ -43,7 +42,7 @@ public class PackageHelperTest { try (Stream<Path> stream = PackageHelper.findJsonFiles(dir)) { jsonFiles = stream .map(PackageHelper::asName) - .collect(Collectors.toList()); + .toList(); } assertTrue(jsonFiles.contains("a"), "Files a.json must be found"); diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java index f86b266c0e6..922986c10b6 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java @@ -149,7 +149,7 @@ public abstract class AbstractGeneratorMojoTest { private void assertCompileSourceRoots(Supplier<List<String>> roots, File... expectedSources) { List<String> compileSourceRoots = roots.get(); assertEquals(expectedSources.length, compileSourceRoots.size()); - assertEquals(Stream.of(expectedSources).map(File::getAbsolutePath).collect(Collectors.toList()), compileSourceRoots); + assertEquals(Stream.of(expectedSources).map(File::getAbsolutePath).toList(), compileSourceRoots); } } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java index bad462745af..000ee507017 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java @@ -195,7 +195,7 @@ public abstract class AbstractGenerateMojo extends AbstractMojo { try (ZipFile zf = new ZipFile(file)) { return zf.stream().filter(ze -> !ze.isDirectory()) .filter(ze -> ze.getLastModifiedTime().toMillis() > lastmod) - .map(ze -> file + "!" + ze.getName()).collect(Collectors.toList()).stream(); + .map(ze -> file + "!" + ze.getName()).toList().stream(); } catch (IOException e) { throw new IOException("Error reading zip file: " + file, e); } 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 534310c9eaa..ccbc1c14787 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 @@ -720,7 +720,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { Set<String> parentOptionsNames = parentData.getComponentOptions().stream() .map(ComponentOptionModel::getName).collect(Collectors.toSet()); options = componentModel.getComponentOptions().stream().filter(o -> !parentOptionsNames.contains(o.getName())) - .collect(Collectors.toList()); + .toList(); } else { options = componentModel.getComponentOptions(); } @@ -778,7 +778,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { .map(EndpointOptionModel::getName).collect(Collectors.toSet()); options = componentModel.getEndpointParameterOptions().stream() .filter(o -> !parentOptionsNames.contains(o.getName())) - .collect(Collectors.toList()); + .toList(); } else { options = componentModel.getEndpointParameterOptions(); } @@ -906,7 +906,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { // if the component has options with annotations then we only want to generate options that are annotated // as ideally components should favour doing this, so we can control what is an option and what is not - List<Field> fields = Stream.of(classElement.getDeclaredFields()).collect(Collectors.toList()); + List<Field> fields = Stream.of(classElement.getDeclaredFields()).toList(); boolean annotationBasedOptions = fields.stream().anyMatch(f -> f.getAnnotation(Metadata.class) != null) || methods.stream().anyMatch(m -> m.getAnnotation(Metadata.class) != null); @@ -1102,7 +1102,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { List<String> enums = null; if (metadata != null && !Strings.isNullOrEmpty(metadata.enums())) { String[] values = metadata.enums().split(","); - enums = Stream.of(values).map(String::trim).collect(Collectors.toList()); + enums = Stream.of(values).map(String::trim).toList(); } else if (fieldType != null && fieldType.isEnum()) { enums = new ArrayList<>(); for (Object val : fieldType.getEnumConstants()) { @@ -1588,7 +1588,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { private static List<String> gatherEnums(UriParam param, Class<?> fieldTypeElement) { if (!Strings.isNullOrEmpty(param.enums())) { String[] values = param.enums().split(","); - return Stream.of(values).map(String::trim).collect(Collectors.toList()); + return Stream.of(values).map(String::trim).toList(); } else if (fieldTypeElement.isEnum()) { return doGatherFromEnum(fieldTypeElement); } @@ -1599,7 +1599,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { private static List<String> gatherEnums(UriPath path, Class<?> fieldTypeElement) { if (!Strings.isNullOrEmpty(path.enums())) { String[] values = path.enums().split(","); - return Stream.of(values).map(String::trim).collect(Collectors.toList()); + return Stream.of(values).map(String::trim).toList(); } else if (fieldTypeElement.isEnum()) { return doGatherFromEnum(fieldTypeElement); } @@ -1801,7 +1801,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { if (sourceRoots == null) { sourceRoots = project.getCompileSourceRoots().stream() .map(Paths::get) - .collect(Collectors.toList()); + .toList(); } return sourceRoots; } diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java index c2a5c7cb5ed..e62eeea9fd4 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java @@ -275,7 +275,7 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo { // XmlAttribute List<Member> attributeMembers = members.stream().filter(member -> ((AccessibleObject) member).getAnnotation(XmlAttribute.class) != null) - .collect(Collectors.toList()); + .toList(); String baseAttributeHandler = null; for (Class<?> parent = clazz.getSuperclass(); parent != Object.class; parent = parent.getSuperclass()) { if (getMembers(parent).stream() @@ -326,12 +326,12 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo { = members.stream().filter(member -> ((AccessibleObject) member).getAnnotation(XmlAttribute.class) == null) .filter(member -> ((AccessibleObject) member).getAnnotation(XmlAnyAttribute.class) == null) .filter(member -> ((AccessibleObject) member).getAnnotation(XmlValue.class) == null) - .collect(Collectors.toList()); + .toList(); List<Member> multiElements = members.stream() .filter(member -> ((AccessibleObject) member).getAnnotation(XmlElementRef.class) != null || ((AccessibleObject) member).getAnnotation(XmlElements.class) != null || (clazz == outputDefinitionClass && "setOutputs".equals(member.getName()))) - .collect(Collectors.toList()); + .toList(); Map<String, String> expressionHandlersDefs = new LinkedHashMap<>(); Map<String, String> cases = new LinkedHashMap<>(); // to handle elements from external namespaces diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJandexMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJandexMojo.java index a711b69bf64..521fe94eb7c 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJandexMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJandexMojo.java @@ -74,8 +74,8 @@ public class PackageJandexMojo extends AbstractGeneratorMojo { return; } try (Stream<Path> pathStream = Files.walk(classesDirectory.toPath())) { - List<Path> inputs = pathStream.filter(f -> f.getFileName().toString().endsWith(".class")) - .collect(Collectors.toList()); + final List<Path> inputs = pathStream.filter(f -> f.getFileName().toString().endsWith(".class")) + .toList(); if (index.exists()) { if (isUpToDate(inputs)) { return; diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java index a8fd5237478..9001985d3d3 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageModelMojo.java @@ -19,7 +19,6 @@ package org.apache.camel.maven.packaging; import java.io.File; import java.nio.file.Path; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.camel.tooling.util.PackageHelper; @@ -73,7 +72,7 @@ public class PackageModelMojo extends AbstractGeneratorMojo { // strip out .json from the name .map(s -> s.substring(0, s.length() - PackageHelper.JSON_SUFIX.length())) // sort - .sorted().collect(Collectors.toList()); + .sorted().toList(); } if (!models.isEmpty()) { diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java index 4f0141cd8b5..5b9581db001 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java @@ -454,7 +454,7 @@ public class PrepareCatalogMojo extends AbstractMojo { .collect(Collectors.toCollection(TreeSet::new)); componentFiles.stream().filter(p -> p.endsWith("component.properties")).forEach(p -> { Path parent = getModule(p); - List<Path> jsons = jsonFiles.stream().filter(f -> f.startsWith(parent)).collect(Collectors.toList()); + List<Path> jsons = jsonFiles.stream().filter(f -> f.startsWith(parent)).toList(); if (jsons.isEmpty()) { missingComponents.add(parent); } @@ -818,7 +818,7 @@ public class PrepareCatalogMojo extends AbstractMojo { try (Stream<Path> pathStream = PackageHelper.walk(dir.resolve("src/main/docs")) .filter(f -> f.getFileName().toString().endsWith(".adoc"))) { List<Path> l = pathStream - .collect(Collectors.toList()); + .toList(); if (l.isEmpty()) { String n = dir.getFileName().toString(); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java index 0975be40487..b53ce2b3cd0 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpiGeneratorMojo.java @@ -32,7 +32,6 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; import org.apache.camel.maven.packaging.generics.PackagePluginUtils; import org.apache.camel.spi.annotations.ConstantProvider; @@ -193,7 +192,7 @@ public class SpiGeneratorMojo extends AbstractGeneratorMojo { List<JarEntry> classes = jf.stream() .filter(je -> je.getName().endsWith(".class")) - .collect(Collectors.toList()); + .toList(); for (JarEntry je : classes) { try (InputStream is = jf.getInputStream(je)) { diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java index b2c67856de6..3f1ccda76d2 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java @@ -24,7 +24,6 @@ import java.util.Locale; import java.util.Set; import java.util.StringJoiner; import java.util.TreeSet; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.camel.tooling.model.ComponentModel; @@ -78,7 +77,7 @@ public class UpdateSensitizeHelper extends AbstractGeneratorMojo { } List<Path> jsonFiles; try (Stream<Path> stream = PackageHelper.findJsonFiles(jsonDir.toPath())) { - jsonFiles = stream.collect(Collectors.toList()); + jsonFiles = stream.toList(); } Set<String> secrets = new TreeSet<>(); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ValidateComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ValidateComponentMojo.java index c6f9a42bd7d..657c14b667d 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ValidateComponentMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ValidateComponentMojo.java @@ -19,7 +19,6 @@ package org.apache.camel.maven.packaging; import java.io.File; import java.nio.file.Path; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.camel.tooling.util.PackageHelper; @@ -74,7 +73,7 @@ public class ValidateComponentMojo extends AbstractGeneratorMojo { } else { List<Path> jsonFiles; try (Stream<Path> stream = PackageHelper.findJsonFiles(outDir.toPath())) { - jsonFiles = stream.collect(Collectors.toList()); + jsonFiles = stream.toList(); } boolean failed = false; diff --git a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java index 04af5bdb7a5..3e9ef670b81 100644 --- a/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java +++ b/tooling/maven/sync-properties-maven-plugin/src/main/java/org/apache/camel/maven/sync/properties/SyncPropertiesMojo.java @@ -186,7 +186,7 @@ public class SyncPropertiesMojo extends AbstractMojo { } else { final List<Pattern> patterns = regularExpressions.stream() .map(Pattern::compile) - .collect(Collectors.toList()); + .toList(); return key -> patterns.stream().anyMatch(pattern -> pattern.matcher(key).matches()); } }