Skip to content

Commit

Permalink
Align S3ConfigDataLocationResolver resolving behavior with Spring B…
Browse files Browse the repository at this point in the history
…oot resolvers (#1299)

Align `S3ConfigDataLocationResolver` behaviour with Spring Boot to resolve properties without taking profile names into account
  • Loading branch information
MatejNedic authored Dec 18, 2024
1 parent 9aea25b commit 9e4ebe9
Showing 1 changed file with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.springframework.boot.context.config.ConfigDataLocation;
import org.springframework.boot.context.config.ConfigDataLocationNotFoundException;
import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
import org.springframework.boot.context.config.Profiles;
import org.springframework.boot.context.properties.bind.Bindable;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.logging.DeferredLogFactory;
Expand Down Expand Up @@ -60,8 +59,8 @@ protected String getPrefix() {
}

@Override
public List<S3ConfigDataResource> resolveProfileSpecific(ConfigDataLocationResolverContext resolverContext,
ConfigDataLocation location, Profiles profiles) throws ConfigDataLocationNotFoundException {
public List<S3ConfigDataResource> resolve(ConfigDataLocationResolverContext resolverContext,
ConfigDataLocation location) throws ConfigDataLocationNotFoundException {

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

0 comments on commit 9e4ebe9

Please sign in to comment.