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

Some upgrades and fixes

Browse Source 
* Upgrade to SF-5.0.1, Reactor-3.1.1, some other minor upgrades
* Fix `HttpDslTests` and `WebFluxDslTests` for the latest SS compatibility
* Fix JavaDoc in the `ChannelMessageStorePreparedStatementSetter`
This commit is contained in:
Artem Bilan
2017-10-25 10:52:47 -04:00
parent df109410c3
commit efb8f04465
4 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,11 +46,13 @@ import org.springframework.messaging.support.MessageBuilder;
import org.springframework.security.access.AccessDecisionManager;
import org.springframework.security.access.vote.AffirmativeBased;
import org.springframework.security.access.vote.RoleVoter;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.authentication.configurers.provisioning.InMemoryUserDetailsManagerConfigurer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
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;
import org.springframework.test.context.web.WebAppConfiguration;
@@ -118,16 +120,23 @@ public class HttpDslTests {
@EnableIntegration
public static class ContextConfiguration extends WebSecurityConfigurerAdapter {
@Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
InMemoryUserDetailsManagerConfigurer<?> userDetailsManagerConfigurer =
auth.inMemoryAuthentication();
userDetailsManagerConfigurer.withUser("admin")
.password("admin")
.roles("ADMIN");
userDetailsManagerConfigurer.withUser("user")
.password("user")
.roles("USER");
@Bean
public UserDetailsService userDetailsService() {
InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
manager.createUser(
User.withUsername("admin")
.password("admin")
.roles("ADMIN")
.build());
manager.createUser(
User.withUsername("user")
.password("user")
.roles("USER")
.build());
return manager;
}
@Override
@@ -187,6 +196,12 @@ 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 {