From 10120cdf563ebea9f74932273f5ed616176ec7e5 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 20 Feb 2018 08:44:33 -0500 Subject: [PATCH] Upgrade to Spring Data Kay.SR4, Security 5.0.2 Remove deprecated method from security tests. --- build.gradle | 10 +++++----- .../integration/http/dsl/HttpDslTests.java | 16 +++++++++------- .../integration/webflux/dsl/WebFluxDslTests.java | 7 +++++-- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 18a53f5b3d..b32309283c 100644 --- a/build.gradle +++ b/build.gradle @@ -131,11 +131,11 @@ subprojects { subproject -> servletApiVersion = '4.0.0' smackVersion = '4.2.2' springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.2.RELEASE' - springDataJpaVersion = '2.0.3.RELEASE' - springDataMongoVersion = '2.0.3.RELEASE' - springDataRedisVersion = '2.0.3.RELEASE' - springGemfireVersion = '2.0.3.RELEASE' - springSecurityVersion = '5.0.1.RELEASE' + springDataJpaVersion = '2.0.4.RELEASE' + springDataMongoVersion = '2.0.4.RELEASE' + springDataRedisVersion = '2.0.4.RELEASE' + springGemfireVersion = '2.0.4.RELEASE' + springSecurityVersion = '5.0.2.RELEASE' springSocialTwitterVersion = '1.1.2.RELEASE' springRetryVersion = '1.2.2.RELEASE' springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.4.RELEASE' diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/dsl/HttpDslTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/dsl/HttpDslTests.java index b8cdcc9ef5..6a59700ebd 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/dsl/HttpDslTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/dsl/HttpDslTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 the original author or authors. + * Copyright 2016-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,6 +50,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.factory.PasswordEncoderFactories; import org.springframework.security.provisioning.InMemoryUserDetailsManager; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; @@ -57,7 +58,6 @@ import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.client.MockMvcClientHttpRequestFactory; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.util.MultiValueMap; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; import org.springframework.web.context.WebApplicationContext; @@ -65,6 +65,7 @@ import org.springframework.web.context.WebApplicationContext; /** * @author Artem Bilan * @author Shiliang Li + * @author Gary Russell * * @since 5.0 */ @@ -118,20 +119,21 @@ public class HttpDslTests { @EnableIntegration public static class ContextConfiguration extends WebSecurityConfigurerAdapter { + @Override @Bean public UserDetailsService userDetailsService() { InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager(); manager.createUser( - User.withDefaultPasswordEncoder() - .username("admin") + User.withUsername("admin") + .passwordEncoder(PasswordEncoderFactories.createDelegatingPasswordEncoder()::encode) .password("admin") .roles("ADMIN") .build()); manager.createUser( - User.withDefaultPasswordEncoder() - .username("user") + User.withUsername("user") + .passwordEncoder(PasswordEncoderFactories.createDelegatingPasswordEncoder()::encode) .password("user") .roles("USER") .build()); @@ -174,7 +176,7 @@ public class HttpDslTests { .from(Http.inboundGateway("/service") .requestMapping(r -> r.params("name")) .errorChannel("httpProxyErrorFlow.input")) - .handle(Http.>outboundGateway("/service/internal?{params}") + .handle(Http.outboundGateway("/service/internal?{params}") .uriVariable("params", "payload") .expectedResponseType(String.class), e -> e.id("serviceInternalGateway")) diff --git a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/dsl/WebFluxDslTests.java b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/dsl/WebFluxDslTests.java index deb2f52fb6..03076cdb53 100644 --- a/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/dsl/WebFluxDslTests.java +++ b/spring-integration-webflux/src/test/java/org/springframework/integration/webflux/dsl/WebFluxDslTests.java @@ -62,6 +62,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.factory.PasswordEncoderFactories; import org.springframework.security.provisioning.InMemoryUserDetailsManager; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; @@ -84,6 +85,7 @@ import reactor.test.StepVerifier; * @author Artem Bilan * @author Shiliang Li * @author Abhijit Sarkar + * @author Gary Russell * * @since 5.0 */ @@ -231,13 +233,14 @@ public class WebFluxDslTests { @EnableIntegration public static class ContextConfiguration extends WebSecurityConfigurerAdapter { + @Override @Bean public UserDetailsService userDetailsService() { InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager(); manager.createUser( - User.withDefaultPasswordEncoder() - .username("guest") + User.withUsername("guest") + .passwordEncoder(PasswordEncoderFactories.createDelegatingPasswordEncoder()::encode) .password("guest") .roles("ADMIN") .build());