From f7ff8dd1654efe8368fb7a064685ff85ae0c1584 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Thu, 7 Jun 2018 12:39:46 -0700 Subject: [PATCH] Make generated password output consistent --- .../reactive/ReactiveUserDetailsServiceAutoConfiguration.java | 2 +- .../servlet/UserDetailsServiceAutoConfigurationTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java index a5f72f5ce4..064f9765a3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java @@ -80,7 +80,7 @@ public class ReactiveUserDetailsServiceAutoConfiguration { PasswordEncoder encoder) { String password = user.getPassword(); if (user.isPasswordGenerated()) { - logger.info(String.format("%n%nUsing default security password: %s%n", + logger.info(String.format("%n%nUsing generated security password: %s%n", user.getPassword())); } if (encoder != null || PASSWORD_ALGORITHM_PATTERN.matcher(password).matches()) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java index ba4d7c16b9..fd9e38f1ef 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfigurationTests.java @@ -93,7 +93,7 @@ public class UserDetailsServiceAutoConfigurationTests { UserDetailsService userDetailsService = context .getBean(UserDetailsService.class); assertThat(this.outputCapture.toString()) - .doesNotContain("Using default security password: "); + .doesNotContain("Using generated security password: "); assertThat(userDetailsService.loadUserByUsername("foo")).isNotNull(); }); } @@ -106,7 +106,7 @@ public class UserDetailsServiceAutoConfigurationTests { AuthenticationProvider provider = context .getBean(AuthenticationProvider.class); assertThat(this.outputCapture.toString()) - .doesNotContain("Using default security password: "); + .doesNotContain("Using generated security password: "); TestingAuthenticationToken token = new TestingAuthenticationToken( "foo", "bar"); assertThat(provider.authenticate(token)).isNotNull();