From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 25 Mar 2024 08:47:22 +0000 (+0100)
Subject: Rename patched ByteBufferInput
X-Git-Tag: v8.0.6~9
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2d4ff7ae7828088e4a5a001cb3b276010029106a;p=controller.git

Rename patched ByteBufferInput

Hide the patched version and renake it to Kryo505ByteBufferInput.

JIRA: CONTROLLER-2109
Change-Id: Ie2b50dab13f1ae93e343f18acf4a05a890616576
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit b8ffb53727577325903dc487e2ac65bef668e058)
---

diff --git a/atomix-storage/src/main/java/io/atomix/utils/serializer/ByteBufferInput.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/Kryo505ByteBufferInput.java
similarity index 97%
rename from atomix-storage/src/main/java/io/atomix/utils/serializer/ByteBufferInput.java
rename to atomix-storage/src/main/java/io/atomix/utils/serializer/Kryo505ByteBufferInput.java
index 515572ca81..ed66011aba 100644
--- a/atomix-storage/src/main/java/io/atomix/utils/serializer/ByteBufferInput.java
+++ b/atomix-storage/src/main/java/io/atomix/utils/serializer/Kryo505ByteBufferInput.java
@@ -19,6 +19,7 @@
 
 package io.atomix.utils.serializer;
 
+import com.esotericsoftware.kryo.io.ByteBufferInput;
 import java.nio.ByteBuffer;
 
 /**
@@ -28,8 +29,8 @@ import java.nio.ByteBuffer;
  * @author Roman Levenstein &lt;romixlev@gmail.com&gt;
  * @author Robert Varga
  */
-public class ByteBufferInput extends com.esotericsoftware.kryo.io.ByteBufferInput {
-	public ByteBufferInput (ByteBuffer buffer) {
+public final class Kryo505ByteBufferInput extends ByteBufferInput {
+	Kryo505ByteBufferInput (ByteBuffer buffer) {
 		super(buffer);
 	}
 
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 c84dd2086c..64f35389c1 100644
--- a/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdes.java
+++ b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdes.java
@@ -21,6 +21,7 @@ import static java.util.Objects.requireNonNull;
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.Registration;
 import com.esotericsoftware.kryo.Serializer;
+import com.esotericsoftware.kryo.io.ByteBufferInput;
 import com.esotericsoftware.kryo.io.ByteBufferOutput;
 import com.esotericsoftware.kryo.pool.KryoCallback;
 import com.esotericsoftware.kryo.pool.KryoFactory;
@@ -145,7 +146,7 @@ final class KryoJournalSerdes implements JournalSerdes, KryoFactory, KryoPool {
         Kryo kryo = borrow();
         try {
             @SuppressWarnings("unchecked")
-            T obj = (T) kryo.readClassAndObject(new ByteBufferInput(buffer));
+            T obj = (T) kryo.readClassAndObject(new Kryo505ByteBufferInput(buffer));
             return obj;
         } finally {
             release(kryo);
@@ -162,7 +163,7 @@ final class KryoJournalSerdes implements JournalSerdes, KryoFactory, KryoPool {
         Kryo kryo = borrow();
         try {
             @SuppressWarnings("unchecked")
-            T obj = (T) kryo.readClassAndObject(new com.esotericsoftware.kryo.io.ByteBufferInput(stream, bufferSize));
+            T obj = (T) kryo.readClassAndObject(new ByteBufferInput(stream, bufferSize));
             return obj;
         } finally {
             release(kryo);