Do not leak Kryo from atomix.storage

[controller.git] / third-party / atomix / storage / src / main / java / io / atomix / storage / journal / JournalSerdes.java

diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSerdes.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSerdes.java
index af9ccb56f4e0960695783e2a3318f44773aa9d0b..6114aff27be688a444e0444a1c8cf0a1d64c0c97 100644 (file)
--- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSerdes.java
+++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSerdes.java
@@ -16,8 +16,10 @@
  */
 package io.atomix.storage.journal;
 
-import com.esotericsoftware.kryo.Serializer;
+import com.google.common.annotations.Beta;
+import com.google.common.annotations.VisibleForTesting;
 import io.atomix.utils.serializer.Namespace;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
@@ -139,11 +141,11 @@ public interface JournalSerdes {
          * When multiple classes are registered with an explicitly provided serializer, the namespace guarantees
          * all instances will be serialized with the same type ID.
          *
-         * @param classes    list of classes to register
-         * @param serializer serializer to use for the class
+         * @param classes list of classes to register
+         * @param serdes  serializer to use for the class
          * @return this builder
          */
-        Builder register(Serializer<?> serializer, Class<?>... classes);
+        Builder register(EntrySerdes<?> serdes, Class<?>... classes);
 
         /**
          * Sets the namespace class loader.
@@ -153,4 +155,52 @@ public interface JournalSerdes {
          */
         Builder setClassLoader(ClassLoader classLoader);
     }
+
+    /**
+     * Input data stream exposed to {@link EntrySerdes#read(EntryInput)}.
+     */
+    @Beta
+    interface EntryInput {
+
+        byte[] readBytes(int length) throws IOException;
+
+        long readLong() throws IOException;
+
+        String readString() throws IOException;
+
+        Object readObject() throws IOException;
+
+        @VisibleForTesting
+        int readVarInt() throws IOException;
+    }
+
+    /**
+     * Output data stream exposed to {@link EntrySerdes#write(EntryOutput, Object)}.
+     */
+    @Beta
+    interface EntryOutput {
+
+        void writeBytes(byte[] bytes) throws IOException;
+
+        void writeLong(long value) throws IOException;
+
+        void writeObject(Object value) throws IOException;
+
+        void writeString(String value) throws IOException;
+
+        @VisibleForTesting
+        void writeVarInt(int value) throws IOException;
+    }
+
+    /**
+     * A serializer/deserializer for an entry.
+     *
+     * @param <T> Entry type
+     */
+    interface EntrySerdes<T> {
+
+        T read(EntryInput input) throws IOException;
+
+        void write(EntryOutput output, T entry) throws IOException;
+    }
 }