Add JacksonMongoSessionConverter

Fixes gh-416

spring-session/src/integration-test/java/org/springframework/session/data/mongo/AbstractMongoRepositoryITests.java

@@ -15,19 +15,13 @@
  */
 package org.springframework.session.data.mongo;
 
-import java.net.UnknownHostException;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import com.mongodb.MongoClient;
 import org.junit.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.authority.AuthorityUtils;
@@ -36,20 +30,17 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.session.FindByIndexNameSessionRepository;
 import org.springframework.session.Session;
 import org.springframework.session.data.AbstractITests;
-import org.springframework.session.data.mongo.config.annotation.web.http.EnableMongoHttpSession;
-import org.springframework.test.context.ContextConfiguration;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Jakub Kubrynski
  */
-@ContextConfiguration
-public class MongoRepositoryITests extends AbstractITests {
+abstract public class AbstractMongoRepositoryITests extends AbstractITests {
 
-	private static final String SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";
+	protected static final String SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";
 
-	private static final String INDEX_NAME = FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME;
+	protected static final String INDEX_NAME = FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME;
 
 	@Autowired
 	protected MongoOperationsSessionRepository repository;
@@ -290,26 +281,6 @@ public class MongoRepositoryITests extends AbstractITests {
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
 	}
 
-	@Test
-	public void findByPrincipalNameNoSecurityPrincipalNameChangeReload()
-			throws Exception {
-		MongoExpiringSession toSave = this.repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
-
-		this.repository.save(toSave);
-
-		toSave = this.repository.getSession(toSave.getId());
-
-		toSave.setAttribute("other", "value");
-		this.repository.save(toSave);
-
-		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
-				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
-
-		assertThat(findByPrincipalName).hasSize(1);
-		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
-	}
-
 	@Test
 	public void findByDeletedSecurityPrincipalName() throws Exception {
 		MongoExpiringSession toSave = this.repository.createSession();
@@ -347,23 +318,6 @@ public class MongoRepositoryITests extends AbstractITests {
 		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
 	}
 
-	@Test
-	public void findByDeletedSecurityPrincipalNameReload() throws Exception {
-		MongoExpiringSession toSave = this.repository.createSession();
-		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
-
-		this.repository.save(toSave);
-
-		MongoExpiringSession getSession = this.repository.getSession(toSave.getId());
-		getSession.setAttribute(INDEX_NAME, null);
-		this.repository.save(getSession);
-
-		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
-				.findByIndexNameAndIndexValue(INDEX_NAME, getChangedSecurityName());
-
-		assertThat(findByPrincipalName).isEmpty();
-	}
-
 	@Test
 	public void findByChangedSecurityPrincipalNameReload() throws Exception {
 		MongoExpiringSession toSave = this.repository.createSession();
@@ -402,22 +356,12 @@ public class MongoRepositoryITests extends AbstractITests {
 		assertThat(expiredSessionFromDb).isNull();
 	}
 
-	private String getSecurityName() {
+	protected String getSecurityName() {
 		return this.context.getAuthentication().getName();
 	}
 
-	private String getChangedSecurityName() {
+	protected String getChangedSecurityName() {
 		return this.changedContext.getAuthentication().getName();
 	}
 
-	@Configuration
-	@EnableMongoHttpSession
-	static class Config {
-
-		@Bean
-		public MongoOperations mongoOperations() throws UnknownHostException {
-			return new MongoTemplate(new MongoClient(), "test");
-		}
-
-	}
 }

spring-session/src/integration-test/java/org/springframework/session/data/mongo/MongoRepositoryJacksonITests.java

@@ -0,0 +1,70 @@
+/*
+ * 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.session.data.mongo;
+
+import java.net.UnknownHostException;
+import java.util.Map;
+import java.util.UUID;
+
+import com.mongodb.MongoClient;
+import org.junit.Test;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.session.data.mongo.config.annotation.web.http.EnableMongoHttpSession;
+import org.springframework.test.context.ContextConfiguration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Jakub Kubrynski
+ */
+@ContextConfiguration
+public class MongoRepositoryJacksonITests extends AbstractMongoRepositoryITests {
+
+	@Test
+	public void findByCustomIndex() throws Exception {
+		MongoExpiringSession toSave = this.repository.createSession();
+		String cartId = "cart-" + UUID.randomUUID();
+		toSave.setAttribute("cartId", cartId);
+
+		this.repository.save(toSave);
+
+		Map<String, MongoExpiringSession> findByCartId = this.repository
+				.findByIndexNameAndIndexValue("cartId", cartId);
+
+		assertThat(findByCartId).hasSize(1);
+		assertThat(findByCartId.keySet()).containsOnly(toSave.getId());
+	}
+
+	@Configuration
+	@EnableMongoHttpSession
+	static class Config {
+
+		@Bean
+		public MongoOperations mongoOperations() throws UnknownHostException {
+			return new MongoTemplate(new MongoClient(), "test");
+		}
+
+		@Bean
+		public AbstractMongoSessionConverter mongoSessionConverter() {
+			return new JacksonMongoSessionConverter();
+		}
+
+	}
+}

spring-session/src/integration-test/java/org/springframework/session/data/mongo/MongoRepositoryJdkSerializationITests.java

@@ -0,0 +1,91 @@
+/*
+ * 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.session.data.mongo;
+
+import java.net.UnknownHostException;
+import java.util.Map;
+
+import com.mongodb.MongoClient;
+import org.junit.Test;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.session.data.mongo.config.annotation.web.http.EnableMongoHttpSession;
+import org.springframework.test.context.ContextConfiguration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Jakub Kubrynski
+ */
+@ContextConfiguration
+public class MongoRepositoryJdkSerializationITests extends AbstractMongoRepositoryITests {
+
+	@Test
+	public void findByDeletedSecurityPrincipalNameReload() throws Exception {
+		MongoExpiringSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
+
+		this.repository.save(toSave);
+
+		MongoExpiringSession getSession = this.repository.getSession(toSave.getId());
+		getSession.setAttribute(INDEX_NAME, null);
+		this.repository.save(getSession);
+
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getChangedSecurityName());
+
+		assertThat(findByPrincipalName).isEmpty();
+	}
+
+	@Test
+	public void findByPrincipalNameNoSecurityPrincipalNameChangeReload()
+			throws Exception {
+		MongoExpiringSession toSave = this.repository.createSession();
+		toSave.setAttribute(SPRING_SECURITY_CONTEXT, this.context);
+
+		this.repository.save(toSave);
+
+		toSave = this.repository.getSession(toSave.getId());
+
+		toSave.setAttribute("other", "value");
+		this.repository.save(toSave);
+
+		Map<String, MongoExpiringSession> findByPrincipalName = this.repository
+				.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName());
+
+		assertThat(findByPrincipalName).hasSize(1);
+		assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId());
+	}
+
+	@Configuration
+	@EnableMongoHttpSession
+	static class Config {
+
+		@Bean
+		public MongoOperations mongoOperations() throws UnknownHostException {
+			return new MongoTemplate(new MongoClient(), "test");
+		}
+
+		@Bean
+		public AbstractMongoSessionConverter mongoSessionConverter() {
+			return new JdkMongoSessionConverter();
+		}
+
+	}
+}