Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Security 5.0.0.RC1

Browse Source 
Remove usage of deprecated `NoOpPasswordEncoder` in favor of
`User.withDefaultPasswordEncoder()` in tests
This commit is contained in:
Artem Bilan
2017-10-30 20:54:40 -04:00
parent 56de7149c3
commit 2712e28074
3 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -134,7 +134,7 @@ subprojects { subproject ->
springDataMongoVersion = '2.0.0.RELEASE'
springDataRedisVersion = '2.0.0.RELEASE'
springGemfireVersion = '2.0.0.RELEASE'
springSecurityVersion = '5.0.0.M5'
springSecurityVersion = '5.0.0.RC1'
springSocialTwitterVersion = '2.0.0.M4'
springRetryVersion = '1.2.1.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.1.RELEASE'

13
spring-integration-http/src/test/java/org/springframework/integration/http/dsl/HttpDslTests.java
View File

@@ -50,7 +50,6 @@ 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.password.PasswordEncoder;
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
@@ -124,13 +123,15 @@ public class HttpDslTests {
InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
manager.createUser(
User.withUsername("admin")
User.withDefaultPasswordEncoder()
.username("admin")
.password("admin")
.roles("ADMIN")
.build());
manager.createUser(
User.withUsername("user")
User.withDefaultPasswordEncoder()
.username("user")
.password("user")
.roles("USER")
.build());
@@ -193,12 +194,6 @@ public class HttpDslTests {
return new AffirmativeBased(Collections.singletonList(new RoleVoter()));
}
@Bean
@SuppressWarnings("deprecation")
public PasswordEncoder passwordEncoder() {
return org.springframework.security.crypto.password.NoOpPasswordEncoder.getInstance();
}
@Bean
public ChannelSecurityInterceptor channelSecurityInterceptor(AccessDecisionManager accessDecisionManager)
throws Exception {

22
spring-integration-webflux/src/test/java/org/springframework/integration/webflux/dsl/WebFluxDslTests.java
View File

@@ -55,7 +55,6 @@ 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.password.PasswordEncoder;
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
@@ -181,7 +180,8 @@ public class WebFluxDslTests {
InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
manager.createUser(
User.withUsername("guest")
User.withDefaultPasswordEncoder()
.username("guest")
.password("guest")
.roles("ADMIN")
.build());
@@ -206,12 +206,12 @@ public class WebFluxDslTests {
.from(Http.inboundGateway("/service2")
.requestMapping(r -> r.params("name")))
.handle(WebFlux.<MultiValueMap<String, String>>outboundGateway(m ->
UriComponentsBuilder.fromUriString("http://www.springsource.org/spring-integration")
.queryParams(m.getPayload())
.build()
.toUri())
.httpMethod(HttpMethod.GET)
.expectedResponseType(String.class))
UriComponentsBuilder.fromUriString("http://www.springsource.org/spring-integration")
.queryParams(m.getPayload())
.build()
.toUri())
.httpMethod(HttpMethod.GET)
.expectedResponseType(String.class))
.get();
}
@@ -240,12 +240,6 @@ public class WebFluxDslTests {
return new AffirmativeBased(Collections.singletonList(new RoleVoter()));
}
@Bean
@SuppressWarnings("deprecation")
public PasswordEncoder passwordEncoder() {
return org.springframework.security.crypto.password.NoOpPasswordEncoder.getInstance();
}
}
}