Deprecate more of serdes

The JournalSerdes is deprecated for removal, as are all the classes
directly related to it. This patch applies the second part of that
sentence.

Change-Id: I0ddb7293dfef539526ecb46598db7e194bdaf8f1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/atomix-storage/src/main/java/io/atomix/utils/serializer/EntrySerializer.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/EntrySerializer.java
index 0508f1eee58f00f114c61f81d495cce8c86c14de..f8355244b1657897900716fa9adaf23766d8a35c 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/utils/serializer/EntrySerializer.java
+++ b/atomix-storage/src/main/java/io/atomix/utils/serializer/EntrySerializer.java
@@ -27,6 +27,7 @@ import com.google.common.base.MoreObjects;
 import io.atomix.storage.journal.JournalSerdes.EntrySerdes;
 import java.io.IOException;
 
+@Deprecated(forRemoval = true, since="9.0.3")
 final class EntrySerializer<T> extends Serializer<T> {
     // Note: uses identity to create things in Kryo, hence we want an instance for every serdes we wrap
     private final JavaSerializer javaSerializer = new JavaSerializer();

diff --git a/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryInput.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryInput.java
index 2a98f160731ab81471ffc6bb230087054304bb99..1c0e500928e8cf5e07be5e326bf541b2b2cb97e2 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryInput.java
+++ b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryInput.java
@@ -24,6 +24,7 @@ import com.esotericsoftware.kryo.serializers.JavaSerializer;
 import io.atomix.storage.journal.JournalSerdes.EntryInput;
 import java.io.IOException;
 
+@Deprecated(forRemoval = true, since="9.0.3")
 final class KryoEntryInput implements EntryInput {
     private final Kryo kryo;
     private final Input input;

diff --git a/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryOutput.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryOutput.java
index 90886dde036fcc4403bde3838060182d1beb617a..5e9133290683062d8ad151a51833ca431a30f3f7 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryOutput.java
+++ b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryOutput.java
@@ -24,6 +24,7 @@ import com.esotericsoftware.kryo.serializers.JavaSerializer;
 import io.atomix.storage.journal.JournalSerdes.EntryOutput;
 import java.io.IOException;
 
+@Deprecated(forRemoval = true, since="9.0.3")
 final class KryoEntryOutput implements EntryOutput {
     private final Kryo kryo;
     private final Output output;

diff --git a/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdes.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdes.java
index 64f35389c13f0ebba05244fb9dbda96fccc4fe2e..7742f981c64830852f2fcc221bcb7b8d6b00aa92 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdes.java
+++ b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdes.java
@@ -41,6 +41,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Pool of Kryo instances, with classes pre-registered.
  */
+@Deprecated(forRemoval = true, since="9.0.3")
 final class KryoJournalSerdes implements JournalSerdes, KryoFactory, KryoPool {
     /**
      * Default buffer size used for serialization.

diff --git a/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdesBuilder.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdesBuilder.java
index a62d8b32931e9e7cb06ed263a2bc0f26586263f8..0caf7eaca6a3780830572f3f84b6b8160456b2f3 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdesBuilder.java
+++ b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdesBuilder.java
@@ -25,6 +25,7 @@ import io.atomix.storage.journal.JournalSerdes.EntrySerdes;
 import java.util.ArrayList;
 import java.util.List;
 
+@Deprecated(forRemoval = true, since="9.0.3")
 public final class KryoJournalSerdesBuilder implements Builder {
     private final List<RegisteredType> types = new ArrayList<>();
     private ClassLoader classLoader = Thread.currentThread().getContextClassLoader();

diff --git a/atomix-storage/src/main/java/io/atomix/utils/serializer/RegisteredType.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/RegisteredType.java
index 0a17c09bf244aba27f4cbb2d50f6e433866a2263..79cccbe4e367086deac8751509d78e49a185a0e8 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/utils/serializer/RegisteredType.java
+++ b/atomix-storage/src/main/java/io/atomix/utils/serializer/RegisteredType.java
@@ -17,6 +17,7 @@ package io.atomix.utils.serializer;
 
 import static java.util.Objects.requireNonNull;
 
+@Deprecated(forRemoval = true, since="9.0.3")
 record RegisteredType(EntrySerializer<?> serializer, Class<?>[] types) {
     RegisteredType {
         requireNonNull(serializer);

diff --git a/atomix-storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java b/atomix-storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java
index 487c314141707bd4a60bdc4189aea2fce58baccc..d4bc43d9b28298dcd620333261bfde885d372eae 100644 (file)
--- a/atomix-storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java
+++ b/atomix-storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java
@@ -45,6 +45,7 @@ import org.junit.runners.Parameterized;
  */
 @RunWith(Parameterized.class)
 public abstract class AbstractJournalTest {
+    @Deprecated(forRemoval = true, since="9.0.3")
     private static final JournalSerdes NAMESPACE = JournalSerdes.builder()
         .register(new TestEntrySerdes(), TestEntry.class)
         .register(new ByteArraySerdes(), byte[].class)

diff --git a/atomix-storage/src/test/java/io/atomix/storage/journal/TestEntrySerdes.java b/atomix-storage/src/test/java/io/atomix/storage/journal/TestEntrySerdes.java
index 8b04539bd730189e2fbce8395592a1925da183c7..8ef4183261f2e05a3942687c44874883d78d6fa1 100644 (file)
--- a/atomix-storage/src/test/java/io/atomix/storage/journal/TestEntrySerdes.java
+++ b/atomix-storage/src/test/java/io/atomix/storage/journal/TestEntrySerdes.java
@@ -20,6 +20,7 @@ import io.atomix.storage.journal.JournalSerdes.EntryOutput;
 import io.atomix.storage.journal.JournalSerdes.EntrySerdes;
 import java.io.IOException;
 
+@Deprecated(forRemoval = true, since="9.0.3")
 final class TestEntrySerdes implements EntrySerdes<TestEntry> {
     private static final ByteArraySerdes BA_SERIALIZER = new ByteArraySerdes();