Polish
This commit is contained in:
@@ -75,8 +75,8 @@ class LettuceConnectionConfiguration extends RedisConnectionConfiguration {
|
||||
@ConditionalOnMissingBean(RedisConnectionFactory.class)
|
||||
public LettuceConnectionFactory redisConnectionFactory(
|
||||
ClientResources clientResources) throws UnknownHostException {
|
||||
LettuceClientConfiguration clientConfig = getLettuceClientConfiguration(clientResources,
|
||||
this.properties.getLettuce().getPool());
|
||||
LettuceClientConfiguration clientConfig = getLettuceClientConfiguration(
|
||||
clientResources, this.properties.getLettuce().getPool());
|
||||
return createLettuceConnectionFactory(clientConfig);
|
||||
}
|
||||
|
||||
|
||||
@@ -41,8 +41,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager;
|
||||
* @author Madhura Bhave
|
||||
*/
|
||||
@Configuration
|
||||
@ConditionalOnClass({ AuthenticationManager.class,
|
||||
EnableWebSecurity.class })
|
||||
@ConditionalOnClass({ AuthenticationManager.class, EnableWebSecurity.class })
|
||||
@EnableConfigurationProperties(SecurityProperties.class)
|
||||
@Import({ SpringBootWebSecurityConfiguration.class, WebSecurityEnablerConfiguration.class,
|
||||
AuthenticationManagerConfiguration.class, SecurityDataConfiguration.class })
|
||||
|
||||
@@ -70,10 +70,12 @@ final class OAuth2ClientPropertiesRegistrationAdapter {
|
||||
|
||||
private static Builder getBuilder(String registrationId, String configuredProviderId,
|
||||
Map<String, Provider> providers) {
|
||||
String providerId = (configuredProviderId == null ? registrationId : configuredProviderId);
|
||||
String providerId = (configuredProviderId == null ? registrationId
|
||||
: configuredProviderId);
|
||||
CommonOAuth2Provider provider = getCommonProvider(providerId);
|
||||
if (provider == null && !providers.containsKey(providerId)) {
|
||||
throw new IllegalStateException(getErrorMessage(configuredProviderId, registrationId));
|
||||
throw new IllegalStateException(
|
||||
getErrorMessage(configuredProviderId, registrationId));
|
||||
}
|
||||
Builder builder = (provider != null ? provider.getBuilder(registrationId)
|
||||
: ClientRegistration.withRegistrationId(registrationId));
|
||||
@@ -83,9 +85,12 @@ final class OAuth2ClientPropertiesRegistrationAdapter {
|
||||
return builder;
|
||||
}
|
||||
|
||||
private static String getErrorMessage(String configuredProviderId, String registrationId) {
|
||||
return (configuredProviderId == null ? "Provider ID must be specified for client registration '" + registrationId + "'" :
|
||||
"Unknown provider ID '" + configuredProviderId + "'");
|
||||
private static String getErrorMessage(String configuredProviderId,
|
||||
String registrationId) {
|
||||
return (configuredProviderId == null
|
||||
? "Provider ID must be specified for client registration '"
|
||||
+ registrationId + "'"
|
||||
: "Unknown provider ID '" + configuredProviderId + "'");
|
||||
}
|
||||
|
||||
private static Builder getBuilder(Builder builder, Provider provider) {
|
||||
|
||||
@@ -55,31 +55,31 @@ public class CustomHibernateJpaAutoConfigurationTests {
|
||||
.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class,
|
||||
HibernateJpaAutoConfiguration.class));
|
||||
|
||||
|
||||
@Test
|
||||
public void namingStrategyDelegatorTakesPrecedence() {
|
||||
this.contextRunner
|
||||
.withPropertyValues(
|
||||
"spring.jpa.properties.hibernate.ejb.naming_strategy_delegator:"
|
||||
+ "org.hibernate.cfg.naming.ImprovedNamingStrategyDelegator"
|
||||
).run((context) -> {
|
||||
JpaProperties bean = context.getBean(JpaProperties.class);
|
||||
Map<String, String> hibernateProperties = bean
|
||||
.getHibernateProperties("create-drop");
|
||||
assertThat(hibernateProperties.get("hibernate.ejb.naming_strategy")).isNull();
|
||||
});
|
||||
+ "org.hibernate.cfg.naming.ImprovedNamingStrategyDelegator")
|
||||
.run((context) -> {
|
||||
JpaProperties bean = context.getBean(JpaProperties.class);
|
||||
Map<String, String> hibernateProperties = bean
|
||||
.getHibernateProperties("create-drop");
|
||||
assertThat(hibernateProperties.get("hibernate.ejb.naming_strategy"))
|
||||
.isNull();
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
public void defaultDatabaseForH2() {
|
||||
this.contextRunner.withPropertyValues(
|
||||
"spring.datasource.url:jdbc:h2:mem:testdb",
|
||||
this.contextRunner.withPropertyValues("spring.datasource.url:jdbc:h2:mem:testdb",
|
||||
"spring.datasource.initialize:false").run((context) -> {
|
||||
HibernateJpaVendorAdapter bean = context
|
||||
.getBean(HibernateJpaVendorAdapter.class);
|
||||
Database database = (Database) ReflectionTestUtils.getField(bean, "database");
|
||||
assertThat(database).isEqualTo(Database.H2);
|
||||
});
|
||||
HibernateJpaVendorAdapter bean = context
|
||||
.getBean(HibernateJpaVendorAdapter.class);
|
||||
Database database = (Database) ReflectionTestUtils.getField(bean,
|
||||
"database");
|
||||
assertThat(database).isEqualTo(Database.H2);
|
||||
});
|
||||
}
|
||||
|
||||
@Configuration
|
||||
|
||||
@@ -258,8 +258,7 @@ public class HibernateJpaAutoConfigurationTests
|
||||
|
||||
@Test
|
||||
public void customResourceMapping() {
|
||||
contextRunner()
|
||||
.withClassLoader(new HideDataScriptClassLoader())
|
||||
contextRunner().withClassLoader(new HideDataScriptClassLoader())
|
||||
.withPropertyValues(
|
||||
"spring.datasource.data:classpath:/db/non-annotated-data.sql",
|
||||
"spring.jpa.mapping-resources=META-INF/mappings/non-annotated.xml")
|
||||
|
||||
@@ -208,7 +208,8 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
|
||||
Registration registration = new Registration();
|
||||
properties.getRegistration().put("missing", registration);
|
||||
this.thrown.expect(IllegalStateException.class);
|
||||
this.thrown.expectMessage("Provider ID must be specified for client registration 'missing'");
|
||||
this.thrown.expectMessage(
|
||||
"Provider ID must be specified for client registration 'missing'");
|
||||
OAuth2ClientPropertiesRegistrationAdapter.getClientRegistrations(properties);
|
||||
}
|
||||
|
||||
|
||||
@@ -154,7 +154,8 @@ public class OAuth2WebSecurityConfigurationTests {
|
||||
}
|
||||
|
||||
private ClientRegistration getClientRegistration(String id, String userInfoUri) {
|
||||
ClientRegistration.Builder builder = ClientRegistration.withRegistrationId(id);
|
||||
ClientRegistration.Builder builder = ClientRegistration
|
||||
.withRegistrationId(id);
|
||||
builder.clientName("foo").clientId("foo")
|
||||
.clientAuthenticationMethod(
|
||||
org.springframework.security.oauth2.core.ClientAuthenticationMethod.BASIC)
|
||||
|
||||
@@ -103,8 +103,8 @@ public class ReactiveSecurityAutoConfigurationTests {
|
||||
TestConfig.class)
|
||||
.withConfiguration(
|
||||
AutoConfigurations.of(ReactiveSecurityAutoConfiguration.class))
|
||||
.run((context) -> assertThat(context).getBean(ReactiveUserDetailsService.class)
|
||||
.isNull());
|
||||
.run((context) -> assertThat(context)
|
||||
.getBean(ReactiveUserDetailsService.class).isNull());
|
||||
}
|
||||
|
||||
@Configuration
|
||||
|
||||
Reference in New Issue
Block a user