Move RedisSession serialization details to RedisSession.

Note: order of serialized attributes has changed. This change will mean that all currently serialized sessions will be invalid.

Author: jcoleman

src/main/java/com/orangefunction/tomcat/redissessions/JavaSerializer.java

@@ -20,7 +20,6 @@ public byte[] serializeFrom(HttpSession session) throws IOException {
     RedisSession redisSession = (RedisSession) session;
     ByteArrayOutputStream bos = new ByteArrayOutputStream();
     try (ObjectOutputStream oos = new ObjectOutputStream(new BufferedOutputStream(bos))) {
-      oos.writeLong(redisSession.getCreationTime());
       redisSession.writeObjectData(oos);
     }
 
@@ -35,7 +34,6 @@ public HttpSession deserializeInto(byte[] data, HttpSession session) throws IOEx
         BufferedInputStream bis = new BufferedInputStream(new ByteArrayInputStream(data));
         ObjectInputStream ois = new CustomObjectInputStream(bis, loader);
     ) {
-        redisSession.setCreationTime(ois.readLong());
         redisSession.readObjectData(ois);
         return session;
     }

src/main/java/com/orangefunction/tomcat/redissessions/RedisSession.java

@@ -105,4 +105,16 @@ public void setPrincipal(Principal principal) {
     super.setPrincipal(principal);
   }
 
+  @Override
+  public void writeObjectData(java.io.ObjectOutputStream out) throws IOException {
+    super.writeObjectData(out);
+    out.writeLong(this.getCreationTime());
+  }
+
+  @Override
+  public void readObjectData(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
+    super.readObjectData(in);
+    this.setCreationTime(in.readLong());
+  }
+
 }