Upgrade spring-flex-core to Java 8 version (remove JdkVersion class)

spring-flex-core/pom.xml

@@ -53,6 +53,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
+			<version>3.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.annotation</groupId>
@@ -94,22 +95,22 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.adobe.blazeds</groupId>
-			<artifactId>blazeds-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.adobe.blazeds</groupId>
-			<artifactId>blazeds-common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.adobe.blazeds</groupId>
-			<artifactId>blazeds-proxy</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.adobe.blazeds</groupId>
-			<artifactId>blazeds-remoting</artifactId>
-		</dependency>
+ 		<dependency>
+            <groupId>org.apache.flex.blazeds</groupId>
+            <artifactId>flex-messaging-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flex.blazeds</groupId>
+            <artifactId>flex-messaging-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flex.blazeds</groupId>
+            <artifactId>flex-messaging-proxy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flex.blazeds</groupId>
+            <artifactId>flex-messaging-remoting</artifactId>
+        </dependency>
 		<dependency>
 			<groupId>javax.jms</groupId>
 			<artifactId>jms-api</artifactId>

spring-flex-core/src/main/java/org/springframework/flex/config/FlexConfigurationManager.java

@@ -36,7 +36,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ResourceLoaderAware;
-import org.springframework.core.JdkVersion;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.ResourcePatternResolver;
@@ -98,7 +97,19 @@ public FlexConfigurationManager(ResourceLoader resourceLoader, String configurat
      */
     @SuppressWarnings("unchecked")
     public MessagingConfiguration getMessagingConfiguration(ServletConfig servletConfig) {
-        Assert.isTrue(JdkVersion.getMajorJavaVersion() >= JdkVersion.JAVA_15, "Spring BlazeDS Integration requires a minimum of Java 1.5");
+    	String[] javaVersionElements = System.getProperty("java.version").split("\\.");
+	int major = 0;
+    	 // Check about Java version
+    	 // If Java version is greater or equals than 10 we get the first element (i.e. JDK 12.0.2 get 12)
+    	 // Else Java version lower then 10 get the second element (i.e. JDK 1.8.260 get 8)
+         if (javaVersionElements.length>0 && Integer.parseInt(javaVersionElements[0])>=10) {
+             major = Integer.parseInt(javaVersionElements[0]);
+         }else if (javaVersionElements.length>1){
+             major = Integer.parseInt(javaVersionElements[1]);
+         }
+
+        Assert.isTrue(major >= 5, "Spring BlazeDS Integration requires a minimum of Java 1.5");
+
         Assert.notNull(servletConfig, "FlexConfigurationManager requires a non-null ServletConfig - "
             + "Is it being used outside a WebApplicationContext?");
 

spring-flex-core/src/main/java/org/springframework/flex/http/AmfHttpMessageConverter.java

@@ -41,6 +41,7 @@
 import flex.messaging.io.amf.AmfMessageDeserializer;
 import flex.messaging.io.amf.AmfMessageSerializer;
 import flex.messaging.io.amf.AmfTrace;
+import flex.messaging.validators.DeserializationValidator;
 
 /**
  * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter}
@@ -59,10 +60,16 @@ public class AmfHttpMessageConverter extends AbstractHttpMessageConverter<Object
 	private static final String ACTION_MSG_ERROR = "Could not read input message body as "+ActionMessage.class.getName();
 	private static final Log log = LogFactory.getLog(AmfHttpMessageConverter.class);
 
+	private DeserializationValidator deserializationValidator;
+
     public AmfHttpMessageConverter() {
         super(MediaType.parseMediaType(MessageIOConstants.AMF_CONTENT_TYPE));
     }
 
+	public void setDeserializationValidator(DeserializationValidator deserializationValidator) {
+		this.deserializationValidator = deserializationValidator;
+	}
+
     /**
      * {@inheritDoc}
      */

spring-flex-core/src/main/java/org/springframework/flex/security3/AntPathRequestMatcher.java

@@ -20,7 +20,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.security.web.util.RequestMatcher;
+import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.Assert;
 

spring-flex-core/src/main/java/org/springframework/flex/security3/EndpointInterceptor.java

@@ -110,11 +110,10 @@ public void setObjectDefinitionSource(EndpointSecurityMetadataSource newSource)
     }
 
 	private void configureDefaultAccessDecisionManager() {
-        AffirmativeBased adm = new AffirmativeBased();
-        List<AccessDecisionVoter> voters = new ArrayList<AccessDecisionVoter>();
+		List<AccessDecisionVoter<? extends Object>> voters = new ArrayList<AccessDecisionVoter<? extends Object>>();
         voters.add(new RoleVoter());
         voters.add(new AuthenticatedVoter());
-        adm.setDecisionVoters(voters);
+        AffirmativeBased adm = new AffirmativeBased(voters);
         setAccessDecisionManager(adm);
     }
 

spring-flex-core/src/main/java/org/springframework/flex/security3/EndpointSecurityMetadataSource.java

@@ -29,7 +29,7 @@
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityMetadataSource;
 import org.springframework.security.web.access.intercept.DefaultFilterInvocationSecurityMetadataSource;
-import org.springframework.security.web.util.RequestMatcher;
+import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
 
 import flex.messaging.FlexContext;

spring-flex-core/src/main/java/org/springframework/flex/security3/SecurityConfigurationPostProcessor.java

@@ -38,6 +38,7 @@
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.flex.core.ExceptionTranslator;
 import org.springframework.security.web.FilterChainProxy;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.RememberMeServices;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
@@ -157,9 +158,11 @@ private static final class FilterChainAccessor {
     	public FilterChainAccessor(FilterChainProxy proxy) {    		
     		this.filters = new LinkedHashSet<Filter>();
 
-            for (List<Filter> filters : proxy.getFilterChainMap().values()) {
-                this.filters.addAll(filters);
-            }
+    		List<SecurityFilterChain> mappings = proxy.getFilterChains();
+    		for(SecurityFilterChain entry : mappings) {
+    			List<Filter> filters = entry.getFilters();
+    			this.filters.addAll(filters);
+    		}
     	}
 
     	public Set<Filter> getFilters() {

spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointInterceptorTests.java

@@ -44,9 +44,9 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.util.RequestMatcher;
+import org.springframework.security.web.util.matcher.RequestMatcher;
 
 import flex.messaging.FlexContext;
 import flex.messaging.endpoints.AbstractEndpoint;
@@ -124,7 +124,7 @@ public void serviceAuthorized() throws Exception {
         when(this.endpoint.serviceMessage(this.inMessage)).thenReturn(this.outMessage);
 
         List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-        authorities.add(new GrantedAuthorityImpl("ROLE_USER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
         Authentication auth = new UsernamePasswordAuthenticationToken("foo", "bar", authorities);
         SecurityContextHolder.getContext().setAuthentication(auth);
 

spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointSecurityIntegrationTests.java

@@ -48,9 +48,9 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.util.RequestMatcher;
+import org.springframework.security.web.util.matcher.RequestMatcher;
 
 import flex.messaging.FlexContext;
 import flex.messaging.MessageBroker;
@@ -65,7 +65,7 @@ public class EndpointSecurityIntegrationTests extends AbstractMessageBrokerTests
 
     private EndpointSecurityMetadataSource source;
 
-    private final AccessDecisionManager adm = new AffirmativeBased();
+    private AccessDecisionManager adm;
 
     @Mock
     private AuthenticationManager mgr;
@@ -85,10 +85,10 @@ public void setUp() throws Exception {
         requestMap.put(new AntPathRequestMatcher("/messagebroker/**"), attrs);
         this.source = new EndpointSecurityMetadataSource(requestMap);
 
-        List<AccessDecisionVoter> voters = new ArrayList<AccessDecisionVoter>();
+        List<AccessDecisionVoter<? extends Object>> voters = new ArrayList<AccessDecisionVoter<? extends Object>>();
         voters.add(new RoleVoter());
-        ((AffirmativeBased) this.adm).setDecisionVoters(voters);
-
+        this.adm = new AffirmativeBased(voters);
+        
         initializeInterceptors();
 
         this.request = new MockHttpServletRequest();
@@ -103,7 +103,7 @@ public void tearDown() {
     @Test
     public void serviceAuthorized() throws Exception {
         List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-        authorities.add(new GrantedAuthorityImpl("ROLE_USER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
         Authentication auth = new UsernamePasswordAuthenticationToken("foo", "bar", authorities);
         SecurityContextHolder.getContext().setAuthentication(auth);
 

spring-flex-core/src/test/java/org/springframework/flex/security3/EndpointSecurityMetadataSourceTests.java

@@ -33,7 +33,7 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
-import org.springframework.security.web.util.RequestMatcher;
+import org.springframework.security.web.util.matcher.RequestMatcher;
 
 import flex.messaging.FlexContext;
 import flex.messaging.endpoints.AMFEndpoint;

spring-flex-core/src/test/java/org/springframework/flex/security3/LoginMessageInterceptorTests.java

@@ -29,7 +29,7 @@
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import flex.messaging.messages.AcknowledgeMessage;
@@ -62,7 +62,7 @@ public void postProcessPassThrough() {
     @SuppressWarnings("rawtypes")
     public void postProcessSuccessfulLogin() {
         List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-        authorities.add(new GrantedAuthorityImpl("ROLE_USER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
         Authentication auth = new UsernamePasswordAuthenticationToken("foo", "bar", authorities);
         SecurityContextHolder.getContext().setAuthentication(auth);
 

spring-flex-core/src/test/java/org/springframework/flex/security3/SpringSecurityLoginCommandTests.java

@@ -16,10 +16,13 @@
 
 package org.springframework.flex.security3;
 
-import org.junit.After;
-import static org.junit.Assert.*;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -28,6 +31,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.springframework.flex.core.AbstractMessageBrokerTests;
@@ -40,7 +46,7 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -127,8 +133,8 @@ public void validLogin() throws Exception {
     @Test
     public void matchingAuthority() throws Exception {
         List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-        authorities.add(new GrantedAuthorityImpl("ROLE_USER"));
-        authorities.add(new GrantedAuthorityImpl("ROLE_ABUSER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_ABUSER"));
         Principal principal = new UsernamePasswordAuthenticationToken("foo", "bar", authorities);
 
         List<String> roles = new ArrayList<String>();
@@ -140,8 +146,8 @@ public void matchingAuthority() throws Exception {
     @Test
     public void noMatchingAuthority() throws Exception {
         List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
-        authorities.add(new GrantedAuthorityImpl("ROLE_USER"));
-        authorities.add(new GrantedAuthorityImpl("ROLE_ABUSER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
+        authorities.add(new SimpleGrantedAuthority("ROLE_ABUSER"));
         Principal principal = new UsernamePasswordAuthenticationToken("foo", "bar", authorities);
 
         List<String> roles = new ArrayList<String>();

spring-flex-core/src/test/resources/custom-services-config.xml

@@ -1,16 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<services-config>
-
-    <services>
-        <service-include file-path="custom-remoting-config.xml" />      
-    </services> 
-
-    <channels>
-
-        <channel-definition id="my-custom-path-channel" class="mx.messaging.channels.AMFChannel">
-            <endpoint url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf" class="flex.messaging.endpoints.AMFEndpoint"/>
-        </channel-definition>
-
-     </channels>
-
-</services-config>
+<?xml version="1.0" encoding="UTF-8"?>
+<services-config>
+
+    <services>
+        <service-include file-path="custom-remoting-config.xml" />      
+    </services> 
+
+	<channels>
+
+		<channel-definition id="my-custom-path-channel"
+			class="mx.messaging.channels.AMFChannel">
+			<endpoint
+				url="http://{server.name}:{server.port}/{context.root}/messagebroker/amf"
+				class="flex.messaging.endpoints.AMFEndpoint" />
+			<properties>
+				<serialization>
+					<allow-xml>true</allow-xml>
+				</serialization>
+			</properties>
+		</channel-definition>
+
+	</channels>
+
+	<validators>
+		<validator
+			class="flex.messaging.validators.ClassDeserializationValidator">
+			<properties>
+				<allow-classes>
+					<class name="org.*" />
+				</allow-classes>
+			</properties>
+		</validator>
+	</validators>
+
+</services-config>

spring-flex-core/src/test/resources/org/springframework/flex/config/security-context.xml

@@ -2,9 +2,9 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:security="http://www.springframework.org/schema/security"
   xsi:schemaLocation="http://www.springframework.org/schema/beans 
-  			  http://www.springframework.org/schema/beans/spring-beans.xsd
+  			  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
   			  http://www.springframework.org/schema/security
-              http://www.springframework.org/schema/security/spring-security-3.2.xsd">
+              http://www.springframework.org/schema/security/spring-security.xsd">
 
 	<security:http entry-point-ref="testEntryPoint">
 		<security:form-login/>