Align loading with Spring Boots resolver

awspring · Dec 17, 2024 · fd0ad73 · fd0ad73
1 parent 18b1ea8
commit fd0ad73
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/...in/java/io/awspring/cloud/autoconfigure/config/AbstractAwsConfigDataLocationResolver.java b/...in/java/io/awspring/cloud/autoconfigure/config/AbstractAwsConfigDataLocationResolver.java
@@ -30,11 +30,9 @@
 import org.springframework.boot.BootstrapRegistry;
 import org.springframework.boot.ConfigurableBootstrapContext;
 import org.springframework.boot.context.config.ConfigDataLocation;
-import org.springframework.boot.context.config.ConfigDataLocationNotFoundException;
 import org.springframework.boot.context.config.ConfigDataLocationResolver;
 import org.springframework.boot.context.config.ConfigDataLocationResolverContext;
 import org.springframework.boot.context.config.ConfigDataResource;
-import org.springframework.boot.context.config.ConfigDataResourceNotFoundException;
 import org.springframework.boot.context.properties.bind.Bindable;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -62,12 +60,6 @@ public boolean isResolvable(ConfigDataLocationResolverContext context, ConfigDat
 		return location.hasPrefix(getPrefix());
 	}
 
-	@Override
-	public List<T> resolve(ConfigDataLocationResolverContext context, ConfigDataLocation location)
-			throws ConfigDataLocationNotFoundException, ConfigDataResourceNotFoundException {
-		return Collections.emptyList();
-	}
-
 	protected <C> void registerAndPromoteBean(ConfigDataLocationResolverContext context, Class<C> type,
 			BootstrapRegistry.InstanceSupplier<C> supplier) {
 		registerBean(context, type, supplier);

diff --git a/...g/cloud/autoconfigure/config/parameterstore/ParameterStoreConfigDataLocationResolver.java b/...g/cloud/autoconfigure/config/parameterstore/ParameterStoreConfigDataLocationResolver.java
@@ -28,7 +28,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;
@@ -60,9 +59,8 @@ protected String getPrefix() {
 	}
 
 	@Override
-	public List<ParameterStoreConfigDataResource> resolveProfileSpecific(
-			ConfigDataLocationResolverContext resolverContext, ConfigDataLocation location, Profiles profiles)
-			throws ConfigDataLocationNotFoundException {
+	public List<ParameterStoreConfigDataResource> resolve(ConfigDataLocationResolverContext resolverContext,
+			ConfigDataLocation location) throws ConfigDataLocationNotFoundException {
 		var properties = loadProperties(resolverContext.getBinder());
 		List<ParameterStoreConfigDataResource> locations = new ArrayList<>();
 		ParameterStorePropertySources sources = new ParameterStorePropertySources();

diff --git a/...src/main/java/io/awspring/cloud/autoconfigure/config/s3/S3ConfigDataLocationResolver.java b/...src/main/java/io/awspring/cloud/autoconfigure/config/s3/S3ConfigDataLocationResolver.java
@@ -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;
@@ -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<>();