diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapper.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapper.java index 1be7b0d7..18d75598 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapper.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapper.java @@ -16,7 +16,7 @@ package org.springframework.cloud.vault.config; -import org.springframework.boot.Bootstrapper; +import org.springframework.boot.BootstrapRegistryInitializer; import org.springframework.util.Assert; /** @@ -32,11 +32,12 @@ public abstract class VaultBootstrapper { } /** - * Create a {@link Bootstrapper} that configures a {@link VaultConfigurer}. + * Create a {@link BootstrapRegistryInitializer} that configures a + * {@link VaultConfigurer}. * @param configurer the configurer to apply. * @return the bootstrapper object. */ - public static Bootstrapper fromConfigurer(VaultConfigurer configurer) { + public static BootstrapRegistryInitializer fromConfigurer(VaultConfigurer configurer) { Assert.notNull(configurer, "VaultConfigurer must not be null"); diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultConfigDataLoader.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultConfigDataLoader.java index b9ce2cdd..4369d4d3 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultConfigDataLoader.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultConfigDataLoader.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.Log; import org.springframework.beans.factory.BeanFactory; import org.springframework.boot.BootstrapContext; import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.Bootstrapper; +import org.springframework.boot.BootstrapRegistryInitializer; import org.springframework.boot.ConfigurableBootstrapContext; import org.springframework.boot.context.config.ConfigData; import org.springframework.boot.context.config.ConfigDataLoader; @@ -82,7 +82,7 @@ import static org.springframework.vault.config.AbstractVaultConfiguration.Client * {@link VaultReactiveAutoConfiguration}. *

* Infrastructure beans can be customized by registering instances through - * {@link Bootstrapper}. + * {@link BootstrapRegistryInitializer}. * * @author Mark Paluch * @since 3.0 diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapperIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapperIntegrationTests.java index 1fa22dbe..da7d9a4c 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapperIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultBootstrapperIntegrationTests.java @@ -52,8 +52,8 @@ public class VaultBootstrapperIntegrationTests extends IntegrationTestSupport { SpringApplication application = new SpringApplication(Config.class); application.setWebApplicationType(WebApplicationType.NONE); - application - .addBootstrapper(VaultBootstrapper.fromConfigurer(configurer -> configurer.add("secret/customized"))); + application.addBootstrapRegistryInitializer( + VaultBootstrapper.fromConfigurer(configurer -> configurer.add("secret/customized"))); this.context = application.run("--spring.application.name=VaultBootstrapPropertySourceConfigurationTests", "--spring.config.import=vault:", "--spring.cloud.vault.token=" + Settings.token().getToken());