From 6f3a7d9e48861e78be1dfdf00ee41774ffa6bb91 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 2 Mar 2023 15:33:27 +0100
Subject: [PATCH] Ditch dependency on commons-lang3

We are using only Pair, and we do not allow null values, hence we can
just switch to using Map.entry() and ditch this dependency.

JIRA: CONTROLLER-2072
Change-Id: Ida8ba2a28489cd011757e48074c58ad8cb260a34
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 third-party/atomix/storage/pom.xml              |  4 ----
 .../io/atomix/utils/serializer/Namespace.java   | 17 +++++++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/third-party/atomix/storage/pom.xml b/third-party/atomix/storage/pom.xml
index df50be6e54..8bbcb7c523 100644
--- a/third-party/atomix/storage/pom.xml
+++ b/third-party/atomix/storage/pom.xml
@@ -38,10 +38,6 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.esotericsoftware</groupId>
       <artifactId>kryo</artifactId>
diff --git a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Namespace.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Namespace.java
index f62ba084ca..b9eeaf269c 100644
--- a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Namespace.java
+++ b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Namespace.java
@@ -26,7 +26,6 @@ import com.esotericsoftware.kryo.pool.KryoPool;
 import com.esotericsoftware.kryo.serializers.CompatibleFieldSerializer;
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
-import org.apache.commons.lang3.tuple.Pair;
 import org.objenesis.strategy.StdInstantiatorStrategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,6 +37,8 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Objects;
 
 import static java.util.Objects.requireNonNull;
@@ -99,7 +100,7 @@ public final class Namespace implements KryoFactory, KryoPool {
   //@NotThreadSafe
   public static final class Builder {
     private int blockHeadId = INITIAL_ID;
-    private List<Pair<Class<?>[], Serializer<?>>> types = new ArrayList<>();
+    private List<Entry<Class<?>[], Serializer<?>>> types = new ArrayList<>();
     private List<RegistrationBlock> blocks = new ArrayList<>();
     private ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
     private boolean registrationRequired = true;
@@ -162,7 +163,7 @@ public final class Namespace implements KryoFactory, KryoPool {
      * @return this
      */
     public Builder register(Serializer<?> serializer, final Class<?>... classes) {
-      types.add(Pair.of(classes, requireNonNull(serializer)));
+      types.add(Map.entry(classes, serializer));
       return this;
     }
 
@@ -431,8 +432,8 @@ public final class Namespace implements KryoFactory, KryoPool {
       if (id == FLOATING_ID) {
         id = kryo.getNextRegistrationId();
       }
-      for (Pair<Class<?>[], Serializer<?>> entry : block.types()) {
-        register(kryo, entry.getLeft(), entry.getRight(), id++);
+      for (Entry<Class<?>[], Serializer<?>> entry : block.types()) {
+        register(kryo, entry.getKey(), entry.getValue(), id++);
       }
     }
     return kryo;
@@ -520,9 +521,9 @@ public final class Namespace implements KryoFactory, KryoPool {
 
   static final class RegistrationBlock {
     private final int begin;
-    private final ImmutableList<Pair<Class<?>[], Serializer<?>>> types;
+    private final ImmutableList<Entry<Class<?>[], Serializer<?>>> types;
 
-    RegistrationBlock(int begin, List<Pair<Class<?>[], Serializer<?>>> types) {
+    RegistrationBlock(int begin, List<Entry<Class<?>[], Serializer<?>>> types) {
       this.begin = begin;
       this.types = ImmutableList.copyOf(types);
     }
@@ -531,7 +532,7 @@ public final class Namespace implements KryoFactory, KryoPool {
       return begin;
     }
 
-    public ImmutableList<Pair<Class<?>[], Serializer<?>>> types() {
+    public ImmutableList<Entry<Class<?>[], Serializer<?>>> types() {
       return types;
     }
 
-- 
2.36.6