bump guava from 14.0.1 to 27.0-jre

apache · Nov 13, 2023 · aac129d · aac129d
1 parent eb1be3f
commit aac129d
Show file tree

Hide file tree

Showing 22 changed files with 228 additions and 107 deletions.
diff --git a/common/src/main/java/org/apache/celeborn/common/network/buffer/FileSegmentManagedBuffer.java b/common/src/main/java/org/apache/celeborn/common/network/buffer/FileSegmentManagedBuffer.java
@@ -21,8 +21,8 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.file.StandardOpenOption;
-
-import com.google.common.base.Objects;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import com.google.common.io.ByteStreams;
 import io.netty.channel.DefaultFileRegion;
 
@@ -145,10 +145,10 @@ public long getLength() {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
-        .add("file", file)
-        .add("offset", offset)
-        .add("length", length)
+    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+        .append("file", file)
+        .append("offset", offset)
+        .append("length", length)
         .toString();
   }
 }
diff --git a/common/src/main/java/org/apache/celeborn/common/network/buffer/NettyManagedBuffer.java b/common/src/main/java/org/apache/celeborn/common/network/buffer/NettyManagedBuffer.java
@@ -18,10 +18,11 @@
 package org.apache.celeborn.common.network.buffer;
 
 import java.io.IOException;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 
-import com.google.common.base.Objects;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.Unpooled;
@@ -77,6 +78,8 @@ public Object convertToNetty() throws IOException {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this).add("buf", buf).toString();
+    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+      .append("buf", buf)
+      .toString();
   }
 }
diff --git a/common/src/main/java/org/apache/celeborn/common/network/buffer/NioManagedBuffer.java b/common/src/main/java/org/apache/celeborn/common/network/buffer/NioManagedBuffer.java
@@ -18,10 +18,11 @@
 package org.apache.celeborn.common.network.buffer;
 
 import java.io.IOException;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 
-import com.google.common.base.Objects;
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.Unpooled;
 
@@ -65,6 +66,8 @@ public Object convertToNetty() throws IOException {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this).add("buf", buf).toString();
+    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+        .append("buf", buf)
+        .toString();
   }
 }
diff --git a/common/src/main/java/org/apache/celeborn/common/network/client/TransportClient.java b/common/src/main/java/org/apache/celeborn/common/network/client/TransportClient.java
@@ -18,14 +18,15 @@
 package org.apache.celeborn.common.network.client;
 
 import java.io.Closeable;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import java.io.IOException;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.SettableFuture;
 import io.netty.channel.Channel;
@@ -314,10 +315,10 @@ public void close() {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
-        .add("remoteAddress", channel.remoteAddress())
-        .add("isActive", isActive())
-        .toString();
+    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+      .append("remoteAdress", channel.remoteAddress())
+      .append("isActive", isActive())
+      .toString();
   }
 
   private static final AtomicLong counter = new AtomicLong();

diff --git a/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchFailure.java b/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchFailure.java
@@ -17,7 +17,9 @@
 
 package org.apache.celeborn.common.network.protocol;
 
-import com.google.common.base.Objects;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.Objects;
 import io.netty.buffer.ByteBuf;
 
 import org.apache.celeborn.common.protocol.PbChunkFetchRequest;
@@ -56,7 +58,7 @@ public static ChunkFetchFailure decode(ByteBuf buf) {
 
   @Override
   public int hashCode() {
-    return Objects.hashCode(streamChunkSlice, errorString);
+    return Objects.hash(streamChunkSlice, errorString);
   }
 
   @Override
@@ -70,9 +72,9 @@ public boolean equals(Object other) {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
-        .add("streamChunkId", streamChunkSlice)
-        .add("errorString", errorString)
+    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+        .append("streamChunkId", streamChunkSlice)
+        .append("errorString", errorString)
         .toString();
   }
 }
diff --git a/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchRequest.java b/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchRequest.java
@@ -17,7 +17,8 @@
 
 package org.apache.celeborn.common.network.protocol;
 
-import com.google.common.base.Objects;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import io.netty.buffer.ByteBuf;
 
 /**
@@ -67,6 +68,8 @@ public boolean equals(Object other) {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this).add("streamChunkId", streamChunkSlice).toString();
+    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+        .append("streamChunkId", streamChunkSlice)
+        .toString();
   }
 }
diff --git a/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchSuccess.java b/common/src/main/java/org/apache/celeborn/common/network/protocol/ChunkFetchSuccess.java
@@ -17,7 +17,9 @@
 
 package org.apache.celeborn.common.network.protocol;
 
-import com.google.common.base.Objects;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.Objects;
 import io.netty.buffer.ByteBuf;
 
 import org.apache.celeborn.common.network.buffer.ManagedBuffer;
@@ -76,7 +78,7 @@ public static ChunkFetchSuccess decode(ByteBuf buf, boolean decodeBody) {
 
   @Override
   public int hashCode() {
-    return Objects.hashCode(streamChunkSlice, body());
+    return Objects.hash(streamChunkSlice, body());
   }
 
   @Override
@@ -90,9 +92,9 @@ public boolean equals(Object other) {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
-        .add("streamChunkId", streamChunkSlice)
-        .add("buffer", body())
+    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+        .append("streamChunkId", streamChunkSlice)
+        .append("buffer", body())
         .toString();
   }
 }
diff --git a/common/src/main/java/org/apache/celeborn/common/network/protocol/Message.java b/common/src/main/java/org/apache/celeborn/common/network/protocol/Message.java
@@ -19,7 +19,7 @@
 
 import java.nio.ByteBuffer;
 
-import com.google.common.base.Objects;
+import java.util.Objects;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 
@@ -56,7 +56,7 @@ public boolean needCopyOut() {
   }
 
   protected boolean equals(Message other) {
-    return Objects.equal(body, other.body);
+    return Objects.equals(body, other.body);
   }
 
   public ByteBuffer toByteBuffer() {

diff --git a/common/src/main/java/org/apache/celeborn/common/network/protocol/OneWayMessage.java b/common/src/main/java/org/apache/celeborn/common/network/protocol/OneWayMessage.java
@@ -17,7 +17,9 @@
 
 package org.apache.celeborn.common.network.protocol;
 
-import com.google.common.base.Objects;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.Objects;
 import io.netty.buffer.ByteBuf;
 
 import org.apache.celeborn.common.network.buffer.ManagedBuffer;
@@ -66,7 +68,7 @@ public static OneWayMessage decode(ByteBuf buf, boolean decodeBody) {
 
   @Override
   public int hashCode() {
-    return Objects.hashCode(body());
+    return Objects.hash(body());
   }
 
   @Override
@@ -80,6 +82,8 @@ public boolean equals(Object other) {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this).add("body", body()).toString();
+    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+        .append("body", body())
+        .toString();
   }
 }
diff --git a/common/src/main/java/org/apache/celeborn/common/network/protocol/OpenStream.java b/common/src/main/java/org/apache/celeborn/common/network/protocol/OpenStream.java
@@ -20,7 +20,9 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
-import com.google.common.base.Objects;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.Objects;
 import io.netty.buffer.ByteBuf;
 
 /**
@@ -81,7 +83,7 @@ public static OpenStream decode(ByteBuf buf) {
 
   @Override
   public int hashCode() {
-    return Objects.hashCode(
+    return Objects.hash(
         Arrays.hashCode(shuffleKey), Arrays.hashCode(fileName), startMapIndex, endMapIndex);
   }
 
@@ -99,11 +101,11 @@ public boolean equals(Object other) {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
-        .add("shuffleKey", new String(shuffleKey, StandardCharsets.UTF_8))
-        .add("fileName", new String(fileName, StandardCharsets.UTF_8))
-        .add("startMapIndex", startMapIndex)
-        .add("endMapIndex", endMapIndex)
+    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+        .append("shuffleKey", new String(shuffleKey, StandardCharsets.UTF_8))
+        .append("fileName", new String(fileName, StandardCharsets.UTF_8))
+        .append("startMapIndex", startMapIndex)
+        .append("endMapIndex", endMapIndex)
         .toString();
   }
 }
diff --git a/common/src/main/java/org/apache/celeborn/common/network/protocol/PushData.java b/common/src/main/java/org/apache/celeborn/common/network/protocol/PushData.java
@@ -17,7 +17,9 @@
 
 package org.apache.celeborn.common.network.protocol;
 
-import com.google.common.base.Objects;
+import java.util.Objects;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 import io.netty.buffer.ByteBuf;
 
 import org.apache.celeborn.common.network.buffer.ManagedBuffer;
@@ -86,7 +88,7 @@ public static PushData decode(ByteBuf buf, boolean decodeBody) {
 
   @Override
   public int hashCode() {
-    return Objects.hashCode(requestId, mode, shuffleKey, partitionUniqueId, body());
+    return Objects.hash(requestId, mode, shuffleKey, partitionUniqueId, body());
   }
 
   @Override
@@ -104,12 +106,12 @@ public boolean equals(Object other) {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
-        .add("requestId", requestId)
-        .add("mode", mode)
-        .add("shuffleKey", shuffleKey)
-        .add("partitionUniqueId", partitionUniqueId)
-        .add("body size", body().size())
+    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+        .append("requestId", requestId)
+        .append("mode", mode)
+        .append("shuffleKey", shuffleKey)
+        .append("partitionUniqueId", partitionUniqueId)
+        .append("body size", body().size())
         .toString();
   }
 }
diff --git a/common/src/main/java/org/apache/celeborn/common/network/protocol/PushDataHandShake.java b/common/src/main/java/org/apache/celeborn/common/network/protocol/PushDataHandShake.java
@@ -17,7 +17,9 @@
 
 package org.apache.celeborn.common.network.protocol;
 
-import com.google.common.base.Objects;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.Objects;
 import io.netty.buffer.ByteBuf;
 
 @Deprecated
@@ -83,7 +85,7 @@ public static PushDataHandShake decode(ByteBuf buf) {
 
   @Override
   public int hashCode() {
-    return Objects.hashCode(
+    return Objects.hash(
         mode, shuffleKey, partitionUniqueId, attemptId, numPartitions, bufferSize);
   }
 
@@ -104,13 +106,13 @@ public boolean equals(Object other) {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
-        .add("mode", mode)
-        .add("shuffleKey", shuffleKey)
-        .add("partitionUniqueId", partitionUniqueId)
-        .add("attemptId", attemptId)
-        .add("numSubPartitions", numPartitions)
-        .add("bufferSize", bufferSize)
+    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+        .append("mode", mode)
+        .append("shuffleKey", shuffleKey)
+        .append("partitionUniqueId", partitionUniqueId)
+        .append("attemptId", attemptId)
+        .append("numSubPartitions", numPartitions)
+        .append("bufferSize", bufferSize)
         .toString();
   }
 }
diff --git a/common/src/main/java/org/apache/celeborn/common/network/protocol/PushMergedData.java b/common/src/main/java/org/apache/celeborn/common/network/protocol/PushMergedData.java
@@ -19,7 +19,9 @@
 
 import java.util.Arrays;
 
-import com.google.common.base.Objects;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.Objects;
 import io.netty.buffer.ByteBuf;
 
 import org.apache.celeborn.common.network.buffer.ManagedBuffer;
@@ -99,7 +101,7 @@ public static PushMergedData decode(ByteBuf buf, boolean decodeBody) {
 
   @Override
   public int hashCode() {
-    return Objects.hashCode(requestId, mode, shuffleKey);
+    return Objects.hash(requestId, mode, shuffleKey);
   }
 
   @Override
@@ -118,13 +120,13 @@ public boolean equals(Object other) {
 
   @Override
   public String toString() {
-    return Objects.toStringHelper(this)
-        .add("requestId", requestId)
-        .add("mode", mode)
-        .add("shuffleKey", shuffleKey)
-        .add("partitionIds", Arrays.toString(partitionUniqueIds))
-        .add("batchOffsets", Arrays.toString(batchOffsets))
-        .add("body size", body().size())
+    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+        .append("requestId", requestId)
+        .append("mode", mode)
+        .append("shuffleKey", shuffleKey)
+        .append("partitionIds", Arrays.toString(partitionUniqueIds))
+        .append("batchOffsets", Arrays.toString(batchOffsets))
+        .append("body size", body().size())
         .toString();
   }
 }