From d6c9b1583c0022e8f899f82fc7c636ba9f45d645 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Thu, 15 Jul 2021 16:31:00 +0200 Subject: [PATCH] Fix outdated API calls. --- .../cloud/bootstrap/TextEncryptorConfigBootstrapper.java | 6 +++--- .../src/main/resources/META-INF/spring.factories | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/TextEncryptorConfigBootstrapper.java b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/TextEncryptorConfigBootstrapper.java index 1ea5e527..0161eb1e 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/TextEncryptorConfigBootstrapper.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/TextEncryptorConfigBootstrapper.java @@ -19,7 +19,7 @@ package org.springframework.cloud.bootstrap; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.boot.BootstrapContext; import org.springframework.boot.BootstrapRegistry; -import org.springframework.boot.Bootstrapper; +import org.springframework.boot.BootstrapRegistryInitializer; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.cloud.bootstrap.encrypt.KeyProperties; import org.springframework.cloud.bootstrap.encrypt.RsaProperties; @@ -32,7 +32,7 @@ import org.springframework.util.ClassUtils; * @author Marcin Grzejszczak * @since 3.0.0 */ -public class TextEncryptorConfigBootstrapper implements Bootstrapper { +public class TextEncryptorConfigBootstrapper implements BootstrapRegistryInitializer { /** * RsaSecretEncryptor present. @@ -41,7 +41,7 @@ public class TextEncryptorConfigBootstrapper implements Bootstrapper { .isPresent("org.springframework.security.rsa.crypto.RsaSecretEncryptor", null); @Override - public void intitialize(BootstrapRegistry registry) { + public void initialize(BootstrapRegistry registry) { if (!ClassUtils.isPresent("org.springframework.security.crypto.encrypt.TextEncryptor", null)) { return; } diff --git a/spring-cloud-context/src/main/resources/META-INF/spring.factories b/spring-cloud-context/src/main/resources/META-INF/spring.factories index 745182fe..d2e2ed82 100644 --- a/spring-cloud-context/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-context/src/main/resources/META-INF/spring.factories @@ -18,9 +18,7 @@ org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfi org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration # Spring Boot BootstrapRegistryInitializer org.springframework.boot.BootstrapRegistryInitializer=\ -org.springframework.cloud.bootstrap.RefreshBootstrapRegistryInitializer -# Spring Boot Bootstrappers -org.springframework.boot.Bootstrapper=\ +org.springframework.cloud.bootstrap.RefreshBootstrapRegistryInitializer,\ org.springframework.cloud.bootstrap.TextEncryptorConfigBootstrapper # Environment Post Processors org.springframework.boot.env.EnvironmentPostProcessor=\