Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use constructor rather than Collection.addAll

Browse Source 
See gh-41053
This commit is contained in:
Piyal Ahmed 2024-06-11 16:18:49 +06:00 committed by Phillip Webb
parent d37098153c
commit 17adcfc180
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/NativeImageResourceProvider.java
View File

@ -96,8 +96,7 @@ class NativeImageResourceProvider implements ResourceProvider {
ensureInitialized(); ensureInitialized();
Predicate<LocatedResource> matchesPrefixAndSuffixes = (locatedResource) -> StringUtils Predicate<LocatedResource> matchesPrefixAndSuffixes = (locatedResource) -> StringUtils
.startsAndEndsWith(locatedResource.resource.getFilename(), prefix, suffixes); .startsAndEndsWith(locatedResource.resource.getFilename(), prefix, suffixes);
List<LoadableResource> result = new ArrayList<>(); List<LoadableResource> result = new ArrayList<>(this.scanner.getResources(prefix, suffixes));
result.addAll(this.scanner.getResources(prefix, suffixes));
this.locatedResources.stream() this.locatedResources.stream()
.filter(matchesPrefixAndSuffixes) .filter(matchesPrefixAndSuffixes)
.map(this::asClassPathResource) .map(this::asClassPathResource)

3
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java
View File

@ -240,8 +240,7 @@ class ImportsContextCustomizer implements ContextCustomizer {
this.key = Collections.unmodifiableSet(synthesize(annotations)); this.key = Collections.unmodifiableSet(synthesize(annotations));
} }
else { else {
Set<Object> key = new HashSet<>(); Set<Object> key = new HashSet<>(determinedImports);
key.addAll(determinedImports);
Set<Annotation> componentScanning = annotations.stream() Set<Annotation> componentScanning = annotations.stream()
.filter((annotation) -> annotation.getType().equals(ComponentScan.class)) .filter((annotation) -> annotation.getType().equals(ComponentScan.class))
.map(MergedAnnotation::synthesize) .map(MergedAnnotation::synthesize)

3
spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionAutoConfigurationRegistrar.java
View File

@ -68,8 +68,7 @@ class ServiceConnectionAutoConfigurationRegistrar implements ImportBeanDefinitio
private Set<ServiceConnection> getAnnotations(ConfigurableListableBeanFactory beanFactory, String beanName, private Set<ServiceConnection> getAnnotations(ConfigurableListableBeanFactory beanFactory, String beanName,
BeanDefinition beanDefinition) { BeanDefinition beanDefinition) {
Set<ServiceConnection> annotations = new LinkedHashSet<>(); Set<ServiceConnection> annotations = new LinkedHashSet<>(beanFactory.findAllAnnotationsOnBean(beanName, ServiceConnection.class, false));
annotations.addAll(beanFactory.findAllAnnotationsOnBean(beanName, ServiceConnection.class, false));
if (beanDefinition instanceof TestcontainerBeanDefinition testcontainerBeanDefinition) { if (beanDefinition instanceof TestcontainerBeanDefinition testcontainerBeanDefinition) {
testcontainerBeanDefinition.getAnnotations() testcontainerBeanDefinition.getAnnotations()
.stream(ServiceConnection.class) .stream(ServiceConnection.class)

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldPatterns.java
View File

@ -195,8 +195,7 @@ final class TldPatterns {
static final Set<String> DEFAULT_SCAN; static final Set<String> DEFAULT_SCAN;
static { static {
Set<String> scanPatterns = new LinkedHashSet<>(); Set<String> scanPatterns = new LinkedHashSet<>(TOMCAT_SCAN);
scanPatterns.addAll(TOMCAT_SCAN);
DEFAULT_SCAN = Collections.unmodifiableSet(scanPatterns); DEFAULT_SCAN = Collections.unmodifiableSet(scanPatterns);
} }

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatEmbeddedContext.java
View File

@ -128,8 +128,7 @@ class TomcatEmbeddedContext extends StandardContext {
@Override @Override
public String[] findMimeMappings() { public String[] findMimeMappings() {
List<String> mappings = new ArrayList<>(); List<String> mappings = new ArrayList<>(Arrays.asList(super.findMimeMappings()));
mappings.addAll(Arrays.asList(super.findMimeMappings()));
if (this.mimeMappings != null) { if (this.mimeMappings != null) {
this.mimeMappings.forEach((mapping) -> mappings.add(mapping.getExtension())); this.mimeMappings.forEach((mapping) -> mappings.add(mapping.getExtension()));
} }