From e9e4c6b2eed6396aad307395074c180559056a71 Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Wed, 4 Apr 2018 15:27:51 +0200
Subject: [PATCH] Remove serialization logging as part of the serialization
 process

---
 .../util/serialization/SerializationManager.java       |  8 +++++---
 .../storage/DefaultStorageSerializationManager.java    | 10 +++++-----
 src/dorkbox/util/storage/Metadata.java                 |  4 ++--
 src/dorkbox/util/storage/StorageBase.java              |  6 +++---
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/dorkbox/util/serialization/SerializationManager.java b/src/dorkbox/util/serialization/SerializationManager.java
index 0f6e212..fed68f5 100644
--- a/src/dorkbox/util/serialization/SerializationManager.java
+++ b/src/dorkbox/util/serialization/SerializationManager.java
@@ -98,17 +98,19 @@ interface SerializationManager {
     /**
      * Writes the class and object using an available kryo instance
      */
-    void writeFullClassAndObject(final Logger logger, Output output, Object value) throws IOException;
+    void writeFullClassAndObject(Output output, Object value) throws IOException;
 
     /**
      * Returns a class read from the input
      */
-    Object readFullClassAndObject(final Logger logger, final Input input) throws IOException;
+    Object readFullClassAndObject(final Input input) throws IOException;
 
     /**
      * Called when initialization is complete. This is to prevent (and recognize) out-of-order class/serializer registration.
+     *
+     * The loggers are for trace debug output for the wire data
      */
-    void finishInit();
+    void finishInit(final Logger wireReadLogger, final Logger wireWriteLogger);
 
     /**
      * @return true if our initialization is complete. Some registrations (in the property store, for example) always register for client
diff --git a/src/dorkbox/util/storage/DefaultStorageSerializationManager.java b/src/dorkbox/util/storage/DefaultStorageSerializationManager.java
index 01d0456..a07a477 100644
--- a/src/dorkbox/util/storage/DefaultStorageSerializationManager.java
+++ b/src/dorkbox/util/storage/DefaultStorageSerializationManager.java
@@ -66,7 +66,7 @@ class DefaultStorageSerializationManager implements SerializationManager {
     public
     void write(final ByteBuf buffer, final Object message) {
         final Output output = new Output();
-        writeFullClassAndObject(null, output, message);
+        writeFullClassAndObject(output, message);
         buffer.writeBytes(output.getBuffer());
     }
 
@@ -76,7 +76,7 @@ class DefaultStorageSerializationManager implements SerializationManager {
         final Input input = new Input();
         buffer.readBytes(input.getBuffer());
 
-        final Object o = readFullClassAndObject(null, input);
+        final Object o = readFullClassAndObject(input);
         buffer.skipBytes(input.position());
 
         return o;
@@ -84,19 +84,19 @@ class DefaultStorageSerializationManager implements SerializationManager {
 
     @Override
     public
-    void writeFullClassAndObject(final Logger logger, final Output output, final Object value) {
+    void writeFullClassAndObject(final Output output, final Object value) {
         kryo.writeClassAndObject(output, value);
     }
 
     @Override
     public
-    Object readFullClassAndObject(final Logger logger, final Input input) throws IOException {
+    Object readFullClassAndObject(final Input input) throws IOException {
         return kryo.readClassAndObject(input);
     }
 
     @Override
     public
-    void finishInit() {
+    void finishInit(final Logger logger, final Logger writeLogger) {
     }
 
     @Override
diff --git a/src/dorkbox/util/storage/Metadata.java b/src/dorkbox/util/storage/Metadata.java
index 87919b4..43b0c93 100644
--- a/src/dorkbox/util/storage/Metadata.java
+++ b/src/dorkbox/util/storage/Metadata.java
@@ -275,7 +275,7 @@ class Metadata {
         input.setInputStream(input.getInputStream());
 
         @SuppressWarnings("unchecked")
-        T readObject = (T) serializationManager.readFullClassAndObject(null, input);
+        T readObject = (T) serializationManager.readFullClassAndObject(input);
         return readObject;
     }
 
@@ -289,7 +289,7 @@ class Metadata {
 
         output.clear();
 
-        serializationManager.writeFullClassAndObject(null, output, data);
+        serializationManager.writeFullClassAndObject(output, data);
         output.flush();
 
         return (int) output.total();
diff --git a/src/dorkbox/util/storage/StorageBase.java b/src/dorkbox/util/storage/StorageBase.java
index 6ca7e4e..c811716 100644
--- a/src/dorkbox/util/storage/StorageBase.java
+++ b/src/dorkbox/util/storage/StorageBase.java
@@ -483,7 +483,7 @@ class StorageBase {
                     }
                     else {
                         // this is comparatively slow, since we serialize it first to get the size, then we put it in the file.
-                        ByteArrayOutputStream dataStream = getDataAsByteArray(this.serializationManager, this.logger, object);
+                        ByteArrayOutputStream dataStream = getDataAsByteArray(this.serializationManager, object);
 
                         int size = dataStream.size();
                         if (size > metaData.dataCapacity) {
@@ -564,11 +564,11 @@ class StorageBase {
 
 
     private static
-    ByteArrayOutputStream getDataAsByteArray(SerializationManager serializationManager, Logger logger, Object data) throws IOException {
+    ByteArrayOutputStream getDataAsByteArray(SerializationManager serializationManager, Object data) throws IOException {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         Output output = new Output(outputStream, 1024); // write 1024 at a time
 
-        serializationManager.writeFullClassAndObject(logger, output, data);
+        serializationManager.writeFullClassAndObject(output, data);
         output.flush();
 
         outputStream.flush();