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

Upgrade to Spring Data Kay.SR4, Security 5.0.2

Browse Source 
Remove deprecated method from security tests.
This commit is contained in:
Gary Russell
2018-02-20 08:44:33 -05:00
parent f247faa46b
commit 10120cdf56
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@@ -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'

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

@@ -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.<MultiValueMap<String, String>>outboundGateway("/service/internal?{params}")
.handle(Http.outboundGateway("/service/internal?{params}")
.uriVariable("params", "payload")
.expectedResponseType(String.class),
e -> e.id("serviceInternalGateway"))

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

@@ -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());