Polishing.

Author: gregturn

src/main/java/org/springframework/session/data/mongo/JacksonMongoSessionConverter.java

@@ -111,8 +111,10 @@ protected DBObject convert(MongoSession source) {
 
 		try {
 			DBObject dbSession = (DBObject) JSON.parse(this.objectMapper.writeValueAsString(source));
-			dbSession.put(EXPIRE_AT_FIELD_NAME, source.getExpireAt());
+
+			// Override default serialization with proper values.
 			dbSession.put(PRINCIPAL_FIELD_NAME, extractPrincipal(source));
+			dbSession.put(EXPIRE_AT_FIELD_NAME, source.getExpireAt());
 			return dbSession;
 		} catch (JsonProcessingException e) {
 			throw new IllegalStateException("Cannot convert MongoExpiringSession", e);
@@ -123,8 +125,7 @@ protected DBObject convert(MongoSession source) {
 	@Nullable
 	protected MongoSession convert(Document source) {
 
-		Date expireAt = source.getDate(EXPIRE_AT_FIELD_NAME);
-		source.remove(EXPIRE_AT_FIELD_NAME);
+		Date expireAt = (Date) source.remove(EXPIRE_AT_FIELD_NAME);
 		String json = source.toJson(JsonWriterSettings.builder().outputMode(JsonMode.RELAXED).build());
 
 		try {

src/test/java/org/springframework/session/data/mongo/JacksonMongoSessionConverterTest.java

@@ -44,7 +44,7 @@ AbstractMongoSessionConverter getMongoSessionConverter() {
 	}
 
 	@Test
-	public void shouldSaveIdField() throws Exception {
+	public void shouldSaveIdField() {
 
 		// given
 		MongoSession session = new MongoSession();
@@ -109,16 +109,19 @@ public void shouldLoadExpireAtFromDocument() {
 
 		// given
 		Date now = new Date();
-		HashMap data = new HashMap();
+		HashMap<String, Object> data = new HashMap<>();
+
 		data.put("expireAt", now);
 		data.put("@class", MongoSession.class.getName());
 		data.put("_id", new ObjectId().toString());
+		
 		Document document = new Document(data);
 
 		// when
 		MongoSession convertedSession = this.mongoSessionConverter.convert(document);
 
 		// then
+		assertThat(convertedSession).isNotNull();
 		assertThat(convertedSession.getExpireAt()).isEqualTo(now);
 	}