[Java] Remove guava part 2. (#1244)

## What do these changes do? Remove guava part 2: Removed guava `Preconditions` usage Removed guava `Objects` usage Removed guava `MoreObjects` usage Removed guava `ImmutableList` Removed guava `ImmutableSet` & `ImmutableSortedSet` ## Related issue number #1113 ## Check code requirements - [ ] tests added / passed (if needed) - [ ] Ensure all linting tests pass, see [here](https://github.com/alipay/fury/blob/main/CONTRIBUTING.rst) for how to run them
apache · Dec 24, 2023 · 2112b37 · 2112b37
1 parent dfb2f43
commit 2112b37
Show file tree

Hide file tree

Showing 27 changed files with 34 additions and 42 deletions.
diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/NewJava11StringSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/NewJava11StringSuite.java
@@ -16,11 +16,11 @@
 
 package io.fury.benchmark;
 
-import com.google.common.base.Preconditions;
 import io.fury.Fury;
 import io.fury.memory.MemoryBuffer;
 import io.fury.serializer.StringSerializer;
 import io.fury.util.Platform;
+import io.fury.util.Preconditions;
 import io.fury.util.ReflectionUtils;
 import io.fury.util.StringUtils;
 import org.openjdk.jmh.Main;

diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/ZeroCopySuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/ZeroCopySuite.java
@@ -27,7 +27,6 @@
 import com.esotericsoftware.kryo.io.Output;
 import com.esotericsoftware.kryo.io.UnsafeMemoryInput;
 import com.esotericsoftware.kryo.io.UnsafeMemoryOutput;
-import com.google.common.base.Preconditions;
 import io.fury.Fury;
 import io.fury.benchmark.data.ComparableByteArray;
 import io.fury.benchmark.data.SerializableByteBuffer;
@@ -38,6 +37,7 @@
 import io.fury.serializer.BufferObject;
 import io.fury.test.bean.ArraysData;
 import io.fury.util.Platform;
+import io.fury.util.Preconditions;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;

diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Struct.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Struct.java
@@ -16,8 +16,8 @@
 
 package io.fury.benchmark.data;
 
-import com.google.common.base.Preconditions;
 import io.fury.util.ClassLoaderUtils;
+import io.fury.util.Preconditions;
 import java.io.Serializable;
 import java.io.StringReader;
 import java.lang.reflect.Field;

diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/FstState.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/state/FstState.java
@@ -16,7 +16,6 @@
 
 package io.fury.benchmark.state;
 
-import com.google.common.base.Preconditions;
 import io.fury.benchmark.IntsSerializationSuite;
 import io.fury.benchmark.LongStringSerializationSuite;
 import io.fury.benchmark.LongsSerializationSuite;
@@ -26,6 +25,7 @@
 import io.fury.benchmark.data.Media;
 import io.fury.benchmark.data.MediaContent;
 import io.fury.util.Platform;
+import io.fury.util.Preconditions;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import org.nustaq.serialization.FSTConfiguration;

diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/FuryState.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/state/FuryState.java
@@ -16,7 +16,6 @@
 
 package io.fury.benchmark.state;
 
-import com.google.common.base.Preconditions;
 import io.fury.Fury;
 import io.fury.benchmark.IntsSerializationSuite;
 import io.fury.benchmark.LongStringSerializationSuite;
@@ -36,6 +35,7 @@
 import io.fury.memory.MemoryUtils;
 import io.fury.resolver.MetaContext;
 import io.fury.util.LoggerFactory;
+import io.fury.util.Preconditions;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import org.openjdk.jmh.annotations.BenchmarkMode;

diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/HessionState.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/state/HessionState.java
@@ -18,7 +18,6 @@
 
 import com.caucho.hessian.io.Hessian2Input;
 import com.caucho.hessian.io.Hessian2Output;
-import com.google.common.base.Preconditions;
 import io.fury.benchmark.IntsSerializationSuite;
 import io.fury.benchmark.LongStringSerializationSuite;
 import io.fury.benchmark.LongsSerializationSuite;
@@ -28,6 +27,7 @@
 import io.fury.benchmark.data.Sample;
 import io.fury.benchmark.data.Struct;
 import io.fury.util.LoggerFactory;
+import io.fury.util.Preconditions;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/JDKState.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/state/JDKState.java
@@ -16,7 +16,6 @@
 
 package io.fury.benchmark.state;
 
-import com.google.common.base.Preconditions;
 import io.fury.benchmark.IntsSerializationSuite;
 import io.fury.benchmark.LongStringSerializationSuite;
 import io.fury.benchmark.LongsSerializationSuite;
@@ -26,6 +25,7 @@
 import io.fury.benchmark.data.Sample;
 import io.fury.benchmark.data.Struct;
 import io.fury.io.ClassLoaderObjectInputStream;
+import io.fury.util.Preconditions;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/JsonbState.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/state/JsonbState.java
@@ -22,14 +22,14 @@
 import com.alibaba.fastjson2.JSONReader;
 import com.alibaba.fastjson2.JSONWriter;
 import com.alibaba.fastjson2.reader.ObjectReaderProvider;
-import com.google.common.base.Preconditions;
 import io.fury.Fury;
 import io.fury.benchmark.data.CustomJDKSerialization;
 import io.fury.benchmark.data.MediaContent;
 import io.fury.benchmark.data.Sample;
 import io.fury.benchmark.data.Struct;
 import io.fury.util.LoggerFactory;
 import io.fury.util.Platform;
+import io.fury.util.Preconditions;
 import java.io.Serializable;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;

diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/KryoState.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/state/KryoState.java
@@ -25,7 +25,6 @@
 import com.esotericsoftware.kryo.io.UnsafeMemoryInput;
 import com.esotericsoftware.kryo.io.UnsafeMemoryOutput;
 import com.esotericsoftware.kryo.serializers.CompatibleFieldSerializer;
-import com.google.common.base.Preconditions;
 import io.fury.benchmark.IntsSerializationSuite;
 import io.fury.benchmark.LongStringSerializationSuite;
 import io.fury.benchmark.LongsSerializationSuite;
@@ -34,6 +33,7 @@
 import io.fury.benchmark.data.Image;
 import io.fury.benchmark.data.Media;
 import io.fury.benchmark.data.MediaContent;
+import io.fury.util.Preconditions;
 import java.util.ArrayList;
 import org.openjdk.jmh.annotations.CompilerControl;
 import org.openjdk.jmh.annotations.Fork;

diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/ProtostuffState.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/state/ProtostuffState.java
@@ -16,7 +16,6 @@
 
 package io.fury.benchmark.state;
 
-import com.google.common.base.Preconditions;
 import io.fury.benchmark.IntsSerializationSuite;
 import io.fury.benchmark.LongStringSerializationSuite;
 import io.fury.benchmark.LongsSerializationSuite;
@@ -25,6 +24,7 @@
 import io.fury.benchmark.data.MediaContent;
 import io.fury.benchmark.data.Sample;
 import io.fury.benchmark.data.Struct;
+import io.fury.util.Preconditions;
 import io.protostuff.LinkedBuffer;
 import io.protostuff.ProtostuffIOUtil;
 import io.protostuff.Schema;

diff --git a/java/fury-core/src/test/java/io/fury/codegen/ExpressionVisitorTest.java b/java/fury-core/src/test/java/io/fury/codegen/ExpressionVisitorTest.java
@@ -18,9 +18,9 @@
 
 import static org.testng.Assert.assertEquals;
 
-import com.google.common.base.Preconditions;
 import com.google.common.reflect.TypeToken;
 import io.fury.codegen.Expression.Literal;
+import io.fury.util.Preconditions;
 import io.fury.util.ReflectionUtils;
 import java.lang.invoke.SerializedLambda;
 import java.lang.reflect.InvocationTargetException;

diff --git a/java/fury-core/src/test/java/io/fury/serializer/ObjectSerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/ObjectSerializerTest.java
@@ -18,12 +18,12 @@
 
 import static org.testng.Assert.assertEquals;
 
-import com.google.common.base.Preconditions;
 import io.fury.Fury;
 import io.fury.config.Language;
 import io.fury.memory.MemoryBuffer;
 import io.fury.memory.MemoryUtils;
 import io.fury.test.bean.Cyclic;
+import io.fury.util.Preconditions;
 import lombok.Data;
 import org.testng.annotations.Test;
 

diff --git a/java/fury-core/src/test/java/io/fury/serializer/ObjectStreamSerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/ObjectStreamSerializerTest.java
@@ -19,13 +19,13 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertSame;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.fury.Fury;
 import io.fury.FuryTestBase;
 import io.fury.config.Language;
 import io.fury.memory.MemoryBuffer;
+import io.fury.util.Preconditions;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;

diff --git a/java/fury-core/src/test/java/io/fury/serializer/ReplaceResolveSerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/ReplaceResolveSerializerTest.java
@@ -21,12 +21,12 @@
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.assertTrue;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.fury.Fury;
 import io.fury.FuryTestBase;
 import io.fury.config.Language;
+import io.fury.util.Preconditions;
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;

diff --git a/java/fury-core/src/test/java/io/fury/serializer/StringSerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/StringSerializerTest.java
@@ -21,7 +21,6 @@
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-import com.google.common.base.Strings;
 import io.fury.Fury;
 import io.fury.FuryTestBase;
 import io.fury.collection.Tuple2;
@@ -153,7 +152,7 @@ public void testJavaString(boolean stringCompress) {
     MemoryBuffer buffer = MemoryUtils.buffer(32);
     StringSerializer serializer = new StringSerializer(fury);
 
-    String longStr = Strings.repeat("abc", 50);
+    String longStr = new String(new char[50]).replace("\0", "abc");
     buffer.writerIndex(0);
     buffer.readerIndex(0);
     serializer.writeJavaString(buffer, longStr);

diff --git a/java/fury-core/src/test/java/io/fury/serializer/collection/CollectionSerializersTest.java b/java/fury-core/src/test/java/io/fury/serializer/collection/CollectionSerializersTest.java
@@ -21,7 +21,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertSame;
 
-import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
@@ -49,6 +48,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.PriorityQueue;
 import java.util.Set;
 import java.util.SortedSet;
@@ -435,7 +435,7 @@ public boolean equals(Object o) {
       if (this == o) return true;
       if (o == null || getClass() != o.getClass()) return false;
       TestClassForDefaultCollectionSerializer strings = (TestClassForDefaultCollectionSerializer) o;
-      return Objects.equal(data, strings.data);
+      return Objects.equals(data, strings.data);
     }
 
     @Override

diff --git a/java/fury-core/src/test/java/io/fury/serializer/test/Inaccessible.java b/java/fury-core/src/test/java/io/fury/serializer/test/Inaccessible.java
@@ -16,7 +16,7 @@
 
 package io.fury.serializer.test;
 
-import com.google.common.base.Preconditions;
+import io.fury.util.Preconditions;
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;

diff --git a/java/fury-core/src/test/java/io/fury/util/StringUtilsTest.java b/java/fury-core/src/test/java/io/fury/util/StringUtilsTest.java
@@ -20,7 +20,6 @@
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-import com.google.common.base.CaseFormat;
 import org.testng.annotations.Test;
 
 public class StringUtilsTest {
@@ -37,14 +36,6 @@ public void testRandom() {
     assertEquals(StringUtils.random(4, 7), "#,q7");
   }
 
-  @Test
-  public void testSnake() {
-    assertEquals(
-        CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, "ABCDEfgHij"), "a_b_c_d_efg_hij");
-    assertEquals(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, "to_snake"), "to_snake");
-    assertEquals(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, "ABC"), "a_b_c");
-  }
-
   @Test
   public void testFormat() {
     assertEquals(StringUtils.format("${a}, ${b}", "a", 1, "b", "abc"), "1, abc");

diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/ArrayDataForEach.java b/java/fury-format/src/main/java/io/fury/format/encoder/ArrayDataForEach.java
@@ -18,7 +18,6 @@
 
 import static io.fury.type.TypeUtils.getRawType;
 
-import com.google.common.base.Preconditions;
 import com.google.common.reflect.TypeToken;
 import io.fury.annotation.Internal;
 import io.fury.codegen.ClosureVisitable;
@@ -29,6 +28,7 @@
 import io.fury.format.row.binary.BinaryArray;
 import io.fury.format.row.binary.BinaryUtils;
 import io.fury.type.TypeUtils;
+import io.fury.util.Preconditions;
 import io.fury.util.StringUtils;
 import io.fury.util.function.SerializableBiFunction;
 import io.fury.util.function.SerializableFunction;

diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/BaseBinaryEncoderBuilder.java b/java/fury-format/src/main/java/io/fury/format/encoder/BaseBinaryEncoderBuilder.java
@@ -18,7 +18,6 @@
 
 import static io.fury.type.TypeUtils.getRawType;
 
-import com.google.common.base.Preconditions;
 import com.google.common.reflect.TypeToken;
 import io.fury.builder.CodecBuilder;
 import io.fury.codegen.CodeGenerator;
@@ -54,6 +53,7 @@
 import io.fury.memory.MemoryBuffer;
 import io.fury.type.TypeUtils;
 import io.fury.util.DateTimeUtils;
+import io.fury.util.Preconditions;
 import io.fury.util.ReflectionUtils;
 import io.fury.util.StringUtils;
 import java.math.BigDecimal;

diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/RowEncoderBuilder.java b/java/fury-format/src/main/java/io/fury/format/encoder/RowEncoderBuilder.java
@@ -20,7 +20,6 @@
 import static io.fury.type.TypeUtils.getRawType;
 
 import com.google.common.base.CaseFormat;
-import com.google.common.base.Preconditions;
 import com.google.common.reflect.TypeToken;
 import io.fury.Fury;
 import io.fury.builder.CodecBuilder;
@@ -44,6 +43,7 @@
 import io.fury.type.TypeUtils;
 import io.fury.util.GraalvmSupport;
 import io.fury.util.LoggerFactory;
+import io.fury.util.Preconditions;
 import io.fury.util.StringUtils;
 import java.lang.reflect.Modifier;
 import java.util.SortedMap;

diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/BinaryArray.java b/java/fury-format/src/main/java/io/fury/format/row/binary/BinaryArray.java
@@ -24,13 +24,13 @@
 import static io.fury.format.type.DataTypes.PRIMITIVE_LONG_ARRAY_FIELD;
 import static io.fury.format.type.DataTypes.PRIMITIVE_SHORT_ARRAY_FIELD;
 
-import com.google.common.base.Preconditions;
 import io.fury.format.row.ArrayData;
 import io.fury.format.type.DataTypes;
 import io.fury.memory.BitUtils;
 import io.fury.memory.MemoryBuffer;
 import io.fury.memory.MemoryUtils;
 import io.fury.util.Platform;
+import io.fury.util.Preconditions;
 import java.math.BigDecimal;
 import org.apache.arrow.vector.types.pojo.Field;
 

diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/BinaryMap.java b/java/fury-format/src/main/java/io/fury/format/row/binary/BinaryMap.java
@@ -16,7 +16,6 @@
 
 package io.fury.format.row.binary;
 
-import com.google.common.base.MoreObjects;
 import io.fury.format.row.MapData;
 import io.fury.format.type.DataTypes;
 import io.fury.memory.MemoryBuffer;
@@ -134,10 +133,13 @@ public void writeTo(ByteBuffer buffer) {
 
   @Override
   public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("keys", keys)
-        .add("values", values)
-        .add("sizeInBytes", sizeInBytes)
-        .toString();
+    return "BinaryMap{"
+        + "keys="
+        + keys
+        + ", values="
+        + values
+        + ", sizeInBytes="
+        + sizeInBytes
+        + '}';
   }
 }
diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/BinaryRow.java b/java/fury-format/src/main/java/io/fury/format/row/binary/BinaryRow.java
@@ -18,12 +18,12 @@
 
 import static io.fury.util.Preconditions.checkArgument;
 
-import com.google.common.base.Preconditions;
 import io.fury.format.row.Row;
 import io.fury.format.type.DataTypes;
 import io.fury.memory.BitUtils;
 import io.fury.memory.MemoryBuffer;
 import io.fury.memory.MemoryUtils;
+import io.fury.util.Preconditions;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/java/fury-format/src/main/java/io/fury/format/type/DataTypes.java b/java/fury-format/src/main/java/io/fury/format/type/DataTypes.java
@@ -18,12 +18,12 @@
 
 import static io.fury.util.Preconditions.checkArgument;
 
-import com.google.common.base.Preconditions;
 import io.fury.exception.FuryException;
 import io.fury.io.FuryOutputStream;
 import io.fury.memory.MemoryBuffer;
 import io.fury.type.Type;
 import io.fury.util.DecimalUtils;
+import io.fury.util.Preconditions;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;