From aa43109009ef5b15b48b8e334fb57567f402a185 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Thu, 16 Apr 2015 20:33:45 +0300
Subject: [PATCH] INT-3702: Compatibility with Spring Security 4.0

JIRA: https://jira.spring.io/browse/INT-3702
---
 build.gradle                                         |  2 +-
 .../channel/ChannelSecurityInterceptorTests.java     | 11 ++++++-----
 .../security/config/commonSecurityConfiguration.xml  | 12 +++++-------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index ed263f4008..a7075ad497 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,7 +126,7 @@ subprojects { subproject ->
 		springDataMongoVersion = '1.7.0.RELEASE'
 		springDataRedisVersion = '1.5.0.RELEASE'
 		springGemfireVersion = '1.6.0.RELEASE'
-		springSecurityVersion = '3.2.5.RELEASE'
+		springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '3.2.7.RELEASE'
 		springSocialTwitterVersion = '1.1.0.RELEASE'
 		springRetryVersion = '1.1.2.RELEASE'
 		springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.2.0.BUILD-SNAPSHOT'
diff --git a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java
index 26b37ea228..d764a63766 100644
--- a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java
+++ b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java
@@ -17,18 +17,18 @@
 package org.springframework.integration.security.channel;
 
 import java.util.Collections;
+import java.util.List;
 import java.util.regex.Pattern;
 
 import org.junit.After;
 import org.junit.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.messaging.MessageChannel;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.messaging.support.GenericMessage;
 import org.springframework.integration.security.MockAuthenticationManager;
 import org.springframework.integration.security.SecurityTestUtils;
-import org.springframework.security.access.AccessDecisionVoter;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.support.GenericMessage;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.vote.AffirmativeBased;
 import org.springframework.security.access.vote.RoleVoter;
@@ -78,12 +78,13 @@ public class ChannelSecurityInterceptorTests {
 		return (MessageChannel) proxyFactory.getProxy();
 	}
 
+	@SuppressWarnings("rawtypes")
 	private static ChannelSecurityInterceptor createInterceptor(String role) throws Exception {
 		ChannelSecurityMetadataSource securityMetadataSource = new ChannelSecurityMetadataSource();
 		securityMetadataSource.addPatternMapping(Pattern.compile("secured.*"), new DefaultChannelAccessPolicy(role, null));
 		ChannelSecurityInterceptor interceptor = new ChannelSecurityInterceptor(securityMetadataSource);
-		@SuppressWarnings("rawtypes")
-		AffirmativeBased accessDecisionManager = new AffirmativeBased(Collections.<AccessDecisionVoter>singletonList(new RoleVoter()));
+		AffirmativeBased accessDecisionManager = AffirmativeBased.class.getConstructor(List.class)
+				.newInstance(Collections.singletonList(new RoleVoter()));;
 		accessDecisionManager.afterPropertiesSet();
 		interceptor.setAccessDecisionManager(accessDecisionManager);
 		interceptor.setAuthenticationManager(new MockAuthenticationManager(true));
diff --git a/spring-integration-security/src/test/java/org/springframework/integration/security/config/commonSecurityConfiguration.xml b/spring-integration-security/src/test/java/org/springframework/integration/security/config/commonSecurityConfiguration.xml
index a638f2ef7e..8ec45b87ac 100644
--- a/spring-integration-security/src/test/java/org/springframework/integration/security/config/commonSecurityConfiguration.xml
+++ b/spring-integration-security/src/test/java/org/springframework/integration/security/config/commonSecurityConfiguration.xml
@@ -10,15 +10,13 @@
 			http://www.springframework.org/schema/context
 			http://www.springframework.org/schema/context/spring-context.xsd">
 
-	<context:annotation-config/>	
+	<context:annotation-config/>
 
 	<beans:bean id="accessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased">
+		<beans:constructor-arg>
+			<beans:bean class="org.springframework.security.access.vote.RoleVoter"/>
+		</beans:constructor-arg>
 		<beans:property name="allowIfAllAbstainDecisions" value="true"/>
-		<beans:property name="decisionVoters">
-			<beans:list>
-				<beans:bean class="org.springframework.security.access.vote.RoleVoter"/>
-			</beans:list>
-		</beans:property>
 	</beans:bean>
 
 	<security:authentication-manager alias="authenticationManager">
@@ -30,4 +28,4 @@
 		<security:user name="bob" password="bobspassword" authorities="ROLE_USER"/>
 	</security:user-service>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>