From 6e6204b0cf4f90abbfbb4f16e7fcc081fc86e75f Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 7 Aug 2023 14:41:51 +0800 Subject: [PATCH] [Java] move record utils to record pkg (#856) move record utils to record pkg --- .../java/io/fury/integration_tests/RecordSerializersTest.java | 4 ++-- .../fury-core/src/main/java/io/fury/builder/CodecBuilder.java | 2 +- .../main/java/io/fury/serializer/CompatibleSerializer.java | 4 ++-- .../main/java/io/fury/serializer/MetaSharedSerializer.java | 4 ++-- .../src/main/java/io/fury/serializer/ObjectSerializer.java | 4 ++-- java/fury-core/src/main/java/io/fury/type/Descriptor.java | 4 ++-- .../src/main/java/io/fury/type/DescriptorGrouper.java | 2 +- .../main/java/io/fury/util/{ => record}/RecordComponent.java | 2 +- .../src/main/java/io/fury/util/{ => record}/RecordInfo.java | 2 +- .../src/main/java/io/fury/util/{ => record}/RecordUtils.java | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) rename java/fury-core/src/main/java/io/fury/util/{ => record}/RecordComponent.java (99%) rename java/fury-core/src/main/java/io/fury/util/{ => record}/RecordInfo.java (98%) rename java/fury-core/src/main/java/io/fury/util/{ => record}/RecordUtils.java (99%) diff --git a/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/RecordSerializersTest.java b/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/RecordSerializersTest.java index b76133c425..48d5bf71ee 100644 --- a/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/RecordSerializersTest.java +++ b/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/RecordSerializersTest.java @@ -23,8 +23,8 @@ import io.fury.resolver.MetaContext; import io.fury.serializer.CompatibleMode; import io.fury.test.bean.Struct; -import io.fury.util.RecordComponent; -import io.fury.util.RecordUtils; +import io.fury.util.record.RecordComponent; +import io.fury.util.record.RecordUtils; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/java/fury-core/src/main/java/io/fury/builder/CodecBuilder.java b/java/fury-core/src/main/java/io/fury/builder/CodecBuilder.java index b83b81d9f5..3a895bf531 100644 --- a/java/fury-core/src/main/java/io/fury/builder/CodecBuilder.java +++ b/java/fury-core/src/main/java/io/fury/builder/CodecBuilder.java @@ -43,9 +43,9 @@ import io.fury.resolver.ClassInfoCache; import io.fury.type.Descriptor; import io.fury.util.Platform; -import io.fury.util.RecordUtils; import io.fury.util.ReflectionUtils; import io.fury.util.StringUtils; +import io.fury.util.record.RecordUtils; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.HashMap; diff --git a/java/fury-core/src/main/java/io/fury/serializer/CompatibleSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/CompatibleSerializer.java index 38235e36d7..9b9b34c53e 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/CompatibleSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/CompatibleSerializer.java @@ -25,9 +25,9 @@ import io.fury.resolver.RefResolver; import io.fury.util.FieldAccessor; import io.fury.util.Platform; -import io.fury.util.RecordInfo; -import io.fury.util.RecordUtils; import io.fury.util.ReflectionUtils; +import io.fury.util.record.RecordInfo; +import io.fury.util.record.RecordUtils; import java.lang.invoke.MethodHandle; import java.util.Arrays; import java.util.Collection; diff --git a/java/fury-core/src/main/java/io/fury/serializer/MetaSharedSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/MetaSharedSerializer.java index 7401c50ade..db55813423 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/MetaSharedSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/MetaSharedSerializer.java @@ -33,9 +33,9 @@ import io.fury.type.Generics; import io.fury.util.FieldAccessor; import io.fury.util.Platform; -import io.fury.util.RecordInfo; -import io.fury.util.RecordUtils; import io.fury.util.ReflectionUtils; +import io.fury.util.record.RecordInfo; +import io.fury.util.record.RecordUtils; import java.lang.invoke.MethodHandle; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/java/fury-core/src/main/java/io/fury/serializer/ObjectSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/ObjectSerializer.java index 01c5b0f0cd..572fe53b0b 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/ObjectSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/ObjectSerializer.java @@ -35,9 +35,9 @@ import io.fury.type.Generics; import io.fury.util.FieldAccessor; import io.fury.util.Platform; -import io.fury.util.RecordInfo; -import io.fury.util.RecordUtils; import io.fury.util.ReflectionUtils; +import io.fury.util.record.RecordInfo; +import io.fury.util.record.RecordUtils; import java.lang.invoke.MethodHandle; import java.util.ArrayList; import java.util.Arrays; diff --git a/java/fury-core/src/main/java/io/fury/type/Descriptor.java b/java/fury-core/src/main/java/io/fury/type/Descriptor.java index c8092313ea..7c84b44ca7 100644 --- a/java/fury-core/src/main/java/io/fury/type/Descriptor.java +++ b/java/fury-core/src/main/java/io/fury/type/Descriptor.java @@ -27,9 +27,9 @@ import io.fury.annotation.Internal; import io.fury.collection.Tuple2; import io.fury.util.Platform; -import io.fury.util.RecordComponent; -import io.fury.util.RecordUtils; import io.fury.util.StringUtils; +import io.fury.util.record.RecordComponent; +import io.fury.util.record.RecordUtils; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/java/fury-core/src/main/java/io/fury/type/DescriptorGrouper.java b/java/fury-core/src/main/java/io/fury/type/DescriptorGrouper.java index 1de25554aa..9a35bdf27f 100644 --- a/java/fury-core/src/main/java/io/fury/type/DescriptorGrouper.java +++ b/java/fury-core/src/main/java/io/fury/type/DescriptorGrouper.java @@ -21,8 +21,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Primitives; import com.google.common.reflect.TypeToken; -import io.fury.util.RecordUtils; import io.fury.util.ReflectionUtils; +import io.fury.util.record.RecordUtils; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/java/fury-core/src/main/java/io/fury/util/RecordComponent.java b/java/fury-core/src/main/java/io/fury/util/record/RecordComponent.java similarity index 99% rename from java/fury-core/src/main/java/io/fury/util/RecordComponent.java rename to java/fury-core/src/main/java/io/fury/util/record/RecordComponent.java index e0d496212b..1df6017110 100644 --- a/java/fury-core/src/main/java/io/fury/util/RecordComponent.java +++ b/java/fury-core/src/main/java/io/fury/util/record/RecordComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fury.util; +package io.fury.util.record; import java.lang.reflect.Method; import java.lang.reflect.Type; diff --git a/java/fury-core/src/main/java/io/fury/util/RecordInfo.java b/java/fury-core/src/main/java/io/fury/util/record/RecordInfo.java similarity index 98% rename from java/fury-core/src/main/java/io/fury/util/RecordInfo.java rename to java/fury-core/src/main/java/io/fury/util/record/RecordInfo.java index f0a14f2f08..d19db79f00 100644 --- a/java/fury-core/src/main/java/io/fury/util/RecordInfo.java +++ b/java/fury-core/src/main/java/io/fury/util/record/RecordInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fury.util; +package io.fury.util.record; import java.util.List; diff --git a/java/fury-core/src/main/java/io/fury/util/RecordUtils.java b/java/fury-core/src/main/java/io/fury/util/record/RecordUtils.java similarity index 99% rename from java/fury-core/src/main/java/io/fury/util/RecordUtils.java rename to java/fury-core/src/main/java/io/fury/util/record/RecordUtils.java index 48c3558bfe..1e4dd4cb00 100644 --- a/java/fury-core/src/main/java/io/fury/util/RecordUtils.java +++ b/java/fury-core/src/main/java/io/fury/util/record/RecordUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fury.util; +package io.fury.util.record; import io.fury.collection.Tuple2; import io.fury.util.unsafe._JDKAccess;