Test CLA

build.gradle

@@ -5,7 +5,8 @@ buildscript {
 	dependencies {
 		classpath("com.bmuschko:gradle-tomcat-plugin:2.2.5")
 		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
-		classpath("io.spring.gradle:spring-io-plugin:0.0.4.RELEASE")
+		classpath("io.spring.gradle:spring-io-plugin:0.0.5.RELEASE")
+		classpath("io.spring.gradle:dependency-management-plugin:0.6.0.RELEASE")
 		classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1')
 		classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.2'
 		classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
@@ -18,7 +19,7 @@ plugins {
 
 group = 'org.springframework.session'
 
-ext.springBootVersion = '1.3.2.RELEASE'
+ext.springBootVersion = '1.4.0.RELEASE'
 ext.IDE_GRADLE = "$rootDir/gradle/ide.gradle"
 ext.JAVA_GRADLE = "$rootDir/gradle/java.gradle"
 ext.SPRING3_GRADLE = "$rootDir/gradle/spring3.gradle"

docs/build.gradle

@@ -33,12 +33,12 @@ dependencies {
 				"org.springframework.security:spring-security-config:${springSecurityVersion}",
 				"org.springframework.security:spring-security-web:${springSecurityVersion}",
 				"org.springframework.security:spring-security-test:${springSecurityVersion}",
-				'junit:junit:4.11',
-				'org.mockito:mockito-core:1.9.5',
+				"junit:junit:$junitVersion",
+				"org.mockito:mockito-core:$mockitoVersion",
 				"org.springframework:spring-test:$springVersion",
 				"org.assertj:assertj-core:$assertjVersion",
 				"com.hazelcast:hazelcast:$hazelcastVersion",
-				"redis.clients:jedis:2.4.1",
+				"redis.clients:jedis:$jedisVersion",
 				"javax.servlet:javax.servlet-api:$servletApiVersion"
 }
 

gradle.properties

@@ -13,14 +13,14 @@ gebVersion=0.13.1
 mockitoVersion=1.10.19
 hazelcastVersion=3.5.4
 seleniumVersion=2.52.0
-springSecurityVersion=4.0.3.RELEASE
-springVersion=4.2.5.RELEASE
+springSecurityVersion=4.1.3.RELEASE
+springVersion=4.3.2.RELEASE
 httpClientVersion=4.5.1
 jedisVersion=2.8.1
 h2Version=1.4.192
 springDataMongoVersion=1.9.1.RELEASE
 springShellVersion=1.1.0.RELEASE
-springDataGemFireVersion=1.8.1.RELEASE
+springDataGemFireVersion=1.8.2.RELEASE
 springDataGeodeVersion=1.0.0.APACHE-GEODE-INCUBATING-M2
 assertjVersion=2.3.0
 spockVersion=1.0-groovy-2.4

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip

samples/httpsession-gemfire-boot/src/main/java/sample/client/Application.java

@@ -157,8 +157,7 @@ PoolFactoryBean gemfirePool(
 		gemfirePool.setPingInterval(TimeUnit.SECONDS.toMillis(15));
 		gemfirePool.setRetryAttempts(1);
 		gemfirePool.setSubscriptionEnabled(true);
-		gemfirePool.setServerEndpoints(
-				Collections.singleton(newConnectionEndpoint(host, port)));
+		gemfirePool.setServers(Collections.singleton(newConnectionEndpoint(host, port)));
 
 		return gemfirePool;
 	}

samples/httpsession-redis-json/build.gradle

@@ -0,0 +1,68 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
+    }
+}
+
+apply plugin: 'spring-boot'
+
+apply from: JAVA_GRADLE
+
+//tasks.findByPath("artifactoryPublish")?.enabled = false
+
+group = 'samples'
+ext {
+    jsonassertVersion="1.3.0"
+    assertjVersion = "2.4.0"
+}
+
+dependencies {
+    compile project(':spring-session'),
+            "org.springframework.boot:spring-boot-starter-redis",
+            "org.springframework.boot:spring-boot-starter-web",
+            "org.springframework.boot:spring-boot-starter-thymeleaf",
+            "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
+            "org.springframework.security:spring-security-web:$springSecurityVersion",
+            "org.springframework.security:spring-security-core:$springSecurityVersion",
+            "org.springframework.security:spring-security-config:$springSecurityVersion",
+            "org.apache.httpcomponents:httpclient"
+
+    testCompile "org.springframework.boot:spring-boot-starter-test",
+            "org.assertj:assertj-core:$assertjVersion"
+    testCompile "org.skyscreamer:jsonassert:$jsonassertVersion"
+    testCompile "org.assertj:assertj-core:$assertjVersion"
+    integrationTestCompile gebDependencies,
+            "org.spockframework:spock-spring:$spockVersion"
+
+}
+//
+integrationTest {
+    doFirst {
+        def port = reservePort()
+
+        def host = 'localhost:' + port
+        systemProperties['geb.build.baseUrl'] = 'http://'+host+'/'
+        systemProperties['geb.build.reportsDir'] = 'build/geb-reports'
+        systemProperties['server.port'] = port
+        systemProperties['management.port'] = 0
+
+        systemProperties['spring.session.redis.namespace'] = project.name
+    }
+    jvmArgs "-XX:-UseSplitVerifier"
+}
+
+integrationTest {
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+}
+
+def reservePort() {
+    def socket = new ServerSocket(0)
+    def result = socket.localPort
+    socket.close()
+    result
+}

samples/httpsession-redis-json/src/integration-test/groovy/samples/HttpRedisJsonTest.groovy

@@ -0,0 +1,54 @@
+package samples
+
+import geb.spock.*
+import sample.Application
+import samples.pages.*
+import spock.lang.Stepwise
+
+import org.springframework.boot.test.IntegrationTest
+import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.context.web.WebAppConfiguration
+
+/**
+ * @author jitendra on 15/3/16.
+ */
+@Stepwise
+@ContextConfiguration(classes = Application, loader = SpringApplicationContextLoader)
+@WebAppConfiguration
+@IntegrationTest
+class HttpRedisJsonTest extends GebSpec {
+
+	def'login page test'() {
+		when:
+		to LoginPage
+		then:
+		at LoginPage
+	}
+
+	def"Unauthenticated user sent to login page"() {
+		when:
+		via HomePage
+		then:
+		at LoginPage
+	}
+
+	def"Successful Login test"() {
+		when:
+		login()
+		then:
+		at HomePage
+		driver.manage().cookies.find {it.name == "SESSION"}
+		!driver.manage().cookies.find {it.name == "JSESSIONID"}
+	}
+
+	def"Set and get attributes in session"() {
+		when:
+		setAttribute("Demo Key", "Demo Value")
+
+		then:
+		at SetAttributePage
+		tdKey()*.text().contains("Demo Key")
+		tdKey()*.text().contains("Demo Value")
+	}
+}

samples/httpsession-redis-json/src/integration-test/groovy/samples/pages/HomePage.groovy

@@ -0,0 +1,26 @@
+package samples.pages
+
+import geb.Page
+
+/**
+ * @author jitendra on 15/3/16.
+ */
+class HomePage extends Page {
+	static url="/"
+
+	static at=
+	{
+        driver.title == "Spring Session Sample - Home"
+    }
+
+	static content=
+	{
+        form { $('form') }
+        submit { $('button[type=submit]') }
+        setAttribute(required: false) { key = 'project', value = 'SessionRedisJson' ->
+            form.key = key
+            form.value = value
+            submit.click(SetAttributePage)
+        }
+    }
+}

samples/httpsession-redis-json/src/integration-test/groovy/samples/pages/LoginPage.groovy

@@ -0,0 +1,27 @@
+package samples.pages
+
+import geb.Page
+
+/**
+ * @author jitendra on 15/3/16.
+ */
+class LoginPage extends Page {
+	static url="/login"
+
+	static at=
+	{
+        assert title == "Spring Session Sample - Login"
+        return true
+    }
+
+	static content=
+	{
+        form { $('form') }
+        submit { $('button[type=submit]') }
+        login(required: false) { user = 'user', pass = 'password' ->
+            form.username = user
+            form.password = pass
+            submit.click(HomePage)
+        }
+    }
+}

samples/httpsession-redis-json/src/integration-test/groovy/samples/pages/SetAttributePage.groovy

@@ -0,0 +1,20 @@
+package samples.pages
+
+import geb.Page
+
+/**
+ * @author jitendra on 15/3/16.
+ */
+class SetAttributePage extends Page {
+	static url="/setValue"
+
+	static at=
+	{
+        title == "Spring Session Sample - Home"
+    }
+
+	static content=
+	{
+        tdKey { $('td') }
+    }
+}

samples/httpsession-redis-json/src/integration-test/java/samples/RedisSerializerTest.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014-2016 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package samples;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import sample.Application;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author jitendra on 8/3/16.
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(Application.class)
+public class RedisSerializerTest {
+
+	@Autowired
+	RedisTemplate<Object, Object> sessionRedisTemplate;
+
+	@Test
+	public void testRedisTemplate() {
+		assertThat(this.sessionRedisTemplate).isNotNull();
+		assertThat(this.sessionRedisTemplate.getDefaultSerializer()).isNotNull();
+		assertThat(this.sessionRedisTemplate.getDefaultSerializer())
+				.isInstanceOf(GenericJackson2JsonRedisSerializer.class);
+	}
+}

samples/httpsession-redis-json/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2014-2016 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.security.jackson2;
+
+import java.util.Collection;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+import org.springframework.security.core.GrantedAuthority;
+
+/**
+ * This is a Jackson mixin class helps in serialize/deserialize
+ * {@link org.springframework.security.authentication.AnonymousAuthenticationToken} class.
+ * To use this class you need to register it with
+ * {@link com.fasterxml.jackson.databind.ObjectMapper} and
+ * {@link SimpleGrantedAuthorityMixin} because AnonymousAuthenticationToken contains
+ * SimpleGrantedAuthority. <pre>
+ *     ObjectMapper mapper = new ObjectMapper();
+ *     mapper.registerModule(new CoreJackson2Module());
+ * </pre>
+ *
+ * <i>Note: This class will save full class name into a property called @class</i>
+ *
+ * @author Jitendra Singh
+ * @see CoreJackson2Module
+ * @see SecurityJacksonModules
+ * @since 4.2
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, isGetterVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.ANY)
+@JsonIgnoreProperties(ignoreUnknown = true)
+class AnonymousAuthenticationTokenMixin {
+
+	/**
+	 * Constructor used by Jackson to create object of
+	 * {@link org.springframework.security.authentication.AnonymousAuthenticationToken}.
+	 *
+	 * @param keyHash hashCode of key provided at the time of token creation by using
+	 * {@link org.springframework.security.authentication.AnonymousAuthenticationToken#AnonymousAuthenticationToken(String, Object, Collection)}
+	 * @param principal the principal (typically a <code>UserDetails</code>)
+	 * @param authorities the authorities granted to the principal
+	 */
+	@JsonCreator
+	AnonymousAuthenticationTokenMixin(@JsonProperty("keyHash") Integer keyHash,
+			@JsonProperty("principal") Object principal,
+			@JsonProperty("authorities") Collection<? extends GrantedAuthority> authorities) {
+	}
+}