From 17adcfc180d9e967592bc9431d41e53bfe9a5e77 Mon Sep 17 00:00:00 2001 From: Piyal Ahmed Date: Tue, 11 Jun 2024 16:18:49 +0600 Subject: [PATCH] Use constructor rather than Collection.addAll See gh-41053 --- .../boot/autoconfigure/flyway/NativeImageResourceProvider.java | 3 +-- .../boot/test/context/ImportsContextCustomizer.java | 3 +-- .../ServiceConnectionAutoConfigurationRegistrar.java | 3 +-- .../springframework/boot/web/embedded/tomcat/TldPatterns.java | 3 +-- .../boot/web/embedded/tomcat/TomcatEmbeddedContext.java | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/NativeImageResourceProvider.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/NativeImageResourceProvider.java index 63678acf903..de28c81ba6c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/NativeImageResourceProvider.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/NativeImageResourceProvider.java @@ -96,8 +96,7 @@ class NativeImageResourceProvider implements ResourceProvider { ensureInitialized(); Predicate matchesPrefixAndSuffixes = (locatedResource) -> StringUtils .startsAndEndsWith(locatedResource.resource.getFilename(), prefix, suffixes); - List result = new ArrayList<>(); - result.addAll(this.scanner.getResources(prefix, suffixes)); + List result = new ArrayList<>(this.scanner.getResources(prefix, suffixes)); this.locatedResources.stream() .filter(matchesPrefixAndSuffixes) .map(this::asClassPathResource) diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java index 2c2aa3d73c8..51517cb961d 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java @@ -240,8 +240,7 @@ class ImportsContextCustomizer implements ContextCustomizer { this.key = Collections.unmodifiableSet(synthesize(annotations)); } else { - Set key = new HashSet<>(); - key.addAll(determinedImports); + Set key = new HashSet<>(determinedImports); Set componentScanning = annotations.stream() .filter((annotation) -> annotation.getType().equals(ComponentScan.class)) .map(MergedAnnotation::synthesize) diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java index 8e9be4c3223..d2cd3c498ce 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java +++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java @@ -68,8 +68,7 @@ class ServiceConnectionAutoConfigurationRegistrar implements ImportBeanDefinitio private Set getAnnotations(ConfigurableListableBeanFactory beanFactory, String beanName, BeanDefinition beanDefinition) { - Set annotations = new LinkedHashSet<>(); - annotations.addAll(beanFactory.findAllAnnotationsOnBean(beanName, ServiceConnection.class, false)); + Set annotations = new LinkedHashSet<>(beanFactory.findAllAnnotationsOnBean(beanName, ServiceConnection.class, false)); if (beanDefinition instanceof TestcontainerBeanDefinition testcontainerBeanDefinition) { testcontainerBeanDefinition.getAnnotations() .stream(ServiceConnection.class) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java index 8c1cd0cf353..a12a448f3a4 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java @@ -195,8 +195,7 @@ final class TldPatterns { static final Set DEFAULT_SCAN; static { - Set scanPatterns = new LinkedHashSet<>(); - scanPatterns.addAll(TOMCAT_SCAN); + Set scanPatterns = new LinkedHashSet<>(TOMCAT_SCAN); DEFAULT_SCAN = Collections.unmodifiableSet(scanPatterns); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java index 48f37a1bb93..2ddea35a5c3 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java @@ -128,8 +128,7 @@ class TomcatEmbeddedContext extends StandardContext { @Override public String[] findMimeMappings() { - List mappings = new ArrayList<>(); - mappings.addAll(Arrays.asList(super.findMimeMappings())); + List mappings = new ArrayList<>(Arrays.asList(super.findMimeMappings())); if (this.mimeMappings != null) { this.mimeMappings.forEach((mapping) -> mappings.add(mapping.getExtension())); }