Skip to content

Commit 9e4ebe9

Browse files
authored
Align S3ConfigDataLocationResolver resolving behavior with Spring Boot resolvers (#1299)
Align `S3ConfigDataLocationResolver` behaviour with Spring Boot to resolve properties without taking profile names into account
1 parent 9aea25b commit 9e4ebe9

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

spring-cloud-aws-autoconfigure/src/main/java/io/awspring/cloud/autoconfigure/config/s3/S3ConfigDataLocationResolver.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.springframework.boot.context.config.ConfigDataLocation;
2828
import org.springframework.boot.context.config.ConfigDataLocationNotFoundException;
2929
import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
30-
import org.springframework.boot.context.config.Profiles;
3130
import org.springframework.boot.context.properties.bind.Bindable;
3231
import org.springframework.boot.context.properties.bind.Binder;
3332
import org.springframework.boot.logging.DeferredLogFactory;
@@ -60,8 +59,8 @@ protected String getPrefix() {
6059
}
6160

6261
@Override
63-
public List<S3ConfigDataResource> resolveProfileSpecific(ConfigDataLocationResolverContext resolverContext,
64-
ConfigDataLocation location, Profiles profiles) throws ConfigDataLocationNotFoundException {
62+
public List<S3ConfigDataResource> resolve(ConfigDataLocationResolverContext resolverContext,
63+
ConfigDataLocation location) throws ConfigDataLocationNotFoundException {
6564

6665
S3Properties s3Properties = loadProperties(resolverContext.getBinder());
6766
List<S3ConfigDataResource> locations = new ArrayList<>();

0 commit comments

Comments
 (0)