diff --git a/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java b/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java index 26d7d5d3..b8702246 100644 --- a/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java +++ b/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java @@ -18,7 +18,6 @@ package org.springframework.hateoas.config; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Properties; @@ -138,7 +137,7 @@ public class HateoasConfiguration { } @Nullable - private final Properties loadProperties(Collection sources) { + private final Properties loadProperties(List sources) { Resource[] resources = loadProperties("rest-default-messages", false).stream().toArray(Resource[]::new); diff --git a/src/main/java/org/springframework/hateoas/config/HypermediaConfigurationImportSelector.java b/src/main/java/org/springframework/hateoas/config/HypermediaConfigurationImportSelector.java index 28da095a..e91a76d4 100644 --- a/src/main/java/org/springframework/hateoas/config/HypermediaConfigurationImportSelector.java +++ b/src/main/java/org/springframework/hateoas/config/HypermediaConfigurationImportSelector.java @@ -16,8 +16,8 @@ package org.springframework.hateoas.config; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -44,13 +44,13 @@ class HypermediaConfigurationImportSelector implements ImportSelector { Map attributes = metadata.getAnnotationAttributes(EnableHypermediaSupport.class.getName()); - Collection types = attributes == null // + List types = attributes == null // ? Collections.emptyList() // : Arrays.stream((HypermediaType[]) attributes.get("type")) // .flatMap(it -> it.getMediaTypes().stream()) // .collect(Collectors.toList()); - Collection configurationProviders = SpringFactoriesLoader.loadFactories( + List configurationProviders = SpringFactoriesLoader.loadFactories( MediaTypeConfigurationProvider.class, HypermediaConfigurationImportSelector.class.getClassLoader()); // No additional filtering needed. @@ -66,7 +66,7 @@ class HypermediaConfigurationImportSelector implements ImportSelector { .toArray(String[]::new); } - public String[] selectImports(Collection mediaType) { + public String[] selectImports(List mediaType) { return new String[] {}; } } diff --git a/src/main/java/org/springframework/hateoas/config/WebClientConfigurer.java b/src/main/java/org/springframework/hateoas/config/WebClientConfigurer.java index ba45ecce..7910c709 100644 --- a/src/main/java/org/springframework/hateoas/config/WebClientConfigurer.java +++ b/src/main/java/org/springframework/hateoas/config/WebClientConfigurer.java @@ -18,7 +18,6 @@ package org.springframework.hateoas.config; import lombok.RequiredArgsConstructor; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import org.springframework.context.annotation.Configuration; @@ -44,7 +43,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class WebClientConfigurer { private final ObjectMapper mapper; - private final Collection hypermediaTypes; + private final List hypermediaTypes; /** * Return a set of {@link ExchangeStrategies} driven by registered {@link HypermediaType}s. diff --git a/src/main/java/org/springframework/hateoas/config/WebFluxHateoasConfiguration.java b/src/main/java/org/springframework/hateoas/config/WebFluxHateoasConfiguration.java index 9597b2b3..75d18a7c 100644 --- a/src/main/java/org/springframework/hateoas/config/WebFluxHateoasConfiguration.java +++ b/src/main/java/org/springframework/hateoas/config/WebFluxHateoasConfiguration.java @@ -17,7 +17,7 @@ package org.springframework.hateoas.config; import lombok.RequiredArgsConstructor; -import java.util.Collection; +import java.util.List; import org.springframework.beans.BeansException; import org.springframework.beans.factory.ObjectProvider; @@ -50,7 +50,7 @@ class WebFluxHateoasConfiguration { @Bean WebClientConfigurer webClientConfigurer(ObjectProvider mapper, - Collection hypermediaTypes) { + List hypermediaTypes) { return new WebClientConfigurer(mapper.getIfAvailable(ObjectMapper::new), hypermediaTypes); } @@ -62,7 +62,7 @@ class WebFluxHateoasConfiguration { @Bean HypermediaWebFluxConfigurer hypermediaWebFluxConfigurer(ObjectProvider mapper, - Collection hypermediaTypes) { + List hypermediaTypes) { return new HypermediaWebFluxConfigurer(mapper.getIfAvailable(ObjectMapper::new), hypermediaTypes); } @@ -112,7 +112,7 @@ class WebFluxHateoasConfiguration { static class HypermediaWebFluxConfigurer implements WebFluxConfigurer { private final ObjectMapper mapper; - private final Collection hypermediaTypes; + private final List hypermediaTypes; /** * Configure custom HTTP message readers and writers or override built-in ones. diff --git a/src/main/java/org/springframework/hateoas/config/WebMvcHateoasConfiguration.java b/src/main/java/org/springframework/hateoas/config/WebMvcHateoasConfiguration.java index b3f043c0..0535d532 100644 --- a/src/main/java/org/springframework/hateoas/config/WebMvcHateoasConfiguration.java +++ b/src/main/java/org/springframework/hateoas/config/WebMvcHateoasConfiguration.java @@ -17,7 +17,6 @@ package org.springframework.hateoas.config; import lombok.RequiredArgsConstructor; -import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -56,7 +55,7 @@ class WebMvcHateoasConfiguration { @Bean HypermediaWebMvcConfigurer hypermediaWebMvcConfigurer(ObjectProvider mapper, - Collection hypermediaTypes) { + List hypermediaTypes) { return new HypermediaWebMvcConfigurer(mapper.getIfAvailable(ObjectMapper::new), hypermediaTypes); } @@ -97,7 +96,7 @@ class WebMvcHateoasConfiguration { static class HypermediaWebMvcConfigurer implements WebMvcConfigurer { private final ObjectMapper mapper; - private final Collection hypermediaTypes; + private final List hypermediaTypes; /* * (non-Javadoc)