From 1674f796d8c2a6ea460c5f7ad661d117b3d9331c Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 26 Dec 2023 19:12:51 +0800 Subject: [PATCH 1/8] chore: relocate Maven GAV Signed-off-by: tison --- README.md | 12 +- ci/run_ci.sh | 4 +- .../data/jmh-jdk-11-deserialization.csv | 304 +++++++++--------- .../data/jmh-jdk-11-serialization.csv | 304 +++++++++--------- docs/benchmarks/data/jmh-jdk-11-zerocopy.csv | 144 ++++----- docs/guide/graalvm_guide.md | 36 +-- docs/guide/java_object_graph_guide.md | 30 +- docs/guide/scala_guide.md | 2 +- docs/guide/xlang_object_graph_guide.md | 24 +- docs/protocols/java_object_graph.md | 4 +- integration_tests/graalvm_tests/pom.xml | 2 +- .../main/java/io/fury/graalvm/Benchmark.java | 10 +- .../main/java/io/fury/graalvm/Example.java | 6 +- .../src/main/java/io/fury/graalvm/Foo.java | 2 +- .../src/main/java/io/fury/graalvm/Main.java | 6 +- .../src/main/java/io/fury/graalvm/Struct.java | 2 +- .../io/fury/graalvm/ThreadSafeExample.java | 12 +- .../main/java/io/fury/graalvm/record/Foo.java | 2 +- .../io/fury/graalvm/record/RecordExample.java | 6 +- .../fury/graalvm/record/RecordExample2.java | 6 +- .../graalvm_tests/native-image.properties | 10 +- .../io/fury/integration_tests/FuryTest.java | 8 +- .../JDKCompatibilityTest.java | 14 +- .../ImmutableCollectionSerializersTest.java | 10 +- .../RecordSerializersTest.java | 18 +- .../io/fury/integration_tests/Records.java | 2 +- .../io/fury/integration_tests/TestUtils.java | 4 +- integration_tests/perftests/README.md | 4 +- .../UserTypeDeserializeSuite.java | 16 +- .../UserTypeSerializeSuite.java | 22 +- .../fury/integration_tests/state/Example.java | 2 +- .../state/FlatBuffersState.java | 34 +- .../state/ProtoBuffersState.java | 22 +- .../io/fury/integration_tests/state/bench.fbs | 2 +- .../state/generated/FBSBar.java | 22 +- .../state/generated/FBSFoo.java | 2 +- .../state/generated/FBSImage.java | 6 +- .../state/generated/FBSMedia.java | 2 +- .../state/generated/FBSMediaContent.java | 14 +- .../state/generated/FBSPlayer.java | 2 +- .../state/generated/FBSSample.java | 2 +- .../state/generated/FBSSize.java | 2 +- .../perftests/src/main/proto/bench.proto | 2 +- .../state/FlatBuffersStateTest.java | 6 +- .../state/ProtoBuffersStateTest.java | 6 +- java/checkstyle.xml | 2 +- .../java/io/fury/benchmark/ArraySuite.java | 4 +- .../java/io/fury/benchmark/Benchmark.java | 2 +- .../io/fury/benchmark/CollectionSuite.java | 4 +- .../fury/benchmark/CompressStringSuite.java | 10 +- .../io/fury/benchmark/Identity2IdMap.java | 4 +- .../benchmark/IntsDeserializationSuite.java | 14 +- .../benchmark/IntsSerializationSuite.java | 14 +- .../LongStringDeserializationSuite.java | 14 +- .../LongStringSerializationSuite.java | 14 +- .../benchmark/LongsDeserializationSuite.java | 14 +- .../benchmark/LongsSerializationSuite.java | 14 +- .../main/java/io/fury/benchmark/MapSuite.java | 8 +- .../java/io/fury/benchmark/MemorySuite.java | 10 +- .../fury/benchmark/NewJava11StringSuite.java | 16 +- .../io/fury/benchmark/NewStringSuite.java | 10 +- .../main/java/io/fury/benchmark/RowSuite.java | 8 +- .../benchmark/StringDeserializationSuite.java | 14 +- .../benchmark/StringSerializationSuite.java | 14 +- .../benchmark/UserTypeDeserializeSuite.java | 16 +- .../benchmark/UserTypeSerializeSuite.java | 16 +- .../java/io/fury/benchmark/ZeroCopySuite.java | 32 +- .../benchmark/data/ComparableByteArray.java | 2 +- .../data/CustomJDKSerialization.java | 2 +- .../java/io/fury/benchmark/data/Data.java | 4 +- .../java/io/fury/benchmark/data/Image.java | 2 +- .../java/io/fury/benchmark/data/Media.java | 2 +- .../io/fury/benchmark/data/MediaContent.java | 2 +- .../java/io/fury/benchmark/data/Sample.java | 2 +- .../data/SerializableByteBuffer.java | 2 +- .../java/io/fury/benchmark/data/Struct.java | 12 +- .../fury/benchmark/state/BenchmarkState.java | 4 +- .../io/fury/benchmark/state/BufferType.java | 2 +- .../io/fury/benchmark/state/FstState.java | 24 +- .../io/fury/benchmark/state/FuryState.java | 42 +-- .../io/fury/benchmark/state/HessionState.java | 22 +- .../io/fury/benchmark/state/JDKState.java | 22 +- .../io/fury/benchmark/state/JsonbState.java | 18 +- .../io/fury/benchmark/state/KryoState.java | 20 +- .../io/fury/benchmark/state/ObjectType.java | 8 +- .../fury/benchmark/state/ProtostuffState.java | 22 +- java/fury-core/pom.xml | 4 +- .../fury-core/src/main/java/io/fury/Fury.java | 66 ++-- .../main/java/io/fury/ThreadLocalFury.java | 12 +- .../src/main/java/io/fury/ThreadSafeFury.java | 6 +- .../io/fury/annotation/CodegenInvoke.java | 2 +- .../main/java/io/fury/annotation/Ignore.java | 2 +- .../java/io/fury/annotation/Internal.java | 2 +- .../main/java/io/fury/annotation/Public.java | 2 +- .../java/io/fury/builder/AccessorHelper.java | 32 +- .../fury/builder/BaseObjectCodecBuilder.java | 136 ++++---- .../java/io/fury/builder/CodecBuilder.java | 80 ++--- .../main/java/io/fury/builder/CodecUtils.java | 18 +- .../fury/builder/CompatibleCodecBuilder.java | 102 +++--- .../main/java/io/fury/builder/Generated.java | 16 +- .../main/java/io/fury/builder/JITContext.java | 14 +- .../fury/builder/MetaSharedCodecBuilder.java | 46 +-- .../io/fury/builder/ObjectCodecBuilder.java | 70 ++-- .../io/fury/builder/ObjectCodecOptimizer.java | 18 +- .../java/io/fury/builder/package-info.java | 2 +- .../io/fury/codegen/ClosureVisitable.java | 2 +- .../src/main/java/io/fury/codegen/Code.java | 6 +- .../java/io/fury/codegen/CodeFormatter.java | 2 +- .../java/io/fury/codegen/CodeGenerator.java | 24 +- .../java/io/fury/codegen/CodegenContext.java | 26 +- .../io/fury/codegen/CodegenException.java | 2 +- .../java/io/fury/codegen/CompileCallback.java | 2 +- .../java/io/fury/codegen/CompileState.java | 2 +- .../java/io/fury/codegen/CompileUnit.java | 8 +- .../main/java/io/fury/codegen/ExprState.java | 4 +- .../main/java/io/fury/codegen/Expression.java | 78 ++--- .../io/fury/codegen/ExpressionOptimizer.java | 14 +- .../java/io/fury/codegen/ExpressionUtils.java | 28 +- .../io/fury/codegen/ExpressionVisitor.java | 14 +- .../main/java/io/fury/codegen/FieldInfo.java | 2 +- .../java/io/fury/codegen/JaninoUtils.java | 10 +- .../java/io/fury/collection/Collections.java | 4 +- .../io/fury/collection/FuryObjectMap.java | 4 +- .../java/io/fury/collection/IdentityMap.java | 2 +- .../fury/collection/IdentityObjectIntMap.java | 2 +- .../java/io/fury/collection/IntArray.java | 2 +- .../main/java/io/fury/collection/LazyMap.java | 4 +- .../main/java/io/fury/collection/LongMap.java | 2 +- .../java/io/fury/collection/MapEntry.java | 2 +- .../io/fury/collection/MapStatistics.java | 4 +- .../io/fury/collection/MultiKeyWeakMap.java | 4 +- .../java/io/fury/collection/ObjectArray.java | 2 +- .../java/io/fury/collection/ObjectIntMap.java | 2 +- .../java/io/fury/collection/ObjectMap.java | 2 +- .../main/java/io/fury/collection/Tuple2.java | 2 +- .../main/java/io/fury/collection/Tuple3.java | 2 +- .../java/io/fury/config/CompatibleMode.java | 2 +- .../src/main/java/io/fury/config/Config.java | 10 +- .../main/java/io/fury/config/FuryBuilder.java | 34 +- .../main/java/io/fury/config/Language.java | 2 +- .../java/io/fury/config/LongEncoding.java | 2 +- .../ClassNotCompatibleException.java | 4 +- .../java/io/fury/exception/FuryException.java | 2 +- .../io/fury/exception/InsecureException.java | 2 +- .../fury/io/ClassLoaderObjectInputStream.java | 2 +- .../main/java/io/fury/io/FuryInputStream.java | 6 +- .../main/java/io/fury/io/FuryObjectInput.java | 10 +- .../java/io/fury/io/FuryObjectOutput.java | 10 +- .../java/io/fury/io/FuryOutputStream.java | 4 +- .../io/fury/io/FuryReadableByteChannel.java | 4 +- .../io/fury/io/FuryWritableByteChannel.java | 4 +- .../java/io/fury/io/MockOutputStream.java | 2 +- .../io/fury/io/MockWritableByteChannel.java | 2 +- .../main/java/io/fury/memory/BitUtils.java | 2 +- .../java/io/fury/memory/BoundsChecking.java | 2 +- .../java/io/fury/memory/MemoryBuffer.java | 10 +- .../main/java/io/fury/memory/MemoryUtils.java | 6 +- .../io/fury/pool/ClassLoaderFuryPooled.java | 6 +- .../io/fury/pool/FuryPooledObjectFactory.java | 8 +- .../java/io/fury/pool/ThreadPoolFury.java | 12 +- .../io/fury/resolver/AllowListChecker.java | 12 +- .../main/java/io/fury/resolver/BlackList.java | 2 +- .../java/io/fury/resolver/ClassChecker.java | 2 +- .../main/java/io/fury/resolver/ClassInfo.java | 12 +- .../io/fury/resolver/ClassInfoHolder.java | 4 +- .../java/io/fury/resolver/ClassResolver.java | 150 ++++----- .../io/fury/resolver/EnumStringBytes.java | 8 +- .../io/fury/resolver/EnumStringResolver.java | 10 +- .../java/io/fury/resolver/FieldResolver.java | 44 +-- .../java/io/fury/resolver/MapRefResolver.java | 16 +- .../java/io/fury/resolver/MetaContext.java | 8 +- .../java/io/fury/resolver/NoRefResolver.java | 6 +- .../java/io/fury/resolver/RefResolver.java | 6 +- .../fury/resolver/SerializationContext.java | 4 +- .../io/fury/serializer/ArraySerializers.java | 30 +- .../io/fury/serializer/BufferCallback.java | 2 +- .../java/io/fury/serializer/BufferObject.java | 4 +- .../io/fury/serializer/BufferSerializers.java | 8 +- .../io/fury/serializer/CodegenSerializer.java | 14 +- .../fury/serializer/CompatibleSerializer.java | 30 +- .../serializer/CompatibleSerializerBase.java | 6 +- .../serializer/ExternalizableSerializer.java | 14 +- .../io/fury/serializer/ForwardSerializer.java | 18 +- .../io/fury/serializer/JavaSerializer.java | 18 +- .../fury/serializer/JdkProxySerializer.java | 10 +- .../io/fury/serializer/LambdaSerializer.java | 10 +- .../io/fury/serializer/LocaleSerializer.java | 8 +- .../fury/serializer/MetaSharedSerializer.java | 42 +-- .../io/fury/serializer/ObjectSerializer.java | 42 +-- .../serializer/ObjectStreamSerializer.java | 36 +-- .../io/fury/serializer/OpaqueObjects.java | 4 +- .../fury/serializer/OptionalSerializers.java | 6 +- .../fury/serializer/PrimitiveSerializers.java | 18 +- .../serializer/ReplaceResolveSerializer.java | 22 +- .../java/io/fury/serializer/Serializer.java | 10 +- .../io/fury/serializer/SerializerFactory.java | 4 +- .../java/io/fury/serializer/Serializers.java | 28 +- .../io/fury/serializer/StringSerializer.java | 34 +- .../java/io/fury/serializer/StringUTF16.java | 2 +- .../io/fury/serializer/StructSerializer.java | 30 +- .../io/fury/serializer/TimeSerializers.java | 10 +- .../io/fury/serializer/URLSerializer.java | 8 +- .../serializer/UnexistedClassSerializers.java | 42 +-- .../AbstractCollectionSerializer.java | 28 +- .../collection/AbstractMapSerializer.java | 28 +- .../serializer/collection/ArrayAsList.java | 4 +- .../collection/ChildContainerSerializers.java | 24 +- .../collection/CollectionFlags.java | 2 +- .../collection/CollectionSerializer.java | 6 +- .../collection/CollectionSerializers.java | 28 +- .../fury/serializer/collection/Container.java | 2 +- .../collection/FuryArrayAsListSerializer.java | 10 +- .../GuavaCollectionSerializers.java | 12 +- .../ImmutableCollectionSerializers.java | 10 +- .../serializer/collection/MapSerializer.java | 6 +- .../serializer/collection/MapSerializers.java | 30 +- .../collection/SubListSerializers.java | 2 +- .../collection/SynchronizedSerializers.java | 18 +- .../collection/UnmodifiableSerializers.java | 20 +- .../scala/SingletonCollectionSerializer.java | 14 +- .../scala/SingletonMapSerializer.java | 14 +- .../scala/SingletonObjectSerializer.java | 14 +- .../fury/serializer/shim/ShimDispatcher.java | 18 +- .../src/main/java/io/fury/type/ClassDef.java | 38 +-- .../main/java/io/fury/type/Descriptor.java | 20 +- .../java/io/fury/type/DescriptorGrouper.java | 6 +- .../io/fury/type/FinalObjectTypeStub.java | 6 +- .../main/java/io/fury/type/GenericType.java | 8 +- .../src/main/java/io/fury/type/Generics.java | 8 +- .../main/java/io/fury/type/ScalaTypes.java | 6 +- .../src/main/java/io/fury/type/Type.java | 4 +- .../src/main/java/io/fury/type/TypeUtils.java | 10 +- .../java/io/fury/util/ClassLoaderUtils.java | 2 +- .../main/java/io/fury/util/DateTimeUtils.java | 2 +- .../main/java/io/fury/util/DecimalUtils.java | 2 +- .../java/io/fury/util/ExceptionUtils.java | 2 +- .../main/java/io/fury/util/FieldAccessor.java | 16 +- .../java/io/fury/util/GraalvmSupport.java | 2 +- .../main/java/io/fury/util/LoaderBinding.java | 6 +- .../main/java/io/fury/util/LoggerFactory.java | 2 +- .../src/main/java/io/fury/util/MathUtils.java | 2 +- .../main/java/io/fury/util/MurmurHash3.java | 2 +- .../src/main/java/io/fury/util/Platform.java | 4 +- .../main/java/io/fury/util/Preconditions.java | 2 +- .../java/io/fury/util/ReflectionUtils.java | 18 +- .../main/java/io/fury/util/StringUtils.java | 2 +- .../io/fury/util/UnsafeFieldAccessor.java | 2 +- .../src/main/java/io/fury/util/Utils.java | 2 +- .../java/io/fury/util/function/Functions.java | 10 +- .../util/function/SerializableBiFunction.java | 2 +- .../util/function/SerializableFunction.java | 2 +- .../util/function/SerializableSupplier.java | 2 +- .../function/SerializableTriFunction.java | 2 +- .../io/fury/util/function/ToByteFunction.java | 2 +- .../io/fury/util/function/ToCharFunction.java | 2 +- .../fury/util/function/ToFloatFunction.java | 2 +- .../fury/util/function/ToShortFunction.java | 2 +- .../io/fury/util/function/TriFunction.java | 4 +- .../io/fury/util/record/RecordComponent.java | 2 +- .../java/io/fury/util/record/RecordInfo.java | 2 +- .../java/io/fury/util/record/RecordUtils.java | 6 +- .../io/fury/util/unsafe/_Collections.java | 4 +- .../java/io/fury/util/unsafe/_JDKAccess.java | 20 +- .../java/io/fury/util/unsafe/_Lookup.java | 2 +- .../fury-core/native-image.properties | 258 +++++++-------- .../test/java/io/fury/CrossLanguageTest.java | 16 +- .../src/test/java/io/fury/CyclicTest.java | 12 +- .../src/test/java/io/fury/FuryInitPerf.java | 18 +- .../src/test/java/io/fury/FuryTest.java | 34 +- .../src/test/java/io/fury/FuryTestBase.java | 18 +- .../src/test/java/io/fury/OutOfBandTest.java | 6 +- .../src/test/java/io/fury/TestUtils.java | 6 +- .../test/java/io/fury/ThreadSafeFuryTest.java | 16 +- .../io/fury/builder/AccessorHelperTest.java | 12 +- .../java/io/fury/builder/CodecUtilsTest.java | 12 +- .../java/io/fury/builder/JITContextTest.java | 20 +- .../fury/builder/ObjectCodecBuilderTest.java | 30 +- .../io/fury/builder/pkg/AccessLevelClass.java | 2 +- .../io/fury/codegen/CodeGeneratorTest.java | 14 +- .../io/fury/codegen/CodegenContextTest.java | 10 +- .../fury/codegen/ExpressionOptimizerTest.java | 8 +- .../java/io/fury/codegen/ExpressionTest.java | 12 +- .../fury/codegen/ExpressionVisitorTest.java | 8 +- .../java/io/fury/codegen/JaninoUtilsTest.java | 10 +- .../io/fury/collection/CollectionsTest.java | 2 +- .../io/fury/collection/FuryObjectMapTest.java | 2 +- .../collection/IdentityObjectIntMapTest.java | 2 +- .../java/io/fury/collection/IntArrayTest.java | 2 +- .../java/io/fury/collection/LazyMapTest.java | 10 +- .../fury/collection/MultiKeyWeakMapTest.java | 4 +- .../io/fury/collection/ObjectArrayTest.java | 2 +- .../io/fury/collection/ObjectIntMapTest.java | 2 +- .../java/io/fury/collection/Tuple2Test.java | 2 +- .../java/io/fury/collection/Tuple3Test.java | 2 +- .../java/io/fury/io/FuryObjectInputTest.java | 8 +- .../java/io/fury/io/FuryObjectOutputTest.java | 8 +- .../java/io/fury/io/MockOutputStreamTest.java | 2 +- .../fury/io/MockWritableByteChannelTest.java | 2 +- .../java/io/fury/memory/BitUtilsTest.java | 4 +- .../java/io/fury/memory/MemoryBufferTest.java | 4 +- .../fury/resolver/AllowListCheckerTest.java | 20 +- .../java/io/fury/resolver/BlackListTest.java | 12 +- .../io/fury/resolver/ClassResolverTest.java | 52 +-- .../fury/resolver/EnumStringResolverTest.java | 8 +- .../io/fury/resolver/FieldResolverTest.java | 18 +- .../io/fury/resolver/MapRefResolverTest.java | 4 +- .../io/fury/resolver/MetaContextTest.java | 16 +- .../io/fury/resolver/NoRefResolverTest.java | 4 +- .../resolver/SerializationContextTest.java | 2 +- .../java/io/fury/resolver/longlongpkg/C1.java | 2 +- .../java/io/fury/resolver/longlongpkg/C2.java | 2 +- .../java/io/fury/resolver/longlongpkg/C3.java | 2 +- .../fury/serializer/ArraySerializersTest.java | 16 +- .../serializer/BufferSerializersTest.java | 6 +- .../java/io/fury/serializer/ClassUtils.java | 14 +- .../CodegenCompatibleSerializerTest.java | 26 +- .../serializer/CodegenSerializerTest.java | 16 +- .../serializer/CompatibleSerializerTest.java | 26 +- .../fury/serializer/DuplicateFieldsTest.java | 16 +- .../ExternalizableSerializerTest.java | 8 +- .../serializer/ForwardSerializerTest.java | 10 +- .../fury/serializer/JavaSerializerTest.java | 10 +- .../serializer/JdkProxySerializerTest.java | 8 +- .../fury/serializer/LambdaSerializerTest.java | 6 +- .../fury/serializer/LocaleSerializerTest.java | 8 +- .../serializer/MetaSharedCompatibleTest.java | 30 +- .../fury/serializer/ObjectSerializerTest.java | 14 +- .../ObjectStreamSerializerTest.java | 12 +- .../serializer/OptionalSerializersTest.java | 8 +- .../serializer/PrimitiveSerializersTest.java | 8 +- .../ProtocolInteroperabilityTest.java | 26 +- .../ReplaceResolveSerializerTest.java | 10 +- .../serializer/SerializerFactoryTest.java | 8 +- .../io/fury/serializer/SerializersTest.java | 10 +- .../fury/serializer/StringSerializerTest.java | 24 +- .../fury/serializer/TimeSerializersTest.java | 10 +- .../io/fury/serializer/URLSerializerTest.java | 6 +- .../UnexistedClassSerializersTest.java | 16 +- .../ChildContainerSerializersTest.java | 10 +- .../collection/CollectionSerializersTest.java | 20 +- .../GuavaCollectionSerializersTest.java | 8 +- .../collection/MapSerializersTest.java | 20 +- .../SynchronizedSerializersTest.java | 20 +- .../UnmodifiableSerializersTest.java | 24 +- .../java/io/fury/serializer/test/Factory.java | 2 +- .../io/fury/serializer/test/Inaccessible.java | 6 +- .../test/java/io/fury/type/ClassDefTest.java | 10 +- .../io/fury/type/DescriptorGrouperTest.java | 2 +- .../java/io/fury/type/DescriptorTest.java | 6 +- .../test/java/io/fury/type/GenericsTest.java | 10 +- .../test/java/io/fury/type/TypeUtilsTest.java | 8 +- .../io/fury/util/ClassLoaderUtilsTest.java | 10 +- .../java/io/fury/util/DecimalUtilsTest.java | 2 +- .../test/java/io/fury/util/FunctionsTest.java | 10 +- .../java/io/fury/util/MurmurHash3Test.java | 2 +- .../test/java/io/fury/util/PlatformTest.java | 2 +- .../io/fury/util/ReflectionUtilsTest.java | 6 +- .../java/io/fury/util/StringUtilsTest.java | 2 +- .../io/fury/util/UnsafeFieldAccessorTest.java | 2 +- .../io/fury/util/unsafe/JDKAccessTest.java | 4 +- java/fury-format/pom.xml | 6 +- .../fury/format/encoder/ArrayDataForEach.java | 32 +- .../io/fury/format/encoder/ArrayEncoder.java | 4 +- .../format/encoder/ArrayEncoderBuilder.java | 28 +- .../encoder/BaseBinaryEncoderBuilder.java | 78 ++--- .../java/io/fury/format/encoder/Encoder.java | 2 +- .../fury/format/encoder/EncoderException.java | 4 +- .../java/io/fury/format/encoder/Encoders.java | 36 +-- .../format/encoder/GeneratedArrayEncoder.java | 6 +- .../format/encoder/GeneratedMapEncoder.java | 8 +- .../format/encoder/GeneratedRowEncoder.java | 6 +- .../io/fury/format/encoder/MapEncoder.java | 6 +- .../format/encoder/MapEncoderBuilder.java | 30 +- .../io/fury/format/encoder/RowEncoder.java | 4 +- .../format/encoder/RowEncoderBuilder.java | 54 ++-- .../java/io/fury/format/row/ArrayData.java | 2 +- .../main/java/io/fury/format/row/Getters.java | 4 +- .../main/java/io/fury/format/row/MapData.java | 2 +- .../src/main/java/io/fury/format/row/Row.java | 2 +- .../main/java/io/fury/format/row/Setters.java | 2 +- .../java/io/fury/format/row/ValueVisitor.java | 4 +- .../fury/format/row/binary/BinaryArray.java | 34 +- .../io/fury/format/row/binary/BinaryMap.java | 12 +- .../io/fury/format/row/binary/BinaryRow.java | 16 +- .../fury/format/row/binary/BinaryUtils.java | 6 +- .../fury/format/row/binary/UnsafeTrait.java | 14 +- .../row/binary/writer/BinaryArrayWriter.java | 30 +- .../row/binary/writer/BinaryRowWriter.java | 10 +- .../row/binary/writer/BinaryWriter.java | 18 +- .../java/io/fury/format/type/DataTypes.java | 16 +- .../fury/format/type/DefaultTypeVisitor.java | 2 +- .../io/fury/format/type/TypeInference.java | 16 +- .../format/vectorized/ArrowSerializers.java | 24 +- .../io/fury/format/vectorized/ArrowTable.java | 4 +- .../vectorized/ArrowTableSerializer.java | 14 +- .../io/fury/format/vectorized/ArrowUtils.java | 10 +- .../fury/format/vectorized/ArrowWriter.java | 12 +- .../io/fury/format/CrossLanguageTest.java | 38 +-- .../fury/format/encoder/ArrayEncoderTest.java | 4 +- .../fury/format/encoder/CodecBuilderTest.java | 8 +- .../fury/format/encoder/MapEncoderTest.java | 4 +- .../fury/format/encoder/RowEncoderTest.java | 12 +- .../format/row/binary/BinaryArrayTest.java | 8 +- .../fury/format/row/binary/BinaryMapTest.java | 12 +- .../fury/format/row/binary/BinaryRowTest.java | 16 +- .../io/fury/format/type/DataTypesTest.java | 4 +- .../fury/format/type/TypeInferenceTest.java | 6 +- .../vectorized/ArrowSerializersTest.java | 16 +- .../format/vectorized/ArrowUtilsTest.java | 6 +- .../format/vectorized/ArrowWriterTest.java | 16 +- .../java/io/fury/test/bean/AccessBeans.java | 2 +- .../java/io/fury/test/bean/ArraysData.java | 2 +- .../main/java/io/fury/test/bean/BeanA.java | 2 +- .../main/java/io/fury/test/bean/BeanB.java | 2 +- .../io/fury/test/bean/CollectionFields.java | 2 +- .../main/java/io/fury/test/bean/Cyclic.java | 2 +- .../java/io/fury/test/bean/FinalCyclic.java | 2 +- .../src/main/java/io/fury/test/bean/Foo.java | 2 +- .../java/io/fury/test/bean/MapFields.java | 2 +- .../main/java/io/fury/test/bean/Struct.java | 10 +- .../java/io/fury/test/bean/TestUtils.java | 2 +- .../java/io/fury/test/bean/StructTest.java | 2 +- .../benchmark/DeserializationBenchmark.java | 18 +- .../benchmark/SerializationBenchmark.java | 20 +- .../src/test/java/io/fury/test/BeanMock.java | 2 +- .../src/test/java/io/fury/test/DTOTest.java | 6 +- .../io/fury/test/ReadResolveCircularTest.java | 4 +- .../src/test/java/org/test/Org.java | 6 +- python/pyfury/type.py | 2 +- .../serializer/scala/ScalaDispatcher.java | 10 +- .../scala/CollectionSerializer.scala | 8 +- .../fury/serializer/scala/MapSerializer.scala | 10 +- .../serializer/CollectionSerializerTest.scala | 8 +- .../scala/io/fury/serializer/ScalaTest.scala | 6 +- .../SingleObjectSerializerTest.scala | 6 +- .../scala/io/fury/serializer/TupleTest.scala | 6 +- 436 files changed, 3049 insertions(+), 3049 deletions(-) diff --git a/README.md b/README.md index 748e26b92c..0b767e70af 100644 --- a/README.md +++ b/README.md @@ -148,8 +148,8 @@ Here we give a quick start about how to use fury, see [user guide](https://githu If you don't have cross-language requirements, using this mode will have better performance. ```java -import io.fury.*; -import io.fury.config.*; +import org.apache.fury.*; +import org.apache.fury.config.*; import java.util.*; public class Example { @@ -195,8 +195,8 @@ public class Example { ### Cross-language object graph serialization **Java** ```java -import io.fury.*; -import io.fury.config.*; +import org.apache.fury.*; +import org.apache.fury.config.*; import java.util.*; public class ReferenceExample { @@ -214,7 +214,7 @@ public class ReferenceExample { return obj; } - // mvn exec:java -Dexec.mainClass="io.fury.examples.ReferenceExample" + // mvn exec:java -Dexec.mainClass="org.apache.fury.examples.ReferenceExample" public static void main(String[] args) { Fury fury = Fury.builder().withLanguage(Language.XLANG) .withRefTracking(true).build(); @@ -369,7 +369,7 @@ For example, the deserialization may invoke `init` constructor or `equals`/`hash Fury provides a class registration option that is enabled by default for such protocols, allowing only deserialization of trusted registered types or built-in types. **Do not disable class registration unless you can ensure your environment is secure**. -If this option is disabled, you are responsible for serialization security. You can configure `io.fury.resolver.ClassChecker` by +If this option is disabled, you are responsible for serialization security. You can configure `org.apache.fury.resolver.ClassChecker` by `ClassResolver#setClassChecker` to control which classes are allowed for serialization. ## How to Build diff --git a/ci/run_ci.sh b/ci/run_ci.sh index c38e660f64..260d0d05fb 100755 --- a/ci/run_ci.sh +++ b/ci/run_ci.sh @@ -116,13 +116,13 @@ integration_tests() { export JAVA_HOME="$ROOT/$jdk" export PATH=$JAVA_HOME/bin:$PATH echo "First round for generate data: ${jdk}" - mvn -T10 --no-transfer-progress clean test -Dtest=io.fury.integration_tests.JDKCompatibilityTest + mvn -T10 --no-transfer-progress clean test -Dtest=org.apache.fury.integration_tests.JDKCompatibilityTest done for jdk in "${JDKS[@]}"; do export JAVA_HOME="$ROOT/$jdk" export PATH=$JAVA_HOME/bin:$PATH echo "Second round for compatibility: ${jdk}" - mvn -T10 --no-transfer-progress clean test -Dtest=io.fury.integration_tests.JDKCompatibilityTest + mvn -T10 --no-transfer-progress clean test -Dtest=org.apache.fury.integration_tests.JDKCompatibilityTest done } diff --git a/docs/benchmarks/data/jmh-jdk-11-deserialization.csv b/docs/benchmarks/data/jmh-jdk-11-deserialization.csv index f84a349c83..09194c8fec 100644 --- a/docs/benchmarks/data/jmh-jdk-11-deserialization.csv +++ b/docs/benchmarks/data/jmh-jdk-11-deserialization.csv @@ -1,153 +1,153 @@ "Benchmark","Mode","Threads","Samples","Score","Score Error (99.9%)","Unit","Param: bufferType","Param: objectType","Param: references" -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,473409.796491,250793.361170,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,428315.502365,191770.682411,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,363455.785182,44717.666948,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,304371.728638,74831.791688,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,357887.235311,218092.594151,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,353480.554035,229239.505256,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,280131.091068,89472.347221,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,260649.308016,165597.762734,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,441027.550809,321712.847983,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,420523.770904,122531.658151,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,311691.658687,185300.664992,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,251820.171513,894743.730727,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,352441.597147,109488.413174,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,334574.303484,89858.329407,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,262519.858810,138990.948859,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,234973.637096,568162.582389,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,2069988.624415,1501625.089719,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1797942.442313,3541577.357052,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,2054066.903469,3314161.094630,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1507767.206603,1662320.958961,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,4595230.434552,678411.427346,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,4634753.596131,582102.492158,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1126298.359550,856691.704987,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1046649.083082,1816153.563648,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,2229791.078395,2950833.975767,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1958815.397807,381903.427430,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1502746.028159,1759759.267183,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1290593.975753,246089.810346,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,5012002.859236,3360944.705659,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,4864329.316938,4357833.300692,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1117586.457565,323438.118804,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1018277.848128,1141314.435153,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,2296046.895861,2532372.600048,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1834139.395757,1021897.505849,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1441671.706320,317052.609754,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1121136.039627,979316.642796,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,2110335.039275,389404.889706,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,2135681.982674,1140328.709799,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,849507.176263,77466.989680,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,815120.319155,110547.743648,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,2308111.633661,1699117.497565,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1820490.585648,244290.391445,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1256034.732514,811833.294307,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1054942.751816,180122.424477,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1596464.248141,1624412.248391,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1684681.074242,865262.572050,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,784036.589363,189745.805570,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,782679.662083,232459.929272,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,2485564.396196,404678.689647,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,2002938.794909,254819.284313,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,2279742.810882,1984221.778254,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1623938.202345,902985.831204,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,4978833.206806,1201415.339844,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,4807963.882520,981981.561987,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1201998.142474,446807.356524,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1058423.614156,2254684.330438,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,2289261.533644,330913.304260,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1927548.827586,2169684.221478,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1718098.363961,1096276.962216,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1333345.536684,1110700.750020,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,5149070.657830,3249519.880480,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,5137500.621288,3988987.937014,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1131212.586953,240674.468318,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1089162.408165,294119.059967,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,119471.518388,29846.632785,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,121106.002978,27710.578092,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,118156.072284,4767.841380,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,120016.594171,41255.986380,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,84709.108821,132894.355932,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,91050.370224,17939.461828,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,69758.767783,10886.276794,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,68616.029248,13625.851120,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,117806.916589,35449.535259,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,121940.783597,54381.355274,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,111067.942626,136178.034974,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,121820.821260,36972.450957,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,91151.633583,18401.579776,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,91037.205901,58868.732797,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,66866.108653,38522.707093,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,65338.345185,56556.914062,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,121898.105768,55415.594537,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,121297.485903,33990.621079,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,121619.090797,6094.683470,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,119994.104050,24538.128667,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,88617.486795,40076.835119,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,90206.654212,19313.248466,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,63703.763814,132184.298414,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,69521.573119,8875.645591,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,124044.417439,41135.181705,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,120276.449497,87827.771405,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,107594.474890,81084.454215,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,116531.023438,141591.979641,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,89580.561575,23464.095972,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,84407.472531,46007.731889,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,69342.030965,17706.784671,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,68542.055543,31793.805138,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,29309.573998,765.998843,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,27466.003923,14896.452629,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,38536.250402,28217.590983,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,38957.191090,23931.545367,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,29603.066599,10373.666720,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,29727.744196,15820.774882,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,14888.805111,842.165916,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,14034.100664,13936.787605,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,28128.457935,5385.055284,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,28221.014735,15281.277719,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,40512.632076,8592.454839,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,37030.594632,9683.316145,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,28717.004518,17023.663871,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,29549.998286,13823.854047,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,14652.043788,2419.900104,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,14425.886048,8723.095052,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,979173.981159,178146.966897,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,716438.884369,623966.984928,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,577631.234369,221011.018380,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,365530.417232,214946.853015,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,607750.343557,99638.164976,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,552802.227807,126286.013177,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,275984.042401,9405.143983,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,222710.554833,45168.519253,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,983538.936801,1112062.949472,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,762889.302732,279678.610328,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,389473.174523,43058.395501,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,306995.220799,57411.579647,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,910534.169114,1888677.766640,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,914404.107564,357717.816934,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,319247.256793,217674.935649,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,249105.828416,131690.474985,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,255086.928308,23672.392381,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,238811.995510,18059.118666,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,180882.860363,69339.581545,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,154311.211540,23065.912064,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,78771.635309,45155.641241,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,72805.937649,16849.888437,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,60602.285743,61404.274046,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,62729.908347,32805.651539,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,201993.787890,41567.224827,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,174534.710870,96357.498949,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,134485.160300,104898.991148,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,119311.787329,66580.856795,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,58574.904225,140682.248378,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,60685.320299,24159.853451,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,54637.329134,14011.283798,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,51761.569591,61030.640534,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,619338.385412,275705.847169,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,951662.019963,165160.853007,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,517381.168594,313746.662696,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,416212.973861,119393.345217,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,624804.978534,147685.682690,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,964664.641598,218386.902856,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,538922.947147,59168.303230,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,425523.315814,179264.359952,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,473409.796491,250793.361170,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,428315.502365,191770.682411,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,363455.785182,44717.666948,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,304371.728638,74831.791688,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,357887.235311,218092.594151,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,353480.554035,229239.505256,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,280131.091068,89472.347221,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,260649.308016,165597.762734,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,441027.550809,321712.847983,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,420523.770904,122531.658151,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,311691.658687,185300.664992,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,251820.171513,894743.730727,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,352441.597147,109488.413174,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,334574.303484,89858.329407,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,262519.858810,138990.948859,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fst_deserialize","thrpt",1,3,234973.637096,568162.582389,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,2069988.624415,1501625.089719,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1797942.442313,3541577.357052,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,2054066.903469,3314161.094630,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1507767.206603,1662320.958961,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,4595230.434552,678411.427346,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,4634753.596131,582102.492158,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1126298.359550,856691.704987,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1046649.083082,1816153.563648,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,2229791.078395,2950833.975767,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1958815.397807,381903.427430,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1502746.028159,1759759.267183,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1290593.975753,246089.810346,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,5012002.859236,3360944.705659,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,4864329.316938,4357833.300692,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1117586.457565,323438.118804,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize","thrpt",1,3,1018277.848128,1141314.435153,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,2296046.895861,2532372.600048,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1834139.395757,1021897.505849,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1441671.706320,317052.609754,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1121136.039627,979316.642796,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,2110335.039275,389404.889706,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,2135681.982674,1140328.709799,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,849507.176263,77466.989680,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,815120.319155,110547.743648,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,2308111.633661,1699117.497565,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1820490.585648,244290.391445,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1256034.732514,811833.294307,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1054942.751816,180122.424477,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1596464.248141,1624412.248391,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,1684681.074242,865262.572050,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,784036.589363,189745.805570,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.fury_deserialize_compatible","thrpt",1,3,782679.662083,232459.929272,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,2485564.396196,404678.689647,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,2002938.794909,254819.284313,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,2279742.810882,1984221.778254,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1623938.202345,902985.831204,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,4978833.206806,1201415.339844,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,4807963.882520,981981.561987,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1201998.142474,446807.356524,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1058423.614156,2254684.330438,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,2289261.533644,330913.304260,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1927548.827586,2169684.221478,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1718098.363961,1096276.962216,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1333345.536684,1110700.750020,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,5149070.657830,3249519.880480,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,5137500.621288,3988987.937014,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1131212.586953,240674.468318,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.furymetashared_deserialize_compatible","thrpt",1,3,1089162.408165,294119.059967,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,119471.518388,29846.632785,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,121106.002978,27710.578092,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,118156.072284,4767.841380,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,120016.594171,41255.986380,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,84709.108821,132894.355932,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,91050.370224,17939.461828,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,69758.767783,10886.276794,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,68616.029248,13625.851120,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,117806.916589,35449.535259,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,121940.783597,54381.355274,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,111067.942626,136178.034974,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,121820.821260,36972.450957,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,91151.633583,18401.579776,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,91037.205901,58868.732797,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,66866.108653,38522.707093,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize","thrpt",1,3,65338.345185,56556.914062,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,121898.105768,55415.594537,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,121297.485903,33990.621079,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,121619.090797,6094.683470,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,119994.104050,24538.128667,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,88617.486795,40076.835119,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,90206.654212,19313.248466,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,63703.763814,132184.298414,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,69521.573119,8875.645591,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,124044.417439,41135.181705,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,120276.449497,87827.771405,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,107594.474890,81084.454215,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,116531.023438,141591.979641,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,89580.561575,23464.095972,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,84407.472531,46007.731889,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,69342.030965,17706.784671,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.hession_deserialize_compatible","thrpt",1,3,68542.055543,31793.805138,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,29309.573998,765.998843,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,27466.003923,14896.452629,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,38536.250402,28217.590983,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,38957.191090,23931.545367,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,29603.066599,10373.666720,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,29727.744196,15820.774882,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,14888.805111,842.165916,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,14034.100664,13936.787605,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,28128.457935,5385.055284,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,28221.014735,15281.277719,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,40512.632076,8592.454839,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,37030.594632,9683.316145,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,28717.004518,17023.663871,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,29549.998286,13823.854047,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,14652.043788,2419.900104,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.jdk_deserialize","thrpt",1,3,14425.886048,8723.095052,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,979173.981159,178146.966897,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,716438.884369,623966.984928,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,577631.234369,221011.018380,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,365530.417232,214946.853015,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,607750.343557,99638.164976,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,552802.227807,126286.013177,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,275984.042401,9405.143983,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,222710.554833,45168.519253,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,983538.936801,1112062.949472,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,762889.302732,279678.610328,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,389473.174523,43058.395501,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,306995.220799,57411.579647,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,910534.169114,1888677.766640,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,914404.107564,357717.816934,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,319247.256793,217674.935649,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize","thrpt",1,3,249105.828416,131690.474985,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,255086.928308,23672.392381,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,238811.995510,18059.118666,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,180882.860363,69339.581545,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,154311.211540,23065.912064,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,78771.635309,45155.641241,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,72805.937649,16849.888437,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,60602.285743,61404.274046,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,62729.908347,32805.651539,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,201993.787890,41567.224827,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,174534.710870,96357.498949,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,134485.160300,104898.991148,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,119311.787329,66580.856795,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,58574.904225,140682.248378,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,60685.320299,24159.853451,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,54637.329134,14011.283798,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.kryo_deserialize_compatible","thrpt",1,3,51761.569591,61030.640534,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,619338.385412,275705.847169,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,951662.019963,165160.853007,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,517381.168594,313746.662696,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,416212.973861,119393.345217,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,624804.978534,147685.682690,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,964664.641598,218386.902856,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,538922.947147,59168.303230,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeDeserializeSuite.protostuff_deserialize","thrpt",1,3,425523.315814,179264.359952,"ops/s",directBuffer,STRUCT2,false diff --git a/docs/benchmarks/data/jmh-jdk-11-serialization.csv b/docs/benchmarks/data/jmh-jdk-11-serialization.csv index 5ea74486ab..b349c3ab90 100644 --- a/docs/benchmarks/data/jmh-jdk-11-serialization.csv +++ b/docs/benchmarks/data/jmh-jdk-11-serialization.csv @@ -1,153 +1,153 @@ "Benchmark","Mode","Threads","Samples","Score","Score Error (99.9%)","Unit","Param: bufferType","Param: objectType","Param: references" -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,915907.574306,87627.907529,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,731869.156376,37845.555465,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,751892.023189,174327.010719,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,583859.907758,320047.618377,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,882178.995727,294884.724923,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,757753.756691,605180.489112,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,371762.982661,80513.482138,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,380638.700267,101974.434105,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,902302.261168,474054.277143,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,723614.066770,77429.645491,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,728001.080250,75699.111305,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,595679.580108,117269.848918,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,807847.663261,67842.801069,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,762088.935404,575559.070335,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,365317.705376,138313.634773,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,370851.880711,66834.323719,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,3570966.469087,152949.902180,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,1767693.835090,263146.035836,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,3031642.924542,567213.986117,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,2250384.600246,529709.299207,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,7501415.567260,6672023.542025,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,6264439.154428,976363.317001,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,3586126.623874,1966282.728305,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,3306474.506382,869558.338568,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,3684487.760591,882227.920611,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,1826456.709478,1377648.673630,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,2479862.129632,1498299.302699,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,1938527.588331,148125.034055,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,9834223.243204,5284494.290641,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,7551780.823133,744016.111639,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,2643155.135327,200764.008652,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,2391110.083108,2608567.411194,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,3604596.465625,1232634.245435,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1619648.337293,212055.067245,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1679272.036223,788041.322785,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1406736.538716,263608.222325,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,3530406.108869,3125642.741982,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,3293059.098127,96940.669016,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,2773368.997680,503239.905176,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,2564174.550276,978139.792610,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,3484533.218305,476583.192148,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1730822.630648,410016.597939,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1710680.937387,307207.222026,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1149999.473994,140915.968294,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,2653169.568374,535312.987476,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,2393817.762938,380997.375838,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1912402.937879,284090.793301,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1848338.968058,108311.846780,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,4409055.687063,112740.443049,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,1840705.439334,516764.580627,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,2992288.235281,867622.163323,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,2058738.716953,2388681.798594,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,9204444.777172,1526628.258403,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,7064625.291374,2655795.498346,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,2575824.143864,2216634.295140,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,3543082.528217,393858.603613,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,5043538.364886,2797987.191909,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,1859289.705838,366893.710607,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,2291443.556971,3167882.958411,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,1804349.244125,481995.792041,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,11650229.648715,1101289.207239,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,8702412.752357,1116617.972427,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,2714748.572248,284462.787825,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,1866073.031851,1521156.537508,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,220386.502846,60892.430853,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,192414.014211,34217.359956,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,367782.358049,54538.846197,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,329427.470680,530871.650379,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,258233.998931,145299.453488,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,260845.209485,90601.426407,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,56056.080075,3919.171009,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,60038.879790,6808.083631,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,220981.308085,153633.380796,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,211949.960255,231322.136517,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,372477.138150,39349.725456,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,353376.085025,11334.885856,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,266481.009225,113518.076189,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,261762.594966,64652.028148,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,55924.319442,28173.043405,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,56674.065604,2667.957614,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,234454.975158,5232.236462,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,206174.173039,54217.176504,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,377195.903772,33297.468886,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,351657.879556,10762.766962,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,258650.663523,64158.329095,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,263564.913879,101476.568014,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,58509.125342,10836.872797,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,55552.977735,37802.538138,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,194761.224263,8828.274695,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,212840.483308,50730.019909,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,371729.727192,136063.629978,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,343834.954942,13355.085558,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,249221.452137,261034.656030,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,263623.143601,32854.227410,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,58908.567439,4137.470432,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,55524.373547,668.406873,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,118374.836631,34704.407553,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,119858.140625,49308.850176,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,137989.198821,40017.148924,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,140260.668888,57308.595910,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,155908.244240,20385.278504,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,151258.539369,12676.385578,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,36846.049162,5491.880967,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,38183.705811,14778.659439,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,118273.584257,18950.629048,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,108263.040839,14982.910444,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,138567.623369,24365.255940,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,140158.673910,54416.908878,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,154875.908438,11984.781345,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,156404.686214,58131.602098,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,37444.967981,14948.012339,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,35798.679246,36641.428549,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,1105365.931217,162251.803619,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,734215.482291,79297.387490,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,730792.521676,678674.266715,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,445251.084327,85646.179264,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,558194.100861,257156.321315,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,557542.628765,63084.390134,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,325172.969175,20774.334333,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,259863.332448,86373.633851,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,1376560.302168,147424.342310,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,932887.968348,249800.928765,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,608972.517580,249598.971835,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,359875.473951,274870.064607,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,1078046.011115,249527.480472,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,853350.408656,126642.692106,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,355688.882786,37587.645927,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,338960.426033,36185.446014,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,378907.663184,280309.649766,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,320815.567701,455179.720989,"ops/s",array,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,188911.259146,97827.317807,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,145782.916427,81270.905462,"ops/s",array,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,145964.199559,88578.667153,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,136180.832879,167433.069232,"ops/s",array,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,125807.748004,23178.451287,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,114983.546343,7341.380140,"ops/s",array,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,296102.615094,18485.738321,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,276757.392449,61173.636852,"ops/s",directBuffer,SAMPLE,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,185363.714829,121440.885632,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,142836.961878,12450.918452,"ops/s",directBuffer,MEDIA_CONTENT,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,106695.800225,13463.570576,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,106458.212005,2994.065295,"ops/s",directBuffer,STRUCT,true -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,92130.672361,9515.661170,"ops/s",directBuffer,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,88989.724768,9379.338279,"ops/s",directBuffer,STRUCT2,true -"io.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,663272.710783,522116.492895,"ops/s",array,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,780618.761219,406063.945348,"ops/s",array,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,330975.350403,196475.862643,"ops/s",array,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,322563.440433,201276.713653,"ops/s",array,STRUCT2,false -"io.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,693641.589806,43883.803566,"ops/s",directBuffer,SAMPLE,false -"io.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,805941.345157,91281.699006,"ops/s",directBuffer,MEDIA_CONTENT,false -"io.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,340262.650047,152117.387028,"ops/s",directBuffer,STRUCT,false -"io.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,325093.716261,56485.972228,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,915907.574306,87627.907529,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,731869.156376,37845.555465,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,751892.023189,174327.010719,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,583859.907758,320047.618377,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,882178.995727,294884.724923,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,757753.756691,605180.489112,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,371762.982661,80513.482138,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,380638.700267,101974.434105,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,902302.261168,474054.277143,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,723614.066770,77429.645491,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,728001.080250,75699.111305,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,595679.580108,117269.848918,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,807847.663261,67842.801069,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,762088.935404,575559.070335,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,365317.705376,138313.634773,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fst_serialize","thrpt",1,3,370851.880711,66834.323719,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,3570966.469087,152949.902180,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,1767693.835090,263146.035836,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,3031642.924542,567213.986117,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,2250384.600246,529709.299207,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,7501415.567260,6672023.542025,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,6264439.154428,976363.317001,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,3586126.623874,1966282.728305,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,3306474.506382,869558.338568,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,3684487.760591,882227.920611,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,1826456.709478,1377648.673630,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,2479862.129632,1498299.302699,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,1938527.588331,148125.034055,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,9834223.243204,5284494.290641,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,7551780.823133,744016.111639,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,2643155.135327,200764.008652,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize","thrpt",1,3,2391110.083108,2608567.411194,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,3604596.465625,1232634.245435,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1619648.337293,212055.067245,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1679272.036223,788041.322785,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1406736.538716,263608.222325,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,3530406.108869,3125642.741982,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,3293059.098127,96940.669016,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,2773368.997680,503239.905176,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,2564174.550276,978139.792610,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,3484533.218305,476583.192148,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1730822.630648,410016.597939,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1710680.937387,307207.222026,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1149999.473994,140915.968294,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,2653169.568374,535312.987476,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,2393817.762938,380997.375838,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1912402.937879,284090.793301,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.fury_serialize_compatible","thrpt",1,3,1848338.968058,108311.846780,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,4409055.687063,112740.443049,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,1840705.439334,516764.580627,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,2992288.235281,867622.163323,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,2058738.716953,2388681.798594,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,9204444.777172,1526628.258403,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,7064625.291374,2655795.498346,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,2575824.143864,2216634.295140,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,3543082.528217,393858.603613,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,5043538.364886,2797987.191909,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,1859289.705838,366893.710607,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,2291443.556971,3167882.958411,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,1804349.244125,481995.792041,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,11650229.648715,1101289.207239,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,8702412.752357,1116617.972427,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,2714748.572248,284462.787825,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.furymetashared_serialize_compatible","thrpt",1,3,1866073.031851,1521156.537508,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,220386.502846,60892.430853,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,192414.014211,34217.359956,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,367782.358049,54538.846197,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,329427.470680,530871.650379,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,258233.998931,145299.453488,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,260845.209485,90601.426407,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,56056.080075,3919.171009,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,60038.879790,6808.083631,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,220981.308085,153633.380796,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,211949.960255,231322.136517,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,372477.138150,39349.725456,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,353376.085025,11334.885856,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,266481.009225,113518.076189,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,261762.594966,64652.028148,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,55924.319442,28173.043405,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize","thrpt",1,3,56674.065604,2667.957614,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,234454.975158,5232.236462,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,206174.173039,54217.176504,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,377195.903772,33297.468886,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,351657.879556,10762.766962,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,258650.663523,64158.329095,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,263564.913879,101476.568014,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,58509.125342,10836.872797,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,55552.977735,37802.538138,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,194761.224263,8828.274695,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,212840.483308,50730.019909,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,371729.727192,136063.629978,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,343834.954942,13355.085558,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,249221.452137,261034.656030,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,263623.143601,32854.227410,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,58908.567439,4137.470432,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.hession_serialize_compatible","thrpt",1,3,55524.373547,668.406873,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,118374.836631,34704.407553,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,119858.140625,49308.850176,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,137989.198821,40017.148924,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,140260.668888,57308.595910,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,155908.244240,20385.278504,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,151258.539369,12676.385578,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,36846.049162,5491.880967,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,38183.705811,14778.659439,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,118273.584257,18950.629048,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,108263.040839,14982.910444,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,138567.623369,24365.255940,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,140158.673910,54416.908878,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,154875.908438,11984.781345,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,156404.686214,58131.602098,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,37444.967981,14948.012339,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.jdk_serialize","thrpt",1,3,35798.679246,36641.428549,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,1105365.931217,162251.803619,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,734215.482291,79297.387490,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,730792.521676,678674.266715,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,445251.084327,85646.179264,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,558194.100861,257156.321315,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,557542.628765,63084.390134,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,325172.969175,20774.334333,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,259863.332448,86373.633851,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,1376560.302168,147424.342310,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,932887.968348,249800.928765,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,608972.517580,249598.971835,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,359875.473951,274870.064607,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,1078046.011115,249527.480472,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,853350.408656,126642.692106,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,355688.882786,37587.645927,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize","thrpt",1,3,338960.426033,36185.446014,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,378907.663184,280309.649766,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,320815.567701,455179.720989,"ops/s",array,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,188911.259146,97827.317807,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,145782.916427,81270.905462,"ops/s",array,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,145964.199559,88578.667153,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,136180.832879,167433.069232,"ops/s",array,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,125807.748004,23178.451287,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,114983.546343,7341.380140,"ops/s",array,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,296102.615094,18485.738321,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,276757.392449,61173.636852,"ops/s",directBuffer,SAMPLE,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,185363.714829,121440.885632,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,142836.961878,12450.918452,"ops/s",directBuffer,MEDIA_CONTENT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,106695.800225,13463.570576,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,106458.212005,2994.065295,"ops/s",directBuffer,STRUCT,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,92130.672361,9515.661170,"ops/s",directBuffer,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.kryo_serialize_compatible","thrpt",1,3,88989.724768,9379.338279,"ops/s",directBuffer,STRUCT2,true +"org.apache.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,663272.710783,522116.492895,"ops/s",array,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,780618.761219,406063.945348,"ops/s",array,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,330975.350403,196475.862643,"ops/s",array,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,322563.440433,201276.713653,"ops/s",array,STRUCT2,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,693641.589806,43883.803566,"ops/s",directBuffer,SAMPLE,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,805941.345157,91281.699006,"ops/s",directBuffer,MEDIA_CONTENT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,340262.650047,152117.387028,"ops/s",directBuffer,STRUCT,false +"org.apache.fury.benchmark.UserTypeSerializeSuite.protostuff_serialize","thrpt",1,3,325093.716261,56485.972228,"ops/s",directBuffer,STRUCT2,false diff --git a/docs/benchmarks/data/jmh-jdk-11-zerocopy.csv b/docs/benchmarks/data/jmh-jdk-11-zerocopy.csv index 18a2bd65e6..76411f8880 100644 --- a/docs/benchmarks/data/jmh-jdk-11-zerocopy.csv +++ b/docs/benchmarks/data/jmh-jdk-11-zerocopy.csv @@ -1,73 +1,73 @@ "Benchmark","Mode","Threads","Samples","Score","Score Error (99.9%)","Unit","Param: array_size","Param: bufferType","Param: dataType","Param: references" -"io.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,219333.990504,40075.312705,"ops/s",200,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,657754.887247,408901.031753,"ops/s",200,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,179604.045774,45387.509931,"ops/s",200,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,598421.278941,135411.381215,"ops/s",200,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,53100.903684,17709.358858,"ops/s",1000,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,422147.154601,528539.529166,"ops/s",1000,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,38572.001768,24685.893533,"ops/s",1000,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,298929.116572,135040.133488,"ops/s",1000,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,10672.872798,11519.184075,"ops/s",5000,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,136934.604328,19269.032565,"ops/s",5000,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,8561.694533,2137.867210,"ops/s",5000,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,77950.612503,83587.484192,"ops/s",5000,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,313986.053417,29311.641179,"ops/s",200,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,2400193.220466,242732.420524,"ops/s",200,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,294132.218623,60640.778775,"ops/s",200,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,2282550.111756,93004.652618,"ops/s",200,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,67209.107012,5947.935958,"ops/s",1000,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,1805557.477810,5232839.112456,"ops/s",1000,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,66108.014322,16869.542536,"ops/s",1000,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,1644789.427010,54907.475118,"ops/s",1000,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,14997.400124,12425.308762,"ops/s",5000,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,811029.402136,39593.863849,"ops/s",5000,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,15000.378818,2219.583522,"ops/s",5000,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,477148.540850,34970.176073,"ops/s",5000,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,986136.067809,274606.792449,"ops/s",200,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,3302149.383135,3166455.521704,"ops/s",200,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,991807.969328,296490.837932,"ops/s",200,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,3113115.471758,4861106.592529,"ops/s",200,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,205671.992736,127494.951753,"ops/s",1000,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,2831942.848999,1720214.698856,"ops/s",1000,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,202275.242341,56270.238293,"ops/s",1000,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,3397690.327371,146058.097383,"ops/s",1000,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,40312.590172,11836.614114,"ops/s",5000,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,3296658.120035,2199676.238015,"ops/s",5000,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,40413.743717,9893.735875,"ops/s",5000,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,3284441.570594,998247.999163,"ops/s",5000,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,8297232.942927,6613235.386482,"ops/s",200,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,5123572.914045,9342104.794019,"ops/s",200,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,8335248.350301,2796789.944593,"ops/s",200,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,5400346.890126,7654935.504676,"ops/s",200,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,8772856.921028,1984208.178343,"ops/s",1000,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,4979590.929127,5568756.926202,"ops/s",1000,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,8207563.785251,4153794.222735,"ops/s",1000,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,5376191.775007,9167580.616022,"ops/s",1000,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,8027439.580226,6148996.477681,"ops/s",5000,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,5018916.322770,1424045.598203,"ops/s",5000,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,7695981.988316,578662.201123,"ops/s",5000,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,5330897.682960,8055585.038901,"ops/s",5000,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,146675.360652,23502.675233,"ops/s",200,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,1296284.787720,297204.673569,"ops/s",200,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,518713.299422,600548.228171,"ops/s",200,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,1004844.498712,552313.083272,"ops/s",200,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,30409.835023,9562.322209,"ops/s",1000,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,721266.541130,62426.822891,"ops/s",1000,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,112132.004609,6625.327605,"ops/s",1000,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,592972.713203,511777.226637,"ops/s",1000,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,6122.351228,3021.683209,"ops/s",5000,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,147251.846111,278375.379465,"ops/s",5000,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,21826.040410,2246.004993,"ops/s",5000,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,148614.476829,87146.409451,"ops/s",5000,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,147342.606262,138864.952435,"ops/s",200,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,1985187.977633,70426.638387,"ops/s",200,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,972683.763633,604464.052899,"ops/s",200,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,1739454.519770,1053963.541481,"ops/s",200,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,31395.721514,3652.506399,"ops/s",1000,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,1616159.671230,2722436.839807,"ops/s",1000,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,209183.090868,25323.702489,"ops/s",1000,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,1377272.568510,203974.331559,"ops/s",1000,directBuffer,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,6248.006967,783.226602,"ops/s",5000,array,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,711287.533377,86363.201941,"ops/s",5000,array,BUFFER,false -"io.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,43565.678616,4221.267495,"ops/s",5000,directBuffer,PRIMITIVE_ARRAY,false -"io.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,707092.956534,298737.951680,"ops/s",5000,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,219333.990504,40075.312705,"ops/s",200,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,657754.887247,408901.031753,"ops/s",200,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,179604.045774,45387.509931,"ops/s",200,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,598421.278941,135411.381215,"ops/s",200,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,53100.903684,17709.358858,"ops/s",1000,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,422147.154601,528539.529166,"ops/s",1000,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,38572.001768,24685.893533,"ops/s",1000,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,298929.116572,135040.133488,"ops/s",1000,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,10672.872798,11519.184075,"ops/s",5000,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,136934.604328,19269.032565,"ops/s",5000,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,8561.694533,2137.867210,"ops/s",5000,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_deserialize","thrpt",1,3,77950.612503,83587.484192,"ops/s",5000,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,313986.053417,29311.641179,"ops/s",200,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,2400193.220466,242732.420524,"ops/s",200,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,294132.218623,60640.778775,"ops/s",200,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,2282550.111756,93004.652618,"ops/s",200,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,67209.107012,5947.935958,"ops/s",1000,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,1805557.477810,5232839.112456,"ops/s",1000,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,66108.014322,16869.542536,"ops/s",1000,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,1644789.427010,54907.475118,"ops/s",1000,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,14997.400124,12425.308762,"ops/s",5000,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,811029.402136,39593.863849,"ops/s",5000,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,15000.378818,2219.583522,"ops/s",5000,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fst_serialize","thrpt",1,3,477148.540850,34970.176073,"ops/s",5000,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,986136.067809,274606.792449,"ops/s",200,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,3302149.383135,3166455.521704,"ops/s",200,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,991807.969328,296490.837932,"ops/s",200,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,3113115.471758,4861106.592529,"ops/s",200,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,205671.992736,127494.951753,"ops/s",1000,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,2831942.848999,1720214.698856,"ops/s",1000,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,202275.242341,56270.238293,"ops/s",1000,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,3397690.327371,146058.097383,"ops/s",1000,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,40312.590172,11836.614114,"ops/s",5000,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,3296658.120035,2199676.238015,"ops/s",5000,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,40413.743717,9893.735875,"ops/s",5000,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_deserialize","thrpt",1,3,3284441.570594,998247.999163,"ops/s",5000,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,8297232.942927,6613235.386482,"ops/s",200,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,5123572.914045,9342104.794019,"ops/s",200,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,8335248.350301,2796789.944593,"ops/s",200,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,5400346.890126,7654935.504676,"ops/s",200,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,8772856.921028,1984208.178343,"ops/s",1000,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,4979590.929127,5568756.926202,"ops/s",1000,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,8207563.785251,4153794.222735,"ops/s",1000,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,5376191.775007,9167580.616022,"ops/s",1000,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,8027439.580226,6148996.477681,"ops/s",5000,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,5018916.322770,1424045.598203,"ops/s",5000,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,7695981.988316,578662.201123,"ops/s",5000,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.fury_serialize","thrpt",1,3,5330897.682960,8055585.038901,"ops/s",5000,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,146675.360652,23502.675233,"ops/s",200,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,1296284.787720,297204.673569,"ops/s",200,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,518713.299422,600548.228171,"ops/s",200,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,1004844.498712,552313.083272,"ops/s",200,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,30409.835023,9562.322209,"ops/s",1000,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,721266.541130,62426.822891,"ops/s",1000,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,112132.004609,6625.327605,"ops/s",1000,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,592972.713203,511777.226637,"ops/s",1000,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,6122.351228,3021.683209,"ops/s",5000,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,147251.846111,278375.379465,"ops/s",5000,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,21826.040410,2246.004993,"ops/s",5000,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_deserialize","thrpt",1,3,148614.476829,87146.409451,"ops/s",5000,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,147342.606262,138864.952435,"ops/s",200,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,1985187.977633,70426.638387,"ops/s",200,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,972683.763633,604464.052899,"ops/s",200,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,1739454.519770,1053963.541481,"ops/s",200,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,31395.721514,3652.506399,"ops/s",1000,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,1616159.671230,2722436.839807,"ops/s",1000,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,209183.090868,25323.702489,"ops/s",1000,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,1377272.568510,203974.331559,"ops/s",1000,directBuffer,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,6248.006967,783.226602,"ops/s",5000,array,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,711287.533377,86363.201941,"ops/s",5000,array,BUFFER,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,43565.678616,4221.267495,"ops/s",5000,directBuffer,PRIMITIVE_ARRAY,false +"org.apache.fury.benchmark.ZeroCopySuite.kryo_serialize","thrpt",1,3,707092.956534,298737.951680,"ops/s",5000,directBuffer,BUFFER,false diff --git a/docs/guide/graalvm_guide.md b/docs/guide/graalvm_guide.md index 9afd72176b..7db641c5cb 100644 --- a/docs/guide/graalvm_guide.md +++ b/docs/guide/graalvm_guide.md @@ -14,15 +14,15 @@ any extra cost, the performance is great. In order to use Fury on graalvm native image, you must create Fury as an **static** field of a class, and **register** all classes at the enclosing class initialize time. Then configure `native-image.properties` under `resources/META-INF/native-image/$xxx/native-image.propertie` to tell graalvm to init the class at native image -build time. For example, here we configure `io.fury.graalvm.Example` class be init at build time: +build time. For example, here we configure `org.apache.fury.graalvm.Example` class be init at build time: ```properties -Args = --initialize-at-build-time=io.fury.graalvm.Example +Args = --initialize-at-build-time=org.apache.fury.graalvm.Example ``` Another benefit using fury is that you don't have to configure [reflection json](https://www.graalvm.org/latest/reference-manual/native-image/metadata/#specifying-reflection-metadata-in-json) and [serialization json](https://www.graalvm.org/latest/reference-manual/native-image/metadata/#serialization), which is very tedious, cumbersome and inconvenient. When using fury, you just need to invoke -`io.fury.Fury.register(Class, boolean)` for every type you want to serialize. +`org.apache.fury.Fury.register(Class, boolean)` for every type you want to serialize. Note that Fury `asyncCompilationEnabled` option will be disabled automatically for graalvm native image since graalvm native image doesn't support JIT at the image run time. @@ -30,8 +30,8 @@ native image doesn't support JIT at the image run time. ## Not thread-safe Fury Example: ```java -import io.fury.Fury; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.util.Preconditions; import java.util.List; import java.util.Map; @@ -62,17 +62,17 @@ public class Example { } } ``` -Then add `io.fury.graalvm.Example` build time init to `native-image.properties` configuration: +Then add `org.apache.fury.graalvm.Example` build time init to `native-image.properties` configuration: ```properties -Args = --initialize-at-build-time=io.fury.graalvm.Example +Args = --initialize-at-build-time=org.apache.fury.graalvm.Example ``` ## Thread-safe Fury ```java -import io.fury.Fury; -import io.fury.ThreadLocalFury; -import io.fury.ThreadSafeFury; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.ThreadLocalFury; +import org.apache.fury.ThreadSafeFury; +import org.apache.fury.util.Preconditions; import java.util.List; import java.util.Map; @@ -108,15 +108,15 @@ public class ThreadSafeExample { } } ``` -Then add `io.fury.graalvm.ThreadSafeExample` build time init to `native-image.properties` configuration: +Then add `org.apache.fury.graalvm.ThreadSafeExample` build time init to `native-image.properties` configuration: ```properties -Args = --initialize-at-build-time=io.fury.graalvm.ThreadSafeExample +Args = --initialize-at-build-time=org.apache.fury.graalvm.ThreadSafeExample ``` ## Framework Integration For framework developers, if you want to integrate fury for serialization, you can provided a configuration file to let the users to list all the classes they want to serialize, then you can load those classes and invoke -`io.fury.Fury.register(Class, boolean)` to register those classes in your Fury integration class, and configure that +`org.apache.fury.Fury.register(Class, boolean)` to register those classes in your Fury integration class, and configure that class be initialized at graalvm native image build time. ## Benchmark @@ -154,7 +154,7 @@ public class Struct implements Serializable { No compression: ``` Benchmark repeat number: 400000 -Object type: class io.fury.graalvm.Struct +Object type: class org.apache.fury.graalvm.Struct Compress number: false Fury size: 76.0 JDK size: 178.0 @@ -166,7 +166,7 @@ Compare size: Fury is 0.43x size of JDK Compress number: ``` Benchmark repeat number: 400000 -Object type: class io.fury.graalvm.Struct +Object type: class org.apache.fury.graalvm.Struct Compress number: true Fury size: 55.0 JDK size: 178.0 @@ -190,7 +190,7 @@ public class Foo implements Serializable { No compression: ``` Benchmark repeat number: 400000 -Object type: class io.fury.graalvm.Foo +Object type: class org.apache.fury.graalvm.Foo Compress number: false Fury size: 541.0 JDK size: 964.0 @@ -202,7 +202,7 @@ Compare size: Fury is 0.56x size of JDK Compress number: ``` Benchmark repeat number: 400000 -Object type: class io.fury.graalvm.Foo +Object type: class org.apache.fury.graalvm.Foo Compress number: true Fury size: 459.0 JDK size: 964.0 diff --git a/docs/guide/java_object_graph_guide.md b/docs/guide/java_object_graph_guide.md index eaabb669cc..bde9f46768 100644 --- a/docs/guide/java_object_graph_guide.md +++ b/docs/guide/java_object_graph_guide.md @@ -20,8 +20,8 @@ Fury for single-thread usage: import java.util.List; import java.util.Arrays; -import io.fury.*; -import io.fury.config.*; +import org.apache.fury.*; +import org.apache.fury.config.*; public class Example { public static void main(String[] args) { @@ -48,8 +48,8 @@ Fury for multiple-thread usage: import java.util.List; import java.util.Arrays; -import io.fury.*; -import io.fury.config.*; +import org.apache.fury.*; +import org.apache.fury.config.*; public class Example { public static void main(String[] args) { @@ -74,8 +74,8 @@ Fury instances reuse example: import java.util.List; import java.util.Arrays; -import io.fury.*; -import io.fury.config.*; +import org.apache.fury.*; +import org.apache.fury.config.*; public class Example { // reuse fury. @@ -244,7 +244,7 @@ fury.register(SomeClass1.class, 200); ``` If you invoke `FuryBuilder#requireClassRegistration(false)` to disable class registration check, -you can set `io.fury.resolver.ClassChecker` by `ClassResolver#setClassChecker` to control which classes are allowed +you can set `org.apache.fury.resolver.ClassChecker` by `ClassResolver#setClassChecker` to control which classes are allowed for serialization. For example,you can allow classes started with `org.example.*` by: ```java Fury fury = xxx; @@ -261,7 +261,7 @@ ThreadSafeFury fury = new ThreadLocalFury(classLoader -> { checker.allowClass("org.example.*"); ``` -Fury also provided a `io.fury.resolver.AllowListChecker` which is white/blacklist based checker to simplify +Fury also provided a `org.apache.fury.resolver.AllowListChecker` which is white/blacklist based checker to simplify the customization of class check mechanism. You can use this checker or implement more sophisticated checker by yourself. ### Serializer Registration @@ -273,10 +273,10 @@ Or implement `java.io.Externalizable` for a class. ### Zero-Copy Serialization ```java -import io.fury.*; -import io.fury.config.*; -import io.fury.serializers.BufferObject; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.*; +import org.apache.fury.config.*; +import org.apache.fury.serializers.BufferObject; +import org.apache.fury.memory.MemoryBuffer; import java.util.*; import java.util.stream.Collectors; @@ -355,7 +355,7 @@ returned. ### JDK migration If you use jdk serialization before, and you can't upgrade your client and server at the same time, which is common for -online application. Fury provided an util method `io.fury.serializer.JavaSerializer.serializedByJDK` to check whether +online application. Fury provided an util method `org.apache.fury.serializer.JavaSerializer.serializedByJDK` to check whether the binary are generated by jdk serialization, you use following pattern to make exiting serialization protocol-aware, then upgrade serialization to fury in an async rolling-up way: @@ -396,10 +396,10 @@ no need to `versioning` the data. ## Trouble shooting ### Class inconsistency and class version check -If you create fury without setting `CompatibleMode` to `io.fury.config.CompatibleMode.COMPATIBLE`, and you got a strange +If you create fury without setting `CompatibleMode` to `org.apache.fury.config.CompatibleMode.COMPATIBLE`, and you got a strange serialization error, it may be caused by class inconsistency between serialization peer and deserialization peer. -In such cases, you can invoke `FuryBuilder#withClassVersionCheck` to create fury to validate it, if deserialization throws `io.fury.exception.ClassNotCompatibleException`, it shows class are inconsistent, and you should create fury with +In such cases, you can invoke `FuryBuilder#withClassVersionCheck` to create fury to validate it, if deserialization throws `org.apache.fury.exception.ClassNotCompatibleException`, it shows class are inconsistent, and you should create fury with `FuryBuilder#withCompaibleMode(CompatibleMode.COMPATIBLE)`. `CompatibleMode.COMPATIBLE` has more performance and space cost, do not set it by default if your classes are always consistent between serialization and deserialization. diff --git a/docs/guide/scala_guide.md b/docs/guide/scala_guide.md index 9a0ea213b2..f984ad8073 100644 --- a/docs/guide/scala_guide.md +++ b/docs/guide/scala_guide.md @@ -112,7 +112,7 @@ Scala `pojo/bean/case/object` are supported by fury jit well, the performance is Scala collections and generics doesn't follow java collection framework, and is not fully integrated with Fury JIT in current release version. The performance won't be as good as fury collections serialization for java. -The execution for scala collections will invoke Java serialization API `writeObject/readObject/writeReplace/readResolve/readObjectNoData/Externalizable` with fury `ObjectStream` implementation. Although `io.fury.serializer.ObjectStreamSerializer` is much faster than JDK `ObjectOutputStream/ObjectInputStream`, but it still doesn't know how use scala collection generics. +The execution for scala collections will invoke Java serialization API `writeObject/readObject/writeReplace/readResolve/readObjectNoData/Externalizable` with fury `ObjectStream` implementation. Although `org.apache.fury.serializer.ObjectStreamSerializer` is much faster than JDK `ObjectOutputStream/ObjectInputStream`, but it still doesn't know how use scala collection generics. In future we plan to provide more optimization for scala types, see https://github.com/apache/incubator-fury/issues/682, stay tuned! diff --git a/docs/guide/xlang_object_graph_guide.md b/docs/guide/xlang_object_graph_guide.md index a800e83e6f..c2dd99450a 100644 --- a/docs/guide/xlang_object_graph_guide.md +++ b/docs/guide/xlang_object_graph_guide.md @@ -12,8 +12,8 @@ Common types can be serialized automatically: primitive numeric types, string, b **Java** ```java -import io.fury.*; -import io.fury.config.*; +import org.apache.fury.*; +import org.apache.fury.config.*; import java.util.*; @@ -131,8 +131,8 @@ Serializing user-defined types needs registering the custom type using the regis **Java** ```java -import io.fury.*; -import io.fury.config.*; +import org.apache.fury.*; +import org.apache.fury.config.*; import java.util.*; public class Example2 { @@ -176,7 +176,7 @@ public class Example2 { return obj; } - // mvn exec:java -Dexec.mainClass="io.fury.examples.Example2" + // mvn exec:java -Dexec.mainClass="org.apache.fury.examples.Example2" public static void main(String[] args) { Fury fury = Fury.builder().withLanguage(Language.XLANG).build(); fury.register(SomeClass1.class, "example.SomeClass1"); @@ -400,8 +400,8 @@ Shared reference and circular reference can be serialized automatically, no dupl **Java** ```java -import io.fury.*; -import io.fury.config.*; +import org.apache.fury.*; +import org.apache.fury.config.*; import java.util.*; public class ReferenceExample { @@ -419,7 +419,7 @@ public class ReferenceExample { return obj; } - // mvn exec:java -Dexec.mainClass="io.fury.examples.ReferenceExample" + // mvn exec:java -Dexec.mainClass="org.apache.fury.examples.ReferenceExample" public static void main(String[] args) { Fury fury = Fury.builder().withLanguage(Language.XLANG) .withRefTracking(true).build(); @@ -521,10 +521,10 @@ Reference cannot be implemented because of rust ownership restrictions **Java** ```java -import io.fury.*; -import io.fury.config.*; -import io.fury.serializers.BufferObject; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.*; +import org.apache.fury.config.*; +import org.apache.fury.serializers.BufferObject; +import org.apache.fury.memory.MemoryBuffer; import java.util.*; import java.util.stream.Collectors; diff --git a/docs/protocols/java_object_graph.md b/docs/protocols/java_object_graph.md index 47cd02eb2d..a2627444b0 100644 --- a/docs/protocols/java_object_graph.md +++ b/docs/protocols/java_object_graph.md @@ -200,7 +200,7 @@ Which encoding to choose: ### Collection -> All collection serializer must extends `io.fury.serializer.collection.CollectionSerializer`. +> All collection serializer must extends `org.apache.fury.serializer.collection.CollectionSerializer`. Format: @@ -233,7 +233,7 @@ actual element is the declare type in custom class field. Based on the elements header, the serialization of elements data may skip `ref flag`/`null flag`/`element class info`. -`io.fury.serializer.collection.CollectionSerializer#write/read` can be taken as an example. +`org.apache.fury.serializer.collection.CollectionSerializer#write/read` can be taken as an example. ### Array diff --git a/integration_tests/graalvm_tests/pom.xml b/integration_tests/graalvm_tests/pom.xml index d37bf24d77..9a7a5599f3 100644 --- a/integration_tests/graalvm_tests/pom.xml +++ b/integration_tests/graalvm_tests/pom.xml @@ -32,7 +32,7 @@ UTF-8 0.9.28 5.8.1 - io.fury.graalvm.Main + org.apache.fury.graalvm.Main main diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Benchmark.java b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Benchmark.java index 13fbea17ee..674ef6b003 100644 --- a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Benchmark.java +++ b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Benchmark.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.graalvm; +package org.apache.fury.graalvm; -import io.fury.Fury; -import io.fury.io.ClassLoaderObjectInputStream; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.io.ClassLoaderObjectInputStream; +import org.apache.fury.util.Preconditions; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -40,7 +40,7 @@ * @author chaokunyang */ public class Benchmark { - static ObjectInputFilter filter = ObjectInputFilter.Config.createFilter("io.fury.graalvm.*"); + static ObjectInputFilter filter = ObjectInputFilter.Config.createFilter("org.apache.fury.graalvm.*"); public static Object testJDKSerialization(Object o) { byte[] bytes = jdkSerialize(o); diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Example.java b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Example.java index ff3cc7a5d9..fa733d864d 100644 --- a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Example.java +++ b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Example.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.graalvm; +package org.apache.fury.graalvm; -import io.fury.Fury; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.util.Preconditions; import java.util.List; import java.util.Map; diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Foo.java b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Foo.java index 79233fc19a..dc8d690a0f 100644 --- a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Foo.java +++ b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Foo.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.graalvm; +package org.apache.fury.graalvm; import java.io.Serializable; import java.util.List; diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Main.java b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Main.java index 4eaea73247..5325f283c9 100644 --- a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Main.java +++ b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Main.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.graalvm; +package org.apache.fury.graalvm; -import io.fury.graalvm.record.RecordExample; -import io.fury.graalvm.record.RecordExample2; +import org.apache.fury.graalvm.record.RecordExample; +import org.apache.fury.graalvm.record.RecordExample2; public class Main { public static void main(String[] args) throws Throwable { diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Struct.java b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Struct.java index 73dc99eb97..6a2e1589c4 100644 --- a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Struct.java +++ b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Struct.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.graalvm; +package org.apache.fury.graalvm; import java.io.Serializable; import java.util.Objects; diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/ThreadSafeExample.java b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/ThreadSafeExample.java index 9f4af083a9..c147457273 100644 --- a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/ThreadSafeExample.java +++ b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/ThreadSafeExample.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.graalvm; +package org.apache.fury.graalvm; -import io.fury.Fury; -import io.fury.ThreadLocalFury; -import io.fury.ThreadSafeFury; -import io.fury.collection.Collections; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.ThreadLocalFury; +import org.apache.fury.ThreadSafeFury; +import org.apache.fury.collection.Collections; +import org.apache.fury.util.Preconditions; import java.util.List; import java.util.Map; diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/Foo.java b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/Foo.java index e20bc92754..e0f853d80a 100644 --- a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/Foo.java +++ b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/Foo.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.graalvm.record; +package org.apache.fury.graalvm.record; import java.util.List; import java.util.Map; diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/RecordExample.java b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/RecordExample.java index b7c933f991..7672b04aaa 100644 --- a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/RecordExample.java +++ b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/RecordExample.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.graalvm.record; +package org.apache.fury.graalvm.record; -import io.fury.Fury; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.util.Preconditions; import java.util.List; import java.util.Map; diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/RecordExample2.java b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/RecordExample2.java index b003b511e0..ce82d370bc 100644 --- a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/RecordExample2.java +++ b/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/RecordExample2.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.graalvm.record; +package org.apache.fury.graalvm.record; -import io.fury.Fury; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.util.Preconditions; import java.util.List; import java.util.Map; diff --git a/integration_tests/graalvm_tests/src/main/resources/META-INF/native-image/org.furyio/graalvm_tests/native-image.properties b/integration_tests/graalvm_tests/src/main/resources/META-INF/native-image/org.furyio/graalvm_tests/native-image.properties index 14c1940f71..631ca2e66e 100644 --- a/integration_tests/graalvm_tests/src/main/resources/META-INF/native-image/org.furyio/graalvm_tests/native-image.properties +++ b/integration_tests/graalvm_tests/src/main/resources/META-INF/native-image/org.furyio/graalvm_tests/native-image.properties @@ -18,8 +18,8 @@ # https://www.graalvm.org/latest/reference-manual/native-image/dynamic-features/Reflection/#unsafe-accesses : # The unsafe offset get on build time may be different from runtime Args = -H:+ReportExceptionStackTraces \ - --initialize-at-build-time=io.fury.graalvm.Example,\ - io.fury.graalvm.record.RecordExample,\ - io.fury.graalvm.record.RecordExample2,\ - io.fury.graalvm.ThreadSafeExample,\ - io.fury.graalvm.Benchmark + --initialize-at-build-time=org.apache.fury.graalvm.Example,\ + org.apache.fury.graalvm.record.RecordExample,\ + org.apache.fury.graalvm.record.RecordExample2,\ + org.apache.fury.graalvm.ThreadSafeExample,\ + org.apache.fury.graalvm.Benchmark diff --git a/integration_tests/jdk_compatibility_tests/src/test/java/io/fury/integration_tests/FuryTest.java b/integration_tests/jdk_compatibility_tests/src/test/java/io/fury/integration_tests/FuryTest.java index 592760f51d..efc556b0cf 100644 --- a/integration_tests/jdk_compatibility_tests/src/test/java/io/fury/integration_tests/FuryTest.java +++ b/integration_tests/jdk_compatibility_tests/src/test/java/io/fury/integration_tests/FuryTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.integration_tests; +package org.apache.fury.integration_tests; -import io.fury.Fury; -import io.fury.benchmark.data.MediaContent; -import io.fury.benchmark.data.Sample; +import org.apache.fury.Fury; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.benchmark.data.Sample; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration_tests/jdk_compatibility_tests/src/test/java/io/fury/integration_tests/JDKCompatibilityTest.java b/integration_tests/jdk_compatibility_tests/src/test/java/io/fury/integration_tests/JDKCompatibilityTest.java index 7744fb6dc4..ea32843b85 100644 --- a/integration_tests/jdk_compatibility_tests/src/test/java/io/fury/integration_tests/JDKCompatibilityTest.java +++ b/integration_tests/jdk_compatibility_tests/src/test/java/io/fury/integration_tests/JDKCompatibilityTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.integration_tests; +package org.apache.fury.integration_tests; -import io.fury.Fury; -import io.fury.config.CompatibleMode; -import io.fury.config.FuryBuilder; -import io.fury.config.Language; -import io.fury.test.bean.BeanA; -import io.fury.util.Platform; +import org.apache.fury.Fury; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.config.Language; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.util.Platform; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/ImmutableCollectionSerializersTest.java b/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/ImmutableCollectionSerializersTest.java index 63576af503..af80ff8d46 100644 --- a/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/ImmutableCollectionSerializersTest.java +++ b/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/ImmutableCollectionSerializersTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.integration_tests; +package org.apache.fury.integration_tests; -import static io.fury.integration_tests.TestUtils.serDeCheck; +import static org.apache.fury.integration_tests.TestUtils.serDeCheck; -import io.fury.Fury; -import io.fury.test.bean.CollectionFields; -import io.fury.test.bean.MapFields; +import org.apache.fury.Fury; +import org.apache.fury.test.bean.CollectionFields; +import org.apache.fury.test.bean.MapFields; import java.util.List; import java.util.Map; import java.util.Set; 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 32649f4808..e63828c3d4 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 @@ -17,17 +17,17 @@ * under the License. */ -package io.fury.integration_tests; +package org.apache.fury.integration_tests; -import static io.fury.collection.Collections.ofArrayList; -import static io.fury.collection.Collections.ofHashMap; +import static org.apache.fury.collection.Collections.ofArrayList; +import static org.apache.fury.collection.Collections.ofHashMap; -import io.fury.Fury; -import io.fury.config.CompatibleMode; -import io.fury.resolver.MetaContext; -import io.fury.test.bean.Struct; -import io.fury.util.record.RecordComponent; -import io.fury.util.record.RecordUtils; +import org.apache.fury.Fury; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.resolver.MetaContext; +import org.apache.fury.test.bean.Struct; +import org.apache.fury.util.record.RecordComponent; +import org.apache.fury.util.record.RecordUtils; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.ArrayList; diff --git a/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/Records.java b/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/Records.java index c2745355db..c16151a6d6 100644 --- a/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/Records.java +++ b/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/Records.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.integration_tests; +package org.apache.fury.integration_tests; public class Records { private record PrivateRecord(int f1) {} diff --git a/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/TestUtils.java b/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/TestUtils.java index 79caa74314..b11f0992fe 100644 --- a/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/TestUtils.java +++ b/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/TestUtils.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.integration_tests; +package org.apache.fury.integration_tests; -import io.fury.Fury; +import org.apache.fury.Fury; import org.testng.Assert; @SuppressWarnings("unchecked") diff --git a/integration_tests/perftests/README.md b/integration_tests/perftests/README.md index c3b1a26f45..d97689de81 100644 --- a/integration_tests/perftests/README.md +++ b/integration_tests/perftests/README.md @@ -13,6 +13,6 @@ Flatbuffers generated is short, just add generated files to repo directly. ```bash cd java && mvn -T10 install -DskipTests -Dcheckstyle.skip -Dlicense.skip -Dmaven.javadoc.skip && cd ../integration_tests/perftests mvn -T10 compile -#mvn exec:java -Dexec.mainClass="io.fury.integration_tests.UserTypeSerializeSuite" -Dexec.args="-f 1 -wi 0 -i 1 -t 1 -w 1s -r 1s -rf csv" -mvn exec:java -Dexec.mainClass="io.fury.integration_tests.UserTypeSerializeSuite" +#mvn exec:java -Dexec.mainClass="org.apache.fury.integration_tests.UserTypeSerializeSuite" -Dexec.args="-f 1 -wi 0 -i 1 -t 1 -w 1s -r 1s -rf csv" +mvn exec:java -Dexec.mainClass="org.apache.fury.integration_tests.UserTypeSerializeSuite" ``` \ No newline at end of file diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/UserTypeDeserializeSuite.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/UserTypeDeserializeSuite.java index afe1e61458..c9366ea190 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/UserTypeDeserializeSuite.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/UserTypeDeserializeSuite.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.integration_tests; +package org.apache.fury.integration_tests; -import io.fury.benchmark.state.ObjectType; -import io.fury.integration_tests.state.FlatBuffersState; -import io.fury.integration_tests.state.FlatBuffersState.FlatBuffersUserTypeState; -import io.fury.integration_tests.state.ProtoBuffersState; -import io.fury.integration_tests.state.ProtoBuffersState.ProtoBuffersUserTypeState; -import io.fury.util.Platform; +import org.apache.fury.benchmark.state.ObjectType; +import org.apache.fury.integration_tests.state.FlatBuffersState; +import org.apache.fury.integration_tests.state.FlatBuffersState.FlatBuffersUserTypeState; +import org.apache.fury.integration_tests.state.ProtoBuffersState; +import org.apache.fury.integration_tests.state.ProtoBuffersState.ProtoBuffersUserTypeState; +import org.apache.fury.util.Platform; import java.io.IOException; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; @@ -34,7 +34,7 @@ @BenchmarkMode(Mode.Throughput) @CompilerControl(value = CompilerControl.Mode.INLINE) -public class UserTypeDeserializeSuite extends io.fury.benchmark.UserTypeDeserializeSuite { +public class UserTypeDeserializeSuite extends org.apache.fury.benchmark.UserTypeDeserializeSuite { @Benchmark public Object protobuffers_deserialize(ProtoBuffersUserTypeState state) { diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/UserTypeSerializeSuite.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/UserTypeSerializeSuite.java index 28b452d80d..cfbe2e0bbd 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/UserTypeSerializeSuite.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/UserTypeSerializeSuite.java @@ -17,17 +17,17 @@ * under the License. */ -package io.fury.integration_tests; +package org.apache.fury.integration_tests; -import io.fury.benchmark.data.MediaContent; -import io.fury.benchmark.data.Sample; -import io.fury.benchmark.state.BufferType; -import io.fury.benchmark.state.ObjectType; -import io.fury.integration_tests.state.FlatBuffersState; -import io.fury.integration_tests.state.FlatBuffersState.FlatBuffersUserTypeState; -import io.fury.integration_tests.state.ProtoBuffersState; -import io.fury.integration_tests.state.ProtoBuffersState.ProtoBuffersUserTypeState; -import io.fury.util.Platform; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.benchmark.data.Sample; +import org.apache.fury.benchmark.state.BufferType; +import org.apache.fury.benchmark.state.ObjectType; +import org.apache.fury.integration_tests.state.FlatBuffersState; +import org.apache.fury.integration_tests.state.FlatBuffersState.FlatBuffersUserTypeState; +import org.apache.fury.integration_tests.state.ProtoBuffersState; +import org.apache.fury.integration_tests.state.ProtoBuffersState.ProtoBuffersUserTypeState; +import org.apache.fury.util.Platform; import java.io.IOException; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; @@ -36,7 +36,7 @@ @BenchmarkMode(Mode.Throughput) @CompilerControl(value = CompilerControl.Mode.INLINE) -public class UserTypeSerializeSuite extends io.fury.benchmark.UserTypeSerializeSuite { +public class UserTypeSerializeSuite extends org.apache.fury.benchmark.UserTypeSerializeSuite { @Benchmark public byte[] protobuffers_serialize(ProtoBuffersUserTypeState state) { if (state.objectType == ObjectType.SAMPLE) { diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/Example.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/Example.java index 111dcf9988..e8f5691b0e 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/Example.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/Example.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.integration_tests.state; +package org.apache.fury.integration_tests.state; import java.util.List; import java.util.Map; diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/FlatBuffersState.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/FlatBuffersState.java index a087e49d3c..9913ffc624 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/FlatBuffersState.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/FlatBuffersState.java @@ -17,26 +17,26 @@ * under the License. */ -package io.fury.integration_tests.state; +package org.apache.fury.integration_tests.state; import com.google.common.base.Preconditions; import com.google.flatbuffers.FlatBufferBuilder; -import io.fury.benchmark.data.Image; -import io.fury.benchmark.data.Media; -import io.fury.benchmark.data.MediaContent; -import io.fury.benchmark.data.Sample; -import io.fury.benchmark.state.BenchmarkState; -import io.fury.benchmark.state.BufferType; -import io.fury.benchmark.state.ObjectType; -import io.fury.integration_tests.state.Example.Bar; -import io.fury.integration_tests.state.Example.Foo; -import io.fury.integration_tests.state.generated.FBSBar; -import io.fury.integration_tests.state.generated.FBSFoo; -import io.fury.integration_tests.state.generated.FBSImage; -import io.fury.integration_tests.state.generated.FBSMedia; -import io.fury.integration_tests.state.generated.FBSMediaContent; -import io.fury.integration_tests.state.generated.FBSSample; -import io.fury.util.Platform; +import org.apache.fury.benchmark.data.Image; +import org.apache.fury.benchmark.data.Media; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.benchmark.data.Sample; +import org.apache.fury.benchmark.state.BenchmarkState; +import org.apache.fury.benchmark.state.BufferType; +import org.apache.fury.benchmark.state.ObjectType; +import org.apache.fury.integration_tests.state.Example.Bar; +import org.apache.fury.integration_tests.state.Example.Foo; +import org.apache.fury.integration_tests.state.generated.FBSBar; +import org.apache.fury.integration_tests.state.generated.FBSFoo; +import org.apache.fury.integration_tests.state.generated.FBSImage; +import org.apache.fury.integration_tests.state.generated.FBSMedia; +import org.apache.fury.integration_tests.state.generated.FBSMediaContent; +import org.apache.fury.integration_tests.state.generated.FBSSample; +import org.apache.fury.util.Platform; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.HashMap; diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/ProtoBuffersState.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/ProtoBuffersState.java index 94ecf58b93..23da96d3fe 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/ProtoBuffersState.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/ProtoBuffersState.java @@ -17,20 +17,20 @@ * under the License. */ -package io.fury.integration_tests.state; +package org.apache.fury.integration_tests.state; import com.google.common.base.Preconditions; import com.google.protobuf.InvalidProtocolBufferException; -import io.fury.benchmark.data.Image; -import io.fury.benchmark.data.Media; -import io.fury.benchmark.data.MediaContent; -import io.fury.benchmark.data.Sample; -import io.fury.benchmark.state.BenchmarkState; -import io.fury.benchmark.state.BufferType; -import io.fury.benchmark.state.ObjectType; -import io.fury.integration_tests.state.Example.Bar; -import io.fury.integration_tests.state.Example.Foo; -import io.fury.integration_tests.state.generated.ProtoMessage; +import org.apache.fury.benchmark.data.Image; +import org.apache.fury.benchmark.data.Media; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.benchmark.data.Sample; +import org.apache.fury.benchmark.state.BenchmarkState; +import org.apache.fury.benchmark.state.BufferType; +import org.apache.fury.benchmark.state.ObjectType; +import org.apache.fury.integration_tests.state.Example.Bar; +import org.apache.fury.integration_tests.state.Example.Foo; +import org.apache.fury.integration_tests.state.generated.ProtoMessage; import java.util.HashMap; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/bench.fbs b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/bench.fbs index 23bdf9c6a3..2e3af8f858 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/bench.fbs +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/bench.fbs @@ -1,4 +1,4 @@ -namespace io.fury.integration_tests.state.generated; +namespace org.apache.fury.integration_tests.state.generated; table FBSFoo { string:string; diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSBar.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSBar.java index 4576723b2c..7705c2709d 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSBar.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSBar.java @@ -1,6 +1,6 @@ // automatically generated by the FlatBuffers compiler, do not modify -package io.fury.integration_tests.state.generated; +package org.apache.fury.integration_tests.state.generated; import java.nio.*; import java.lang.*; @@ -15,27 +15,27 @@ public final class FBSBar extends Table { public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public FBSBar __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public io.fury.integration_tests.state.generated.FBSFoo f1() { return f1(new io.fury.integration_tests.state.generated.FBSFoo()); } - public io.fury.integration_tests.state.generated.FBSFoo f1(io.fury.integration_tests.state.generated.FBSFoo obj) { int o = __offset(4); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } + public org.apache.fury.integration_tests.state.generated.FBSFoo f1() { return f1(new org.apache.fury.integration_tests.state.generated.FBSFoo()); } + public org.apache.fury.integration_tests.state.generated.FBSFoo f1(org.apache.fury.integration_tests.state.generated.FBSFoo obj) { int o = __offset(4); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public String f2() { int o = __offset(6); return o != 0 ? __string(o + bb_pos) : null; } public ByteBuffer f2AsByteBuffer() { return __vector_as_bytebuffer(6, 1); } public ByteBuffer f2InByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 6, 1); } - public io.fury.integration_tests.state.generated.FBSFoo f3(int j) { return f3(new io.fury.integration_tests.state.generated.FBSFoo(), j); } - public io.fury.integration_tests.state.generated.FBSFoo f3(io.fury.integration_tests.state.generated.FBSFoo obj, int j) { int o = __offset(8); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } + public org.apache.fury.integration_tests.state.generated.FBSFoo f3(int j) { return f3(new org.apache.fury.integration_tests.state.generated.FBSFoo(), j); } + public org.apache.fury.integration_tests.state.generated.FBSFoo f3(org.apache.fury.integration_tests.state.generated.FBSFoo obj, int j) { int o = __offset(8); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } public int f3Length() { int o = __offset(8); return o != 0 ? __vector_len(o) : 0; } - public io.fury.integration_tests.state.generated.FBSFoo.Vector f3Vector() { return f3Vector(new io.fury.integration_tests.state.generated.FBSFoo.Vector()); } - public io.fury.integration_tests.state.generated.FBSFoo.Vector f3Vector(io.fury.integration_tests.state.generated.FBSFoo.Vector obj) { int o = __offset(8); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public org.apache.fury.integration_tests.state.generated.FBSFoo.Vector f3Vector() { return f3Vector(new org.apache.fury.integration_tests.state.generated.FBSFoo.Vector()); } + public org.apache.fury.integration_tests.state.generated.FBSFoo.Vector f3Vector(org.apache.fury.integration_tests.state.generated.FBSFoo.Vector obj) { int o = __offset(8); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public int f4Key(int j) { int o = __offset(10); return o != 0 ? bb.getInt(__vector(o) + j * 4) : 0; } public int f4KeyLength() { int o = __offset(10); return o != 0 ? __vector_len(o) : 0; } public IntVector f4KeyVector() { return f4KeyVector(new IntVector()); } public IntVector f4KeyVector(IntVector obj) { int o = __offset(10); return o != 0 ? obj.__assign(__vector(o), bb) : null; } public ByteBuffer f4KeyAsByteBuffer() { return __vector_as_bytebuffer(10, 4); } public ByteBuffer f4KeyInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 10, 4); } - public io.fury.integration_tests.state.generated.FBSFoo f4Value(int j) { return f4Value(new io.fury.integration_tests.state.generated.FBSFoo(), j); } - public io.fury.integration_tests.state.generated.FBSFoo f4Value(io.fury.integration_tests.state.generated.FBSFoo obj, int j) { int o = __offset(12); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } + public org.apache.fury.integration_tests.state.generated.FBSFoo f4Value(int j) { return f4Value(new org.apache.fury.integration_tests.state.generated.FBSFoo(), j); } + public org.apache.fury.integration_tests.state.generated.FBSFoo f4Value(org.apache.fury.integration_tests.state.generated.FBSFoo obj, int j) { int o = __offset(12); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } public int f4ValueLength() { int o = __offset(12); return o != 0 ? __vector_len(o) : 0; } - public io.fury.integration_tests.state.generated.FBSFoo.Vector f4ValueVector() { return f4ValueVector(new io.fury.integration_tests.state.generated.FBSFoo.Vector()); } - public io.fury.integration_tests.state.generated.FBSFoo.Vector f4ValueVector(io.fury.integration_tests.state.generated.FBSFoo.Vector obj) { int o = __offset(12); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public org.apache.fury.integration_tests.state.generated.FBSFoo.Vector f4ValueVector() { return f4ValueVector(new org.apache.fury.integration_tests.state.generated.FBSFoo.Vector()); } + public org.apache.fury.integration_tests.state.generated.FBSFoo.Vector f4ValueVector(org.apache.fury.integration_tests.state.generated.FBSFoo.Vector obj) { int o = __offset(12); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public int f5() { int o = __offset(14); return o != 0 ? bb.getInt(o + bb_pos) : 0; } public long f6() { int o = __offset(16); return o != 0 ? bb.getLong(o + bb_pos) : 0L; } public float f7() { int o = __offset(18); return o != 0 ? bb.getFloat(o + bb_pos) : 0.0f; } diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSFoo.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSFoo.java index 1b67318f29..b56f7b49fb 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSFoo.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSFoo.java @@ -1,6 +1,6 @@ // automatically generated by the FlatBuffers compiler, do not modify -package io.fury.integration_tests.state.generated; +package org.apache.fury.integration_tests.state.generated; import java.nio.*; import java.lang.*; diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSImage.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSImage.java index a0c8c6e8bf..bf0322fe0b 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSImage.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSImage.java @@ -1,6 +1,6 @@ // automatically generated by the FlatBuffers compiler, do not modify -package io.fury.integration_tests.state.generated; +package org.apache.fury.integration_tests.state.generated; import java.nio.*; import java.lang.*; @@ -24,8 +24,8 @@ public final class FBSImage extends Table { public int width() { int o = __offset(8); return o != 0 ? bb.getInt(o + bb_pos) : 0; } public int height() { int o = __offset(10); return o != 0 ? bb.getInt(o + bb_pos) : 0; } public byte size() { int o = __offset(12); return o != 0 ? bb.get(o + bb_pos) : 0; } - public io.fury.integration_tests.state.generated.FBSMedia media() { return media(new io.fury.integration_tests.state.generated.FBSMedia()); } - public io.fury.integration_tests.state.generated.FBSMedia media(io.fury.integration_tests.state.generated.FBSMedia obj) { int o = __offset(14); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } + public org.apache.fury.integration_tests.state.generated.FBSMedia media() { return media(new org.apache.fury.integration_tests.state.generated.FBSMedia()); } + public org.apache.fury.integration_tests.state.generated.FBSMedia media(org.apache.fury.integration_tests.state.generated.FBSMedia obj) { int o = __offset(14); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public static int createFBSImage(FlatBufferBuilder builder, int uriOffset, diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSMedia.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSMedia.java index 9160ab4dfb..9caa4cb2c7 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSMedia.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSMedia.java @@ -1,6 +1,6 @@ // automatically generated by the FlatBuffers compiler, do not modify -package io.fury.integration_tests.state.generated; +package org.apache.fury.integration_tests.state.generated; import java.nio.*; import java.lang.*; diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSMediaContent.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSMediaContent.java index edf5fef2df..2d58dcabca 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSMediaContent.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSMediaContent.java @@ -1,6 +1,6 @@ // automatically generated by the FlatBuffers compiler, do not modify -package io.fury.integration_tests.state.generated; +package org.apache.fury.integration_tests.state.generated; import java.nio.*; import java.lang.*; @@ -15,13 +15,13 @@ public final class FBSMediaContent extends Table { public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); } public FBSMediaContent __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } - public io.fury.integration_tests.state.generated.FBSMedia media() { return media(new io.fury.integration_tests.state.generated.FBSMedia()); } - public io.fury.integration_tests.state.generated.FBSMedia media(io.fury.integration_tests.state.generated.FBSMedia obj) { int o = __offset(4); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } - public io.fury.integration_tests.state.generated.FBSImage images(int j) { return images(new io.fury.integration_tests.state.generated.FBSImage(), j); } - public io.fury.integration_tests.state.generated.FBSImage images(io.fury.integration_tests.state.generated.FBSImage obj, int j) { int o = __offset(6); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } + public org.apache.fury.integration_tests.state.generated.FBSMedia media() { return media(new org.apache.fury.integration_tests.state.generated.FBSMedia()); } + public org.apache.fury.integration_tests.state.generated.FBSMedia media(org.apache.fury.integration_tests.state.generated.FBSMedia obj) { int o = __offset(4); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } + public org.apache.fury.integration_tests.state.generated.FBSImage images(int j) { return images(new org.apache.fury.integration_tests.state.generated.FBSImage(), j); } + public org.apache.fury.integration_tests.state.generated.FBSImage images(org.apache.fury.integration_tests.state.generated.FBSImage obj, int j) { int o = __offset(6); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } public int imagesLength() { int o = __offset(6); return o != 0 ? __vector_len(o) : 0; } - public io.fury.integration_tests.state.generated.FBSImage.Vector imagesVector() { return imagesVector(new io.fury.integration_tests.state.generated.FBSImage.Vector()); } - public io.fury.integration_tests.state.generated.FBSImage.Vector imagesVector(io.fury.integration_tests.state.generated.FBSImage.Vector obj) { int o = __offset(6); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public org.apache.fury.integration_tests.state.generated.FBSImage.Vector imagesVector() { return imagesVector(new org.apache.fury.integration_tests.state.generated.FBSImage.Vector()); } + public org.apache.fury.integration_tests.state.generated.FBSImage.Vector imagesVector(org.apache.fury.integration_tests.state.generated.FBSImage.Vector obj) { int o = __offset(6); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public static int createFBSMediaContent(FlatBufferBuilder builder, int mediaOffset, diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSPlayer.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSPlayer.java index 399f8d6448..54ea822a16 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSPlayer.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSPlayer.java @@ -1,6 +1,6 @@ // automatically generated by the FlatBuffers compiler, do not modify -package io.fury.integration_tests.state.generated; +package org.apache.fury.integration_tests.state.generated; public final class FBSPlayer { private FBSPlayer() { } diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSSample.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSSample.java index c8df418ef9..d8e4c6effe 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSSample.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSSample.java @@ -1,6 +1,6 @@ // automatically generated by the FlatBuffers compiler, do not modify -package io.fury.integration_tests.state.generated; +package org.apache.fury.integration_tests.state.generated; import java.nio.*; import java.lang.*; diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSSize.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSSize.java index bc174f4849..a4f907d4f4 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSSize.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSSize.java @@ -1,6 +1,6 @@ // automatically generated by the FlatBuffers compiler, do not modify -package io.fury.integration_tests.state.generated; +package org.apache.fury.integration_tests.state.generated; public final class FBSSize { private FBSSize() { } diff --git a/integration_tests/perftests/src/main/proto/bench.proto b/integration_tests/perftests/src/main/proto/bench.proto index aed6e385bb..81e3946542 100644 --- a/integration_tests/perftests/src/main/proto/bench.proto +++ b/integration_tests/perftests/src/main/proto/bench.proto @@ -20,7 +20,7 @@ syntax = "proto3"; package protobuf; -option java_package = "io.fury.integration_tests.state.generated"; +option java_package = "org.apache.fury.integration_tests.state.generated"; option java_outer_classname = "ProtoMessage"; message Foo { diff --git a/integration_tests/perftests/src/test/java/io/fury/integration_tests/state/FlatBuffersStateTest.java b/integration_tests/perftests/src/test/java/io/fury/integration_tests/state/FlatBuffersStateTest.java index d2760d66a8..f27ab87e3c 100644 --- a/integration_tests/perftests/src/test/java/io/fury/integration_tests/state/FlatBuffersStateTest.java +++ b/integration_tests/perftests/src/test/java/io/fury/integration_tests/state/FlatBuffersStateTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.integration_tests.state; +package org.apache.fury.integration_tests.state; -import io.fury.benchmark.data.MediaContent; -import io.fury.benchmark.data.Sample; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.benchmark.data.Sample; import java.nio.ByteBuffer; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/integration_tests/perftests/src/test/java/io/fury/integration_tests/state/ProtoBuffersStateTest.java b/integration_tests/perftests/src/test/java/io/fury/integration_tests/state/ProtoBuffersStateTest.java index 1e660cf89c..41ee40f9e1 100644 --- a/integration_tests/perftests/src/test/java/io/fury/integration_tests/state/ProtoBuffersStateTest.java +++ b/integration_tests/perftests/src/test/java/io/fury/integration_tests/state/ProtoBuffersStateTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.integration_tests.state; +package org.apache.fury.integration_tests.state; -import io.fury.benchmark.data.MediaContent; -import io.fury.benchmark.data.Sample; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.benchmark.data.Sample; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/checkstyle.xml b/java/checkstyle.xml index 6bc0338fa8..7ead8a1419 100644 --- a/java/checkstyle.xml +++ b/java/checkstyle.xml @@ -48,7 +48,7 @@ + value="org.apache.fury.*MurmurHash3|Identity2IdMap.java"/> diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/ArraySuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/ArraySuite.java index dec4487d53..69b18e2f0a 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/ArraySuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/ArraySuite.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryBuffer; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/Benchmark.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/Benchmark.java index 5c76e65c39..4130a273a4 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/Benchmark.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/Benchmark.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; import org.openjdk.jmh.Main; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/CollectionSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/CollectionSuite.java index 82597431bf..54b2e622f8 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/CollectionSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/CollectionSuite.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.Fury; +import org.apache.fury.Fury; import java.util.ArrayList; import java.util.List; import org.openjdk.jmh.Main; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/CompressStringSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/CompressStringSuite.java index 5f9cc396cb..6e9eb0bd0c 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/CompressStringSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/CompressStringSuite.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.StringSerializer; -import io.fury.util.Platform; -import io.fury.util.StringUtils; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.StringSerializer; +import org.apache.fury.util.Platform; +import org.apache.fury.util.StringUtils; import java.nio.ByteBuffer; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/Identity2IdMap.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/Identity2IdMap.java index 4c893d2826..30991f3ea4 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/Identity2IdMap.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/Identity2IdMap.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.util.Platform; +import org.apache.fury.util.Platform; import java.util.ArrayList; import java.util.List; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/IntsDeserializationSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/IntsDeserializationSuite.java index 2fb263617f..5613c2354c 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/IntsDeserializationSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/IntsDeserializationSuite.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.benchmark.state.FstState; -import io.fury.benchmark.state.FuryState; -import io.fury.benchmark.state.HessionState; -import io.fury.benchmark.state.JDKState; -import io.fury.benchmark.state.KryoState; -import io.fury.benchmark.state.ProtostuffState; +import org.apache.fury.benchmark.state.FstState; +import org.apache.fury.benchmark.state.FuryState; +import org.apache.fury.benchmark.state.HessionState; +import org.apache.fury.benchmark.state.JDKState; +import org.apache.fury.benchmark.state.KryoState; +import org.apache.fury.benchmark.state.ProtostuffState; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.CompilerControl; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/IntsSerializationSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/IntsSerializationSuite.java index 178a136f4b..4c6f065f6a 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/IntsSerializationSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/IntsSerializationSuite.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.benchmark.state.FstState; -import io.fury.benchmark.state.FuryState; -import io.fury.benchmark.state.HessionState; -import io.fury.benchmark.state.JDKState; -import io.fury.benchmark.state.KryoState; -import io.fury.benchmark.state.ProtostuffState; +import org.apache.fury.benchmark.state.FstState; +import org.apache.fury.benchmark.state.FuryState; +import org.apache.fury.benchmark.state.HessionState; +import org.apache.fury.benchmark.state.JDKState; +import org.apache.fury.benchmark.state.KryoState; +import org.apache.fury.benchmark.state.ProtostuffState; import java.io.ByteArrayOutputStream; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/LongStringDeserializationSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/LongStringDeserializationSuite.java index ec34ab9fd5..3c62b7fe35 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/LongStringDeserializationSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/LongStringDeserializationSuite.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.benchmark.state.FstState; -import io.fury.benchmark.state.FuryState; -import io.fury.benchmark.state.HessionState; -import io.fury.benchmark.state.JDKState; -import io.fury.benchmark.state.KryoState; -import io.fury.benchmark.state.ProtostuffState; +import org.apache.fury.benchmark.state.FstState; +import org.apache.fury.benchmark.state.FuryState; +import org.apache.fury.benchmark.state.HessionState; +import org.apache.fury.benchmark.state.JDKState; +import org.apache.fury.benchmark.state.KryoState; +import org.apache.fury.benchmark.state.ProtostuffState; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.CompilerControl; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/LongStringSerializationSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/LongStringSerializationSuite.java index d804517755..6962cfa3a4 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/LongStringSerializationSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/LongStringSerializationSuite.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.benchmark.state.FstState; -import io.fury.benchmark.state.FuryState; -import io.fury.benchmark.state.HessionState; -import io.fury.benchmark.state.JDKState; -import io.fury.benchmark.state.KryoState; -import io.fury.benchmark.state.ProtostuffState; +import org.apache.fury.benchmark.state.FstState; +import org.apache.fury.benchmark.state.FuryState; +import org.apache.fury.benchmark.state.HessionState; +import org.apache.fury.benchmark.state.JDKState; +import org.apache.fury.benchmark.state.KryoState; +import org.apache.fury.benchmark.state.ProtostuffState; import java.io.ByteArrayOutputStream; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/LongsDeserializationSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/LongsDeserializationSuite.java index a5c9b8d5f2..3972a9dbaa 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/LongsDeserializationSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/LongsDeserializationSuite.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.benchmark.state.FstState; -import io.fury.benchmark.state.FuryState; -import io.fury.benchmark.state.HessionState; -import io.fury.benchmark.state.JDKState; -import io.fury.benchmark.state.KryoState; -import io.fury.benchmark.state.ProtostuffState; +import org.apache.fury.benchmark.state.FstState; +import org.apache.fury.benchmark.state.FuryState; +import org.apache.fury.benchmark.state.HessionState; +import org.apache.fury.benchmark.state.JDKState; +import org.apache.fury.benchmark.state.KryoState; +import org.apache.fury.benchmark.state.ProtostuffState; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.infra.Blackhole; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/LongsSerializationSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/LongsSerializationSuite.java index 1a97148598..d67b798400 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/LongsSerializationSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/LongsSerializationSuite.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.benchmark.state.FstState; -import io.fury.benchmark.state.FuryState; -import io.fury.benchmark.state.HessionState; -import io.fury.benchmark.state.JDKState; -import io.fury.benchmark.state.KryoState; -import io.fury.benchmark.state.ProtostuffState; +import org.apache.fury.benchmark.state.FstState; +import org.apache.fury.benchmark.state.FuryState; +import org.apache.fury.benchmark.state.HessionState; +import org.apache.fury.benchmark.state.JDKState; +import org.apache.fury.benchmark.state.KryoState; +import org.apache.fury.benchmark.state.ProtostuffState; import java.io.ByteArrayOutputStream; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/MapSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/MapSuite.java index 49b55c1688..fa0dfdc5b1 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/MapSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/MapSuite.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.collection.IdentityMap; -import io.fury.collection.IdentityObjectIntMap; -import io.fury.collection.ObjectMap; +import org.apache.fury.collection.IdentityMap; +import org.apache.fury.collection.IdentityObjectIntMap; +import org.apache.fury.collection.ObjectMap; import io.timeandspace.smoothie.SwissTable; import java.io.IOException; import java.util.HashMap; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/MemorySuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/MemorySuite.java index 66cb76780e..9813892ffb 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/MemorySuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/MemorySuite.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.util.Platform; -import io.fury.util.StringUtils; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.util.Platform; +import org.apache.fury.util.StringUtils; import java.nio.ByteBuffer; import java.util.Random; import org.openjdk.jmh.Main; 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 index 20ca1a57d9..5ab22e877c 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/NewJava11StringSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/NewJava11StringSuite.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -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.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.StringSerializer; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; import org.openjdk.jmh.Main; public class NewJava11StringSuite { diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/NewStringSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/NewStringSuite.java index 2025eef9ad..539f4013f7 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/NewStringSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/NewStringSuite.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.serializer.StringSerializer; -import io.fury.util.Platform; -import io.fury.util.ReflectionUtils; -import io.fury.util.StringUtils; +import org.apache.fury.serializer.StringSerializer; +import org.apache.fury.util.Platform; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; import org.openjdk.jmh.Main; public class NewStringSuite { diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/RowSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/RowSuite.java index adcca84bee..0259144e1f 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/RowSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/RowSuite.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.format.encoder.Encoder; -import io.fury.format.encoder.Encoders; -import io.fury.util.LoggerFactory; +import org.apache.fury.format.encoder.Encoder; +import org.apache.fury.format.encoder.Encoders; +import org.apache.fury.util.LoggerFactory; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.Serializable; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/StringDeserializationSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/StringDeserializationSuite.java index 9d53352638..a551c488f4 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/StringDeserializationSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/StringDeserializationSuite.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.benchmark.state.FstState; -import io.fury.benchmark.state.FuryState; -import io.fury.benchmark.state.HessionState; -import io.fury.benchmark.state.JDKState; -import io.fury.benchmark.state.KryoState; -import io.fury.benchmark.state.ProtostuffState; +import org.apache.fury.benchmark.state.FstState; +import org.apache.fury.benchmark.state.FuryState; +import org.apache.fury.benchmark.state.HessionState; +import org.apache.fury.benchmark.state.JDKState; +import org.apache.fury.benchmark.state.KryoState; +import org.apache.fury.benchmark.state.ProtostuffState; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.CompilerControl; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/StringSerializationSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/StringSerializationSuite.java index c9db87673a..3232aa4063 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/StringSerializationSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/StringSerializationSuite.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.benchmark.state.FstState; -import io.fury.benchmark.state.FuryState; -import io.fury.benchmark.state.HessionState; -import io.fury.benchmark.state.JDKState; -import io.fury.benchmark.state.KryoState; -import io.fury.benchmark.state.ProtostuffState; +import org.apache.fury.benchmark.state.FstState; +import org.apache.fury.benchmark.state.FuryState; +import org.apache.fury.benchmark.state.HessionState; +import org.apache.fury.benchmark.state.JDKState; +import org.apache.fury.benchmark.state.KryoState; +import org.apache.fury.benchmark.state.ProtostuffState; import java.io.ByteArrayOutputStream; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/UserTypeDeserializeSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/UserTypeDeserializeSuite.java index 24693ddcb2..0b570fa1ef 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/UserTypeDeserializeSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/UserTypeDeserializeSuite.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.benchmark.state.FstState; -import io.fury.benchmark.state.FuryState; -import io.fury.benchmark.state.HessionState; -import io.fury.benchmark.state.JDKState; -import io.fury.benchmark.state.JsonbState; -import io.fury.benchmark.state.KryoState; -import io.fury.benchmark.state.ProtostuffState; +import org.apache.fury.benchmark.state.FstState; +import org.apache.fury.benchmark.state.FuryState; +import org.apache.fury.benchmark.state.HessionState; +import org.apache.fury.benchmark.state.JDKState; +import org.apache.fury.benchmark.state.JsonbState; +import org.apache.fury.benchmark.state.KryoState; +import org.apache.fury.benchmark.state.ProtostuffState; import java.io.IOException; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/UserTypeSerializeSuite.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/UserTypeSerializeSuite.java index 98e3bd6f2f..3aeb18afec 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/UserTypeSerializeSuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/UserTypeSerializeSuite.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import io.fury.benchmark.state.FstState; -import io.fury.benchmark.state.FuryState; -import io.fury.benchmark.state.HessionState; -import io.fury.benchmark.state.JDKState; -import io.fury.benchmark.state.JsonbState; -import io.fury.benchmark.state.KryoState; -import io.fury.benchmark.state.ProtostuffState; +import org.apache.fury.benchmark.state.FstState; +import org.apache.fury.benchmark.state.FuryState; +import org.apache.fury.benchmark.state.HessionState; +import org.apache.fury.benchmark.state.JDKState; +import org.apache.fury.benchmark.state.JsonbState; +import org.apache.fury.benchmark.state.KryoState; +import org.apache.fury.benchmark.state.ProtostuffState; import java.io.ByteArrayOutputStream; import java.io.IOException; 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 index 4ddc44bdb1..d6c3844948 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/ZeroCopySuite.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/ZeroCopySuite.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; -import static io.fury.benchmark.state.JsonbState.getJsonbReaderConfig; -import static io.fury.benchmark.state.JsonbState.getJsonbWriterConfig; +import static org.apache.fury.benchmark.state.JsonbState.getJsonbReaderConfig; +import static org.apache.fury.benchmark.state.JsonbState.getJsonbWriterConfig; import com.alibaba.fastjson2.JSONB; import com.alibaba.fastjson2.JSONReader; @@ -30,17 +30,17 @@ import com.esotericsoftware.kryo.io.Output; import com.esotericsoftware.kryo.io.UnsafeMemoryInput; import com.esotericsoftware.kryo.io.UnsafeMemoryOutput; -import io.fury.Fury; -import io.fury.benchmark.data.ComparableByteArray; -import io.fury.benchmark.data.SerializableByteBuffer; -import io.fury.benchmark.state.BufferType; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.serializer.BufferObject; -import io.fury.test.bean.ArraysData; -import io.fury.util.Platform; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.benchmark.data.ComparableByteArray; +import org.apache.fury.benchmark.data.SerializableByteBuffer; +import org.apache.fury.benchmark.state.BufferType; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.BufferObject; +import org.apache.fury.test.bean.ArraysData; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -265,12 +265,12 @@ public void setup() { } public static byte[] fstSerialize(Blackhole blackhole, FstState state, Object value) { - return io.fury.benchmark.state.FstState.FstBenchmarkState.serialize( + return org.apache.fury.benchmark.state.FstState.FstBenchmarkState.serialize( state.fst, state.bufferType, value, state.out, state.directBuffer, blackhole); } public static Object fstDeserialize(Blackhole blackhole, FstState state) { - return io.fury.benchmark.state.FstState.FstBenchmarkState.deserialize( + return org.apache.fury.benchmark.state.FstState.FstBenchmarkState.deserialize( state.fst, state.bufferType, state.buffer, state.out, state.directBuffer, blackhole); } diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/ComparableByteArray.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/ComparableByteArray.java index e3b9f2c2fc..8328290a10 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/ComparableByteArray.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/ComparableByteArray.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.benchmark.data; +package org.apache.fury.benchmark.data; import java.io.Serializable; import java.util.Arrays; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/CustomJDKSerialization.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/CustomJDKSerialization.java index 451ab40618..2a0fdc2f5c 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/CustomJDKSerialization.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/CustomJDKSerialization.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.benchmark.data; +package org.apache.fury.benchmark.data; import java.io.IOException; import java.io.Serializable; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Data.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Data.java index 0653305141..09f595429d 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Data.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Data.java @@ -17,9 +17,9 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.benchmark.data; +package org.apache.fury.benchmark.data; -import io.fury.util.StringUtils; +import org.apache.fury.util.StringUtils; public class Data { // array diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Image.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Image.java index 05a57fc51e..4b48d8d575 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Image.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Image.java @@ -17,7 +17,7 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.benchmark.data; +package org.apache.fury.benchmark.data; import java.io.Serializable; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Media.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Media.java index 48c98b3780..a5c44764f3 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Media.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Media.java @@ -17,7 +17,7 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.benchmark.data; +package org.apache.fury.benchmark.data; import java.util.List; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/MediaContent.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/MediaContent.java index d71fd1ea6d..792e261312 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/MediaContent.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/MediaContent.java @@ -17,7 +17,7 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.benchmark.data; +package org.apache.fury.benchmark.data; import java.util.ArrayList; import java.util.List; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Sample.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Sample.java index 2f3836fdd4..1fdd3e3d35 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Sample.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Sample.java @@ -17,7 +17,7 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.benchmark.data; +package org.apache.fury.benchmark.data; import java.io.Serializable; import java.util.Arrays; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/SerializableByteBuffer.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/SerializableByteBuffer.java index dca3a10c8a..c00acbbfe7 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/SerializableByteBuffer.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/data/SerializableByteBuffer.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.benchmark.data; +package org.apache.fury.benchmark.data; import java.io.Externalizable; import java.io.IOException; 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 index c6a9a57c08..e97bd05c5d 100644 --- 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 @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.benchmark.data; +package org.apache.fury.benchmark.data; -import io.fury.util.ClassLoaderUtils; -import io.fury.util.Preconditions; +import org.apache.fury.util.ClassLoaderUtils; +import org.apache.fury.util.Preconditions; import java.io.Serializable; import java.io.StringReader; import java.lang.reflect.Field; @@ -145,13 +145,13 @@ public static Class createStructClass(int numFields, boolean boxed) { + "package demo.fury.pkg1;\n" + "public final class %s implements java.io.Serializable {\n" + " public String toString() {\n" - + " return io.fury.benchmark.data.Struct.toString(this);\n" + + " return org.apache.fury.benchmark.data.Struct.toString(this);\n" + " }\n" + " public boolean equals(Object o) {\n" - + " return io.fury.benchmark.data.Struct.equalsWith(this, o);\n" + + " return org.apache.fury.benchmark.data.Struct.equalsWith(this, o);\n" + " }\n" + " public int hashCode() {\n" - + " return io.fury.benchmark.data.Struct.calcHashCode(this);\n" + + " return org.apache.fury.benchmark.data.Struct.calcHashCode(this);\n" + " }\n", classname)); diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/BenchmarkState.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/state/BenchmarkState.java index 6da9748355..a423d69996 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/BenchmarkState.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/state/BenchmarkState.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.benchmark.state; +package org.apache.fury.benchmark.state; -import io.fury.util.StringUtils; +import org.apache.fury.util.StringUtils; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/BufferType.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/state/BufferType.java index ba5888caa5..844f73efdd 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/BufferType.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/state/BufferType.java @@ -17,7 +17,7 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.benchmark.state; +package org.apache.fury.benchmark.state; public enum BufferType { array, 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 index 291ea7a497..9c7af14fcf 100644 --- 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 @@ -17,18 +17,18 @@ * under the License. */ -package io.fury.benchmark.state; - -import io.fury.benchmark.IntsSerializationSuite; -import io.fury.benchmark.LongStringSerializationSuite; -import io.fury.benchmark.LongsSerializationSuite; -import io.fury.benchmark.StringSerializationSuite; -import io.fury.benchmark.data.Data; -import io.fury.benchmark.data.Image; -import io.fury.benchmark.data.Media; -import io.fury.benchmark.data.MediaContent; -import io.fury.util.Platform; -import io.fury.util.Preconditions; +package org.apache.fury.benchmark.state; + +import org.apache.fury.benchmark.IntsSerializationSuite; +import org.apache.fury.benchmark.LongStringSerializationSuite; +import org.apache.fury.benchmark.LongsSerializationSuite; +import org.apache.fury.benchmark.StringSerializationSuite; +import org.apache.fury.benchmark.data.Data; +import org.apache.fury.benchmark.data.Image; +import org.apache.fury.benchmark.data.Media; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.util.Platform; +import org.apache.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 index 9e496fb055..624a69b2cb 100644 --- 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 @@ -17,28 +17,28 @@ * under the License. */ -package io.fury.benchmark.state; +package org.apache.fury.benchmark.state; -import io.fury.Fury; -import io.fury.benchmark.IntsSerializationSuite; -import io.fury.benchmark.LongStringSerializationSuite; -import io.fury.benchmark.LongsSerializationSuite; -import io.fury.benchmark.StringSerializationSuite; -import io.fury.benchmark.UserTypeDeserializeSuite; -import io.fury.benchmark.UserTypeSerializeSuite; -import io.fury.benchmark.data.Data; -import io.fury.benchmark.data.Image; -import io.fury.benchmark.data.Media; -import io.fury.benchmark.data.MediaContent; -import io.fury.benchmark.data.Struct; -import io.fury.config.CompatibleMode; -import io.fury.config.FuryBuilder; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.resolver.MetaContext; -import io.fury.util.LoggerFactory; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.benchmark.IntsSerializationSuite; +import org.apache.fury.benchmark.LongStringSerializationSuite; +import org.apache.fury.benchmark.LongsSerializationSuite; +import org.apache.fury.benchmark.StringSerializationSuite; +import org.apache.fury.benchmark.UserTypeDeserializeSuite; +import org.apache.fury.benchmark.UserTypeSerializeSuite; +import org.apache.fury.benchmark.data.Data; +import org.apache.fury.benchmark.data.Image; +import org.apache.fury.benchmark.data.Media; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.benchmark.data.Struct; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.resolver.MetaContext; +import org.apache.fury.util.LoggerFactory; +import org.apache.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 index 0296d03001..53fe390229 100644 --- 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 @@ -17,20 +17,20 @@ * under the License. */ -package io.fury.benchmark.state; +package org.apache.fury.benchmark.state; import com.caucho.hessian.io.Hessian2Input; import com.caucho.hessian.io.Hessian2Output; -import io.fury.benchmark.IntsSerializationSuite; -import io.fury.benchmark.LongStringSerializationSuite; -import io.fury.benchmark.LongsSerializationSuite; -import io.fury.benchmark.StringSerializationSuite; -import io.fury.benchmark.data.Data; -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.Preconditions; +import org.apache.fury.benchmark.IntsSerializationSuite; +import org.apache.fury.benchmark.LongStringSerializationSuite; +import org.apache.fury.benchmark.LongsSerializationSuite; +import org.apache.fury.benchmark.StringSerializationSuite; +import org.apache.fury.benchmark.data.Data; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.benchmark.data.Sample; +import org.apache.fury.benchmark.data.Struct; +import org.apache.fury.util.LoggerFactory; +import org.apache.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 index 09e80985ab..0dbe28de2e 100644 --- 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 @@ -17,18 +17,18 @@ * under the License. */ -package io.fury.benchmark.state; +package org.apache.fury.benchmark.state; -import io.fury.benchmark.IntsSerializationSuite; -import io.fury.benchmark.LongStringSerializationSuite; -import io.fury.benchmark.LongsSerializationSuite; -import io.fury.benchmark.StringSerializationSuite; -import io.fury.benchmark.data.Data; -import io.fury.benchmark.data.MediaContent; -import io.fury.benchmark.data.Sample; -import io.fury.benchmark.data.Struct; -import io.fury.io.ClassLoaderObjectInputStream; -import io.fury.util.Preconditions; +import org.apache.fury.benchmark.IntsSerializationSuite; +import org.apache.fury.benchmark.LongStringSerializationSuite; +import org.apache.fury.benchmark.LongsSerializationSuite; +import org.apache.fury.benchmark.StringSerializationSuite; +import org.apache.fury.benchmark.data.Data; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.benchmark.data.Sample; +import org.apache.fury.benchmark.data.Struct; +import org.apache.fury.io.ClassLoaderObjectInputStream; +import org.apache.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 index c486285c4e..5deae704a1 100644 --- 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 @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.benchmark.state; +package org.apache.fury.benchmark.state; import com.alibaba.fastjson2.JSONB; import com.alibaba.fastjson2.JSONFactory; @@ -25,14 +25,14 @@ import com.alibaba.fastjson2.JSONReader; import com.alibaba.fastjson2.JSONWriter; import com.alibaba.fastjson2.reader.ObjectReaderProvider; -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 org.apache.fury.Fury; +import org.apache.fury.benchmark.data.CustomJDKSerialization; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.benchmark.data.Sample; +import org.apache.fury.benchmark.data.Struct; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; +import org.apache.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 index 34e2af4dcc..5954fb2102 100644 --- 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 @@ -17,7 +17,7 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.benchmark.state; +package org.apache.fury.benchmark.state; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; @@ -25,15 +25,15 @@ import com.esotericsoftware.kryo.io.UnsafeMemoryInput; import com.esotericsoftware.kryo.io.UnsafeMemoryOutput; import com.esotericsoftware.kryo.serializers.CompatibleFieldSerializer; -import io.fury.benchmark.IntsSerializationSuite; -import io.fury.benchmark.LongStringSerializationSuite; -import io.fury.benchmark.LongsSerializationSuite; -import io.fury.benchmark.StringSerializationSuite; -import io.fury.benchmark.data.Data; -import io.fury.benchmark.data.Image; -import io.fury.benchmark.data.Media; -import io.fury.benchmark.data.MediaContent; -import io.fury.util.Preconditions; +import org.apache.fury.benchmark.IntsSerializationSuite; +import org.apache.fury.benchmark.LongStringSerializationSuite; +import org.apache.fury.benchmark.LongsSerializationSuite; +import org.apache.fury.benchmark.StringSerializationSuite; +import org.apache.fury.benchmark.data.Data; +import org.apache.fury.benchmark.data.Image; +import org.apache.fury.benchmark.data.Media; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.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/ObjectType.java b/java/fury-benchmark/src/main/java/io/fury/benchmark/state/ObjectType.java index 35af3e3ee9..c5765e19cb 100644 --- a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/ObjectType.java +++ b/java/fury-benchmark/src/main/java/io/fury/benchmark/state/ObjectType.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.benchmark.state; +package org.apache.fury.benchmark.state; -import io.fury.benchmark.data.MediaContent; -import io.fury.benchmark.data.Sample; -import io.fury.benchmark.data.Struct; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.benchmark.data.Sample; +import org.apache.fury.benchmark.data.Struct; public enum ObjectType { SAMPLE, 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 index 16c0c2b5bc..cd0f0b3e10 100644 --- 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 @@ -17,17 +17,17 @@ * under the License. */ -package io.fury.benchmark.state; - -import io.fury.benchmark.IntsSerializationSuite; -import io.fury.benchmark.LongStringSerializationSuite; -import io.fury.benchmark.LongsSerializationSuite; -import io.fury.benchmark.StringSerializationSuite; -import io.fury.benchmark.data.Data; -import io.fury.benchmark.data.MediaContent; -import io.fury.benchmark.data.Sample; -import io.fury.benchmark.data.Struct; -import io.fury.util.Preconditions; +package org.apache.fury.benchmark.state; + +import org.apache.fury.benchmark.IntsSerializationSuite; +import org.apache.fury.benchmark.LongStringSerializationSuite; +import org.apache.fury.benchmark.LongsSerializationSuite; +import org.apache.fury.benchmark.StringSerializationSuite; +import org.apache.fury.benchmark.data.Data; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.benchmark.data.Sample; +import org.apache.fury.benchmark.data.Struct; +import org.apache.fury.util.Preconditions; import io.protostuff.LinkedBuffer; import io.protostuff.ProtostuffIOUtil; import io.protostuff.Schema; diff --git a/java/fury-core/pom.xml b/java/fury-core/pom.xml index d1fd5e7b29..a990e73acd 100644 --- a/java/fury-core/pom.xml +++ b/java/fury-core/pom.xml @@ -101,11 +101,11 @@ org.codehaus - io.fury.shaded.org.codehaus + org.apache.fury.shaded.org.codehaus javassist - io.fury.shaded.javassist + org.apache.fury.shaded.javassist diff --git a/java/fury-core/src/main/java/io/fury/Fury.java b/java/fury-core/src/main/java/io/fury/Fury.java index 9ac755263a..a3242b2203 100644 --- a/java/fury-core/src/main/java/io/fury/Fury.java +++ b/java/fury-core/src/main/java/io/fury/Fury.java @@ -17,38 +17,38 @@ * under the License. */ -package io.fury; - -import io.fury.builder.JITContext; -import io.fury.config.CompatibleMode; -import io.fury.config.Config; -import io.fury.config.FuryBuilder; -import io.fury.config.Language; -import io.fury.config.LongEncoding; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.resolver.ClassInfo; -import io.fury.resolver.ClassInfoHolder; -import io.fury.resolver.ClassResolver; -import io.fury.resolver.EnumStringResolver; -import io.fury.resolver.MapRefResolver; -import io.fury.resolver.NoRefResolver; -import io.fury.resolver.RefResolver; -import io.fury.resolver.SerializationContext; -import io.fury.serializer.ArraySerializers; -import io.fury.serializer.BufferCallback; -import io.fury.serializer.BufferObject; -import io.fury.serializer.OpaqueObjects; -import io.fury.serializer.PrimitiveSerializers.LongSerializer; -import io.fury.serializer.Serializer; -import io.fury.serializer.SerializerFactory; -import io.fury.serializer.StringSerializer; -import io.fury.type.Generics; -import io.fury.type.Type; -import io.fury.util.ExceptionUtils; -import io.fury.util.LoggerFactory; -import io.fury.util.Preconditions; -import io.fury.util.StringUtils; +package org.apache.fury; + +import org.apache.fury.builder.JITContext; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Config; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.config.Language; +import org.apache.fury.config.LongEncoding; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.resolver.ClassInfo; +import org.apache.fury.resolver.ClassInfoHolder; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.EnumStringResolver; +import org.apache.fury.resolver.MapRefResolver; +import org.apache.fury.resolver.NoRefResolver; +import org.apache.fury.resolver.RefResolver; +import org.apache.fury.resolver.SerializationContext; +import org.apache.fury.serializer.ArraySerializers; +import org.apache.fury.serializer.BufferCallback; +import org.apache.fury.serializer.BufferObject; +import org.apache.fury.serializer.OpaqueObjects; +import org.apache.fury.serializer.PrimitiveSerializers.LongSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.SerializerFactory; +import org.apache.fury.serializer.StringSerializer; +import org.apache.fury.type.Generics; +import org.apache.fury.type.Type; +import org.apache.fury.util.ExceptionUtils; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.StringUtils; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -117,7 +117,7 @@ public final class Fury { public Fury(FuryBuilder builder, ClassLoader classLoader) { // Avoid set classLoader in `FuryBuilder`, which won't be clear when - // `io.fury.ThreadSafeFury.clearClassLoader` is called. + // `org.apache.fury.ThreadSafeFury.clearClassLoader` is called. config = new Config(builder); this.language = config.getLanguage(); this.refTracking = config.trackingRef(); diff --git a/java/fury-core/src/main/java/io/fury/ThreadLocalFury.java b/java/fury-core/src/main/java/io/fury/ThreadLocalFury.java index 1f8680bc29..246373dca6 100644 --- a/java/fury-core/src/main/java/io/fury/ThreadLocalFury.java +++ b/java/fury-core/src/main/java/io/fury/ThreadLocalFury.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury; +package org.apache.fury; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.resolver.ClassResolver; -import io.fury.util.LoaderBinding; -import io.fury.util.LoaderBinding.StagingType; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.util.LoaderBinding; +import org.apache.fury.util.LoaderBinding.StagingType; import java.nio.ByteBuffer; import java.util.function.Function; import javax.annotation.concurrent.ThreadSafe; diff --git a/java/fury-core/src/main/java/io/fury/ThreadSafeFury.java b/java/fury-core/src/main/java/io/fury/ThreadSafeFury.java index 2b9400ee8d..2e2d7acca5 100644 --- a/java/fury-core/src/main/java/io/fury/ThreadSafeFury.java +++ b/java/fury-core/src/main/java/io/fury/ThreadSafeFury.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury; +package org.apache.fury; -import io.fury.memory.MemoryBuffer; -import io.fury.util.LoaderBinding; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.LoaderBinding; import java.nio.ByteBuffer; import java.util.function.Function; diff --git a/java/fury-core/src/main/java/io/fury/annotation/CodegenInvoke.java b/java/fury-core/src/main/java/io/fury/annotation/CodegenInvoke.java index df87960ccf..578c144b7a 100644 --- a/java/fury-core/src/main/java/io/fury/annotation/CodegenInvoke.java +++ b/java/fury-core/src/main/java/io/fury/annotation/CodegenInvoke.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.annotation; +package org.apache.fury.annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/java/fury-core/src/main/java/io/fury/annotation/Ignore.java b/java/fury-core/src/main/java/io/fury/annotation/Ignore.java index 80430fb0bc..b02b59e123 100644 --- a/java/fury-core/src/main/java/io/fury/annotation/Ignore.java +++ b/java/fury-core/src/main/java/io/fury/annotation/Ignore.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.annotation; +package org.apache.fury.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java/fury-core/src/main/java/io/fury/annotation/Internal.java b/java/fury-core/src/main/java/io/fury/annotation/Internal.java index c1fbc99642..a6034d0107 100644 --- a/java/fury-core/src/main/java/io/fury/annotation/Internal.java +++ b/java/fury-core/src/main/java/io/fury/annotation/Internal.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.annotation; +package org.apache.fury.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/java/fury-core/src/main/java/io/fury/annotation/Public.java b/java/fury-core/src/main/java/io/fury/annotation/Public.java index 82550bcf1f..e1f54a9b59 100644 --- a/java/fury-core/src/main/java/io/fury/annotation/Public.java +++ b/java/fury-core/src/main/java/io/fury/annotation/Public.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.annotation; +package org.apache.fury.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/java/fury-core/src/main/java/io/fury/builder/AccessorHelper.java b/java/fury-core/src/main/java/io/fury/builder/AccessorHelper.java index b83b4d12cd..2fab126658 100644 --- a/java/fury-core/src/main/java/io/fury/builder/AccessorHelper.java +++ b/java/fury-core/src/main/java/io/fury/builder/AccessorHelper.java @@ -17,21 +17,21 @@ * under the License. */ -package io.fury.builder; - -import static io.fury.codegen.CodeGenerator.sourcePkgLevelAccessible; - -import io.fury.codegen.CodeGenerator; -import io.fury.codegen.CodegenContext; -import io.fury.codegen.CompileUnit; -import io.fury.codegen.JaninoUtils; -import io.fury.type.Descriptor; -import io.fury.util.ClassLoaderUtils; -import io.fury.util.LoggerFactory; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.StringUtils; -import io.fury.util.record.RecordUtils; +package org.apache.fury.builder; + +import static org.apache.fury.codegen.CodeGenerator.sourcePkgLevelAccessible; + +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.codegen.CodegenContext; +import org.apache.fury.codegen.CompileUnit; +import org.apache.fury.codegen.JaninoUtils; +import org.apache.fury.type.Descriptor; +import org.apache.fury.util.ClassLoaderUtils; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; +import org.apache.fury.util.record.RecordUtils; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -44,7 +44,7 @@ * Define accessor helper methods in beanClass's classloader and same package to avoid reflective * call overhead. {@link sun.misc.Unsafe} is another method to avoid reflection cost. * - * @see io.fury.util.UnsafeFieldAccessor + * @see org.apache.fury.util.UnsafeFieldAccessor * @author chaokunyang */ public class AccessorHelper { diff --git a/java/fury-core/src/main/java/io/fury/builder/BaseObjectCodecBuilder.java b/java/fury-core/src/main/java/io/fury/builder/BaseObjectCodecBuilder.java index a9fbfeac63..51925adff2 100644 --- a/java/fury-core/src/main/java/io/fury/builder/BaseObjectCodecBuilder.java +++ b/java/fury-core/src/main/java/io/fury/builder/BaseObjectCodecBuilder.java @@ -17,78 +17,78 @@ * under the License. */ -package io.fury.builder; +package org.apache.fury.builder; -import static io.fury.codegen.CodeGenerator.getPackage; -import static io.fury.codegen.Expression.Invoke.inlineInvoke; -import static io.fury.codegen.Expression.Reference.fieldRef; -import static io.fury.codegen.ExpressionOptimizer.invokeGenerated; -import static io.fury.codegen.ExpressionUtils.eq; -import static io.fury.codegen.ExpressionUtils.gt; -import static io.fury.codegen.ExpressionUtils.neq; -import static io.fury.codegen.ExpressionUtils.not; -import static io.fury.codegen.ExpressionUtils.nullValue; -import static io.fury.codegen.ExpressionUtils.uninline; -import static io.fury.collection.Collections.ofHashSet; -import static io.fury.serializer.CodegenSerializer.LazyInitBeanSerializer; -import static io.fury.type.TypeUtils.CLASS_TYPE; -import static io.fury.type.TypeUtils.COLLECTION_TYPE; -import static io.fury.type.TypeUtils.MAP_TYPE; -import static io.fury.type.TypeUtils.OBJECT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_BOOLEAN_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_BYTE_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_DOUBLE_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_FLOAT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_INT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_SHORT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_VOID_TYPE; -import static io.fury.type.TypeUtils.SET_TYPE; -import static io.fury.type.TypeUtils.getElementType; -import static io.fury.type.TypeUtils.getRawType; -import static io.fury.type.TypeUtils.isBoxed; -import static io.fury.type.TypeUtils.isPrimitive; -import static io.fury.util.Preconditions.checkArgument; +import static org.apache.fury.codegen.CodeGenerator.getPackage; +import static org.apache.fury.codegen.Expression.Invoke.inlineInvoke; +import static org.apache.fury.codegen.Expression.Reference.fieldRef; +import static org.apache.fury.codegen.ExpressionOptimizer.invokeGenerated; +import static org.apache.fury.codegen.ExpressionUtils.eq; +import static org.apache.fury.codegen.ExpressionUtils.gt; +import static org.apache.fury.codegen.ExpressionUtils.neq; +import static org.apache.fury.codegen.ExpressionUtils.not; +import static org.apache.fury.codegen.ExpressionUtils.nullValue; +import static org.apache.fury.codegen.ExpressionUtils.uninline; +import static org.apache.fury.collection.Collections.ofHashSet; +import static org.apache.fury.serializer.CodegenSerializer.LazyInitBeanSerializer; +import static org.apache.fury.type.TypeUtils.CLASS_TYPE; +import static org.apache.fury.type.TypeUtils.COLLECTION_TYPE; +import static org.apache.fury.type.TypeUtils.MAP_TYPE; +import static org.apache.fury.type.TypeUtils.OBJECT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_BOOLEAN_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_BYTE_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_DOUBLE_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_FLOAT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_INT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_SHORT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_VOID_TYPE; +import static org.apache.fury.type.TypeUtils.SET_TYPE; +import static org.apache.fury.type.TypeUtils.getElementType; +import static org.apache.fury.type.TypeUtils.getRawType; +import static org.apache.fury.type.TypeUtils.isBoxed; +import static org.apache.fury.type.TypeUtils.isPrimitive; +import static org.apache.fury.util.Preconditions.checkArgument; import com.google.common.collect.ImmutableSet; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.codegen.CodeGenerator; -import io.fury.codegen.CodegenContext; -import io.fury.codegen.Expression; -import io.fury.codegen.Expression.Assign; -import io.fury.codegen.Expression.BitAnd; -import io.fury.codegen.Expression.Cast; -import io.fury.codegen.Expression.ForEach; -import io.fury.codegen.Expression.ForLoop; -import io.fury.codegen.Expression.If; -import io.fury.codegen.Expression.Invoke; -import io.fury.codegen.Expression.ListExpression; -import io.fury.codegen.Expression.Literal; -import io.fury.codegen.Expression.Reference; -import io.fury.codegen.Expression.Return; -import io.fury.codegen.Expression.StaticInvoke; -import io.fury.codegen.ExpressionUtils; -import io.fury.codegen.ExpressionVisitor.ExprHolder; -import io.fury.collection.Tuple2; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassInfo; -import io.fury.resolver.ClassInfoHolder; -import io.fury.resolver.ClassResolver; -import io.fury.resolver.RefResolver; -import io.fury.serializer.CompatibleSerializer; -import io.fury.serializer.ObjectSerializer; -import io.fury.serializer.PrimitiveSerializers.LongSerializer; -import io.fury.serializer.Serializer; -import io.fury.serializer.Serializers; -import io.fury.serializer.StringSerializer; -import io.fury.serializer.collection.AbstractCollectionSerializer; -import io.fury.serializer.collection.AbstractMapSerializer; -import io.fury.serializer.collection.CollectionFlags; -import io.fury.type.TypeUtils; -import io.fury.util.GraalvmSupport; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.StringUtils; +import org.apache.fury.Fury; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.codegen.CodegenContext; +import org.apache.fury.codegen.Expression; +import org.apache.fury.codegen.Expression.Assign; +import org.apache.fury.codegen.Expression.BitAnd; +import org.apache.fury.codegen.Expression.Cast; +import org.apache.fury.codegen.Expression.ForEach; +import org.apache.fury.codegen.Expression.ForLoop; +import org.apache.fury.codegen.Expression.If; +import org.apache.fury.codegen.Expression.Invoke; +import org.apache.fury.codegen.Expression.ListExpression; +import org.apache.fury.codegen.Expression.Literal; +import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.codegen.Expression.Return; +import org.apache.fury.codegen.Expression.StaticInvoke; +import org.apache.fury.codegen.ExpressionUtils; +import org.apache.fury.codegen.ExpressionVisitor.ExprHolder; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassInfo; +import org.apache.fury.resolver.ClassInfoHolder; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.RefResolver; +import org.apache.fury.serializer.CompatibleSerializer; +import org.apache.fury.serializer.ObjectSerializer; +import org.apache.fury.serializer.PrimitiveSerializers.LongSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.Serializers; +import org.apache.fury.serializer.StringSerializer; +import org.apache.fury.serializer.collection.AbstractCollectionSerializer; +import org.apache.fury.serializer.collection.AbstractMapSerializer; +import org.apache.fury.serializer.collection.CollectionFlags; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; import java.lang.reflect.Modifier; import java.util.Collections; import java.util.HashMap; 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 ba42738b36..7d3790c6ed 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 @@ -17,48 +17,48 @@ * under the License. */ -package io.fury.builder; - -import static io.fury.codegen.Expression.Invoke.inlineInvoke; -import static io.fury.type.TypeUtils.CLASS_TYPE; -import static io.fury.type.TypeUtils.OBJECT_ARRAY_TYPE; -import static io.fury.type.TypeUtils.OBJECT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_BOOLEAN_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_BYTE_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_CHAR_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_DOUBLE_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_FLOAT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_INT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_LONG_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_SHORT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_VOID_TYPE; -import static io.fury.type.TypeUtils.getRawType; +package org.apache.fury.builder; + +import static org.apache.fury.codegen.Expression.Invoke.inlineInvoke; +import static org.apache.fury.type.TypeUtils.CLASS_TYPE; +import static org.apache.fury.type.TypeUtils.OBJECT_ARRAY_TYPE; +import static org.apache.fury.type.TypeUtils.OBJECT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_BOOLEAN_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_BYTE_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_CHAR_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_DOUBLE_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_FLOAT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_INT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_LONG_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_SHORT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_VOID_TYPE; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.codegen.CodegenContext; -import io.fury.codegen.Expression; -import io.fury.codegen.Expression.Cast; -import io.fury.codegen.Expression.Inlineable; -import io.fury.codegen.Expression.Invoke; -import io.fury.codegen.Expression.ListExpression; -import io.fury.codegen.Expression.Literal; -import io.fury.codegen.Expression.Reference; -import io.fury.codegen.Expression.StaticInvoke; -import io.fury.collection.Tuple2; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassInfo; -import io.fury.resolver.ClassInfoHolder; -import io.fury.type.Descriptor; -import io.fury.type.FinalObjectTypeStub; -import io.fury.util.GraalvmSupport; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.StringUtils; -import io.fury.util.function.Functions; -import io.fury.util.record.RecordComponent; -import io.fury.util.record.RecordUtils; +import org.apache.fury.Fury; +import org.apache.fury.codegen.CodegenContext; +import org.apache.fury.codegen.Expression; +import org.apache.fury.codegen.Expression.Cast; +import org.apache.fury.codegen.Expression.Inlineable; +import org.apache.fury.codegen.Expression.Invoke; +import org.apache.fury.codegen.Expression.ListExpression; +import org.apache.fury.codegen.Expression.Literal; +import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.codegen.Expression.StaticInvoke; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassInfo; +import org.apache.fury.resolver.ClassInfoHolder; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.FinalObjectTypeStub; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; +import org.apache.fury.util.function.Functions; +import org.apache.fury.util.record.RecordComponent; +import org.apache.fury.util.record.RecordUtils; import java.lang.invoke.MethodHandle; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/java/fury-core/src/main/java/io/fury/builder/CodecUtils.java b/java/fury-core/src/main/java/io/fury/builder/CodecUtils.java index 3a54a897fa..9eceb4415e 100644 --- a/java/fury-core/src/main/java/io/fury/builder/CodecUtils.java +++ b/java/fury-core/src/main/java/io/fury/builder/CodecUtils.java @@ -17,16 +17,16 @@ * under the License. */ -package io.fury.builder; +package org.apache.fury.builder; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.codegen.CodeGenerator; -import io.fury.codegen.CompileUnit; -import io.fury.resolver.FieldResolver; -import io.fury.serializer.Serializer; -import io.fury.type.ClassDef; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.codegen.CompileUnit; +import org.apache.fury.resolver.FieldResolver; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.type.ClassDef; +import org.apache.fury.util.Preconditions; import java.util.Collections; /** @@ -36,7 +36,7 @@ */ public class CodecUtils { - // TODO(chaokunyang) how to uninstall io.fury.codegen/builder classes for graalvm build time + // TODO(chaokunyang) how to uninstall org.apache.fury.codegen/builder classes for graalvm build time // maybe use a temporal URLClassLoader public static Class> loadOrGenObjectCodecClass( Class cls, Fury fury) { diff --git a/java/fury-core/src/main/java/io/fury/builder/CompatibleCodecBuilder.java b/java/fury-core/src/main/java/io/fury/builder/CompatibleCodecBuilder.java index 18554f2b83..33bab26d8f 100644 --- a/java/fury-core/src/main/java/io/fury/builder/CompatibleCodecBuilder.java +++ b/java/fury-core/src/main/java/io/fury/builder/CompatibleCodecBuilder.java @@ -17,59 +17,59 @@ * under the License. */ -package io.fury.builder; - -import static io.fury.codegen.Expression.Invoke.inlineInvoke; -import static io.fury.codegen.Expression.Reference.fieldRef; -import static io.fury.codegen.ExpressionUtils.cast; -import static io.fury.codegen.ExpressionUtils.eq; -import static io.fury.codegen.ExpressionUtils.lessThan; -import static io.fury.type.TypeUtils.OBJECT_ARRAY_TYPE; -import static io.fury.type.TypeUtils.OBJECT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_BOOLEAN_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_BYTE_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_INT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_LONG_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_VOID_TYPE; -import static io.fury.type.TypeUtils.getRawType; +package org.apache.fury.builder; + +import static org.apache.fury.codegen.Expression.Invoke.inlineInvoke; +import static org.apache.fury.codegen.Expression.Reference.fieldRef; +import static org.apache.fury.codegen.ExpressionUtils.cast; +import static org.apache.fury.codegen.ExpressionUtils.eq; +import static org.apache.fury.codegen.ExpressionUtils.lessThan; +import static org.apache.fury.type.TypeUtils.OBJECT_ARRAY_TYPE; +import static org.apache.fury.type.TypeUtils.OBJECT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_BOOLEAN_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_BYTE_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_INT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_LONG_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_VOID_TYPE; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.builder.Generated.GeneratedCompatibleSerializer; -import io.fury.codegen.CodegenContext; -import io.fury.codegen.Expression; -import io.fury.codegen.Expression.Assign; -import io.fury.codegen.Expression.AssignArrayElem; -import io.fury.codegen.Expression.BitAnd; -import io.fury.codegen.Expression.BitOr; -import io.fury.codegen.Expression.BitShift; -import io.fury.codegen.Expression.Cast; -import io.fury.codegen.Expression.Comparator; -import io.fury.codegen.Expression.If; -import io.fury.codegen.Expression.Invoke; -import io.fury.codegen.Expression.ListExpression; -import io.fury.codegen.Expression.Literal; -import io.fury.codegen.Expression.Reference; -import io.fury.codegen.Expression.Return; -import io.fury.codegen.Expression.StaticInvoke; -import io.fury.codegen.Expression.While; -import io.fury.codegen.ExpressionOptimizer; -import io.fury.codegen.ExpressionUtils; -import io.fury.collection.Tuple2; -import io.fury.resolver.ClassInfo; -import io.fury.resolver.ClassResolver; -import io.fury.resolver.FieldResolver; -import io.fury.resolver.FieldResolver.CollectionFieldInfo; -import io.fury.resolver.FieldResolver.FieldInfo; -import io.fury.resolver.FieldResolver.FieldTypes; -import io.fury.resolver.FieldResolver.MapFieldInfo; -import io.fury.serializer.CompatibleSerializer; -import io.fury.type.Descriptor; -import io.fury.type.TypeUtils; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.function.SerializableSupplier; -import io.fury.util.record.RecordUtils; +import org.apache.fury.Fury; +import org.apache.fury.builder.Generated.GeneratedCompatibleSerializer; +import org.apache.fury.codegen.CodegenContext; +import org.apache.fury.codegen.Expression; +import org.apache.fury.codegen.Expression.Assign; +import org.apache.fury.codegen.Expression.AssignArrayElem; +import org.apache.fury.codegen.Expression.BitAnd; +import org.apache.fury.codegen.Expression.BitOr; +import org.apache.fury.codegen.Expression.BitShift; +import org.apache.fury.codegen.Expression.Cast; +import org.apache.fury.codegen.Expression.Comparator; +import org.apache.fury.codegen.Expression.If; +import org.apache.fury.codegen.Expression.Invoke; +import org.apache.fury.codegen.Expression.ListExpression; +import org.apache.fury.codegen.Expression.Literal; +import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.codegen.Expression.Return; +import org.apache.fury.codegen.Expression.StaticInvoke; +import org.apache.fury.codegen.Expression.While; +import org.apache.fury.codegen.ExpressionOptimizer; +import org.apache.fury.codegen.ExpressionUtils; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.resolver.ClassInfo; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.FieldResolver; +import org.apache.fury.resolver.FieldResolver.CollectionFieldInfo; +import org.apache.fury.resolver.FieldResolver.FieldInfo; +import org.apache.fury.resolver.FieldResolver.FieldTypes; +import org.apache.fury.resolver.FieldResolver.MapFieldInfo; +import org.apache.fury.serializer.CompatibleSerializer; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.function.SerializableSupplier; +import org.apache.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/builder/Generated.java b/java/fury-core/src/main/java/io/fury/builder/Generated.java index 8767ab5101..c129dc5d3e 100644 --- a/java/fury-core/src/main/java/io/fury/builder/Generated.java +++ b/java/fury-core/src/main/java/io/fury/builder/Generated.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.builder; +package org.apache.fury.builder; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.CompatibleSerializerBase; -import io.fury.serializer.Serializer; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.CompatibleSerializerBase; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; import java.lang.reflect.Field; import java.util.HashMap; import java.util.Map; @@ -101,7 +101,7 @@ public GeneratedObjectSerializer(Fury fury, Class cls) { } } - /** Base class for all serializers with meta shared by {@link io.fury.type.ClassDef}. */ + /** Base class for all serializers with meta shared by {@link org.apache.fury.type.ClassDef}. */ abstract class GeneratedMetaSharedSerializer extends GeneratedSerializer implements Generated { public static final String SERIALIZER_FIELD_NAME = "serializer"; /** Will be set in generated constructor by {@link MetaSharedCodecBuilder}. */ diff --git a/java/fury-core/src/main/java/io/fury/builder/JITContext.java b/java/fury-core/src/main/java/io/fury/builder/JITContext.java index cbaf200bb0..d5fb54a850 100644 --- a/java/fury-core/src/main/java/io/fury/builder/JITContext.java +++ b/java/fury-core/src/main/java/io/fury/builder/JITContext.java @@ -17,18 +17,18 @@ * under the License. */ -package io.fury.builder; +package org.apache.fury.builder; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; -import io.fury.Fury; -import io.fury.annotation.Internal; -import io.fury.codegen.CodeGenerator; -import io.fury.config.Config; -import io.fury.util.Platform; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.annotation.Internal; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.config.Config; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/java/fury-core/src/main/java/io/fury/builder/MetaSharedCodecBuilder.java b/java/fury-core/src/main/java/io/fury/builder/MetaSharedCodecBuilder.java index b8518ede6b..b25ab360db 100644 --- a/java/fury-core/src/main/java/io/fury/builder/MetaSharedCodecBuilder.java +++ b/java/fury-core/src/main/java/io/fury/builder/MetaSharedCodecBuilder.java @@ -17,32 +17,32 @@ * under the License. */ -package io.fury.builder; +package org.apache.fury.builder; -import static io.fury.builder.Generated.GeneratedMetaSharedSerializer.SERIALIZER_FIELD_NAME; +import static org.apache.fury.builder.Generated.GeneratedMetaSharedSerializer.SERIALIZER_FIELD_NAME; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.builder.Generated.GeneratedMetaSharedSerializer; -import io.fury.codegen.CodeGenerator; -import io.fury.codegen.Expression; -import io.fury.codegen.Expression.Literal; -import io.fury.config.CompatibleMode; -import io.fury.config.FuryBuilder; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.CodegenSerializer; -import io.fury.serializer.MetaSharedSerializer; -import io.fury.serializer.ObjectSerializer; -import io.fury.serializer.Serializer; -import io.fury.serializer.Serializers; -import io.fury.type.ClassDef; -import io.fury.type.Descriptor; -import io.fury.type.DescriptorGrouper; -import io.fury.util.Preconditions; -import io.fury.util.StringUtils; -import io.fury.util.Utils; -import io.fury.util.record.RecordComponent; -import io.fury.util.record.RecordUtils; +import org.apache.fury.Fury; +import org.apache.fury.builder.Generated.GeneratedMetaSharedSerializer; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.codegen.Expression; +import org.apache.fury.codegen.Expression.Literal; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.CodegenSerializer; +import org.apache.fury.serializer.MetaSharedSerializer; +import org.apache.fury.serializer.ObjectSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.Serializers; +import org.apache.fury.type.ClassDef; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.DescriptorGrouper; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.StringUtils; +import org.apache.fury.util.Utils; +import org.apache.fury.util.record.RecordComponent; +import org.apache.fury.util.record.RecordUtils; import java.util.Collection; import java.util.SortedMap; diff --git a/java/fury-core/src/main/java/io/fury/builder/ObjectCodecBuilder.java b/java/fury-core/src/main/java/io/fury/builder/ObjectCodecBuilder.java index 7b42cad461..a6fa4648ef 100644 --- a/java/fury-core/src/main/java/io/fury/builder/ObjectCodecBuilder.java +++ b/java/fury-core/src/main/java/io/fury/builder/ObjectCodecBuilder.java @@ -17,45 +17,45 @@ * under the License. */ -package io.fury.builder; - -import static io.fury.codegen.Code.LiteralValue.FalseLiteral; -import static io.fury.codegen.Expression.Invoke.inlineInvoke; -import static io.fury.codegen.ExpressionUtils.add; -import static io.fury.type.TypeUtils.OBJECT_ARRAY_TYPE; -import static io.fury.type.TypeUtils.OBJECT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_BYTE_ARRAY_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_INT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_LONG_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_VOID_TYPE; -import static io.fury.type.TypeUtils.getRawType; -import static io.fury.type.TypeUtils.getSizeOfPrimitiveType; -import static io.fury.type.TypeUtils.isPrimitive; +package org.apache.fury.builder; + +import static org.apache.fury.codegen.Code.LiteralValue.FalseLiteral; +import static org.apache.fury.codegen.Expression.Invoke.inlineInvoke; +import static org.apache.fury.codegen.ExpressionUtils.add; +import static org.apache.fury.type.TypeUtils.OBJECT_ARRAY_TYPE; +import static org.apache.fury.type.TypeUtils.OBJECT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_BYTE_ARRAY_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_INT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_LONG_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_VOID_TYPE; +import static org.apache.fury.type.TypeUtils.getRawType; +import static org.apache.fury.type.TypeUtils.getSizeOfPrimitiveType; +import static org.apache.fury.type.TypeUtils.isPrimitive; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.codegen.Code; -import io.fury.codegen.CodegenContext; -import io.fury.codegen.Expression; -import io.fury.codegen.Expression.Inlineable; -import io.fury.codegen.Expression.Invoke; -import io.fury.codegen.Expression.ListExpression; -import io.fury.codegen.Expression.Literal; -import io.fury.codegen.Expression.NewInstance; -import io.fury.codegen.Expression.Reference; -import io.fury.codegen.Expression.ReplaceStub; -import io.fury.codegen.Expression.StaticInvoke; -import io.fury.codegen.ExpressionVisitor; -import io.fury.serializer.ObjectSerializer; -import io.fury.serializer.PrimitiveSerializers.LongSerializer; -import io.fury.type.Descriptor; -import io.fury.type.DescriptorGrouper; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.function.SerializableSupplier; -import io.fury.util.record.RecordUtils; +import org.apache.fury.Fury; +import org.apache.fury.codegen.Code; +import org.apache.fury.codegen.CodegenContext; +import org.apache.fury.codegen.Expression; +import org.apache.fury.codegen.Expression.Inlineable; +import org.apache.fury.codegen.Expression.Invoke; +import org.apache.fury.codegen.Expression.ListExpression; +import org.apache.fury.codegen.Expression.Literal; +import org.apache.fury.codegen.Expression.NewInstance; +import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.codegen.Expression.ReplaceStub; +import org.apache.fury.codegen.Expression.StaticInvoke; +import org.apache.fury.codegen.ExpressionVisitor; +import org.apache.fury.serializer.ObjectSerializer; +import org.apache.fury.serializer.PrimitiveSerializers.LongSerializer; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.DescriptorGrouper; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.function.SerializableSupplier; +import org.apache.fury.util.record.RecordUtils; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/java/fury-core/src/main/java/io/fury/builder/ObjectCodecOptimizer.java b/java/fury-core/src/main/java/io/fury/builder/ObjectCodecOptimizer.java index f383bf8bfe..f8114c0e34 100644 --- a/java/fury-core/src/main/java/io/fury/builder/ObjectCodecOptimizer.java +++ b/java/fury-core/src/main/java/io/fury/builder/ObjectCodecOptimizer.java @@ -17,16 +17,16 @@ * under the License. */ -package io.fury.builder; +package org.apache.fury.builder; -import io.fury.annotation.Internal; -import io.fury.codegen.CodegenContext; -import io.fury.codegen.Expression; -import io.fury.codegen.ExpressionOptimizer; -import io.fury.collection.Tuple3; -import io.fury.type.Descriptor; -import io.fury.type.DescriptorGrouper; -import io.fury.util.function.SerializableSupplier; +import org.apache.fury.annotation.Internal; +import org.apache.fury.codegen.CodegenContext; +import org.apache.fury.codegen.Expression; +import org.apache.fury.codegen.ExpressionOptimizer; +import org.apache.fury.collection.Tuple3; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.DescriptorGrouper; +import org.apache.fury.util.function.SerializableSupplier; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/java/fury-core/src/main/java/io/fury/builder/package-info.java b/java/fury-core/src/main/java/io/fury/builder/package-info.java index 0e96f69bc5..d3c10a6892 100644 --- a/java/fury-core/src/main/java/io/fury/builder/package-info.java +++ b/java/fury-core/src/main/java/io/fury/builder/package-info.java @@ -18,4 +18,4 @@ */ /** encoder package is used for codegen based serialization. */ -package io.fury.builder; +package org.apache.fury.builder; diff --git a/java/fury-core/src/main/java/io/fury/codegen/ClosureVisitable.java b/java/fury-core/src/main/java/io/fury/codegen/ClosureVisitable.java index 3bf7634c67..0bcc6ee609 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/ClosureVisitable.java +++ b/java/fury-core/src/main/java/io/fury/codegen/ClosureVisitable.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/java/fury-core/src/main/java/io/fury/codegen/Code.java b/java/fury-core/src/main/java/io/fury/codegen/Code.java index 69af87b7ff..8b4ff7429c 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/Code.java +++ b/java/fury-core/src/main/java/io/fury/codegen/Code.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; -import static io.fury.codegen.Code.LiteralValue.FalseLiteral; -import static io.fury.codegen.Code.LiteralValue.TrueLiteral; +import static org.apache.fury.codegen.Code.LiteralValue.FalseLiteral; +import static org.apache.fury.codegen.Code.LiteralValue.TrueLiteral; import java.util.Objects; diff --git a/java/fury-core/src/main/java/io/fury/codegen/CodeFormatter.java b/java/fury-core/src/main/java/io/fury/codegen/CodeFormatter.java index fd39d4a3fe..d018034213 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/CodeFormatter.java +++ b/java/fury-core/src/main/java/io/fury/codegen/CodeFormatter.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; /** * Code formatter to format generated code for better readbility. diff --git a/java/fury-core/src/main/java/io/fury/codegen/CodeGenerator.java b/java/fury-core/src/main/java/io/fury/codegen/CodeGenerator.java index bbd4d51db4..0091b2e813 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/CodeGenerator.java +++ b/java/fury-core/src/main/java/io/fury/codegen/CodeGenerator.java @@ -17,23 +17,23 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import io.fury.builder.AccessorHelper; -import io.fury.builder.Generated; -import io.fury.collection.Collections; -import io.fury.collection.MultiKeyWeakMap; -import io.fury.util.ClassLoaderUtils; -import io.fury.util.ClassLoaderUtils.ByteArrayClassLoader; -import io.fury.util.GraalvmSupport; -import io.fury.util.LoggerFactory; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.StringUtils; +import org.apache.fury.builder.AccessorHelper; +import org.apache.fury.builder.Generated; +import org.apache.fury.collection.Collections; +import org.apache.fury.collection.MultiKeyWeakMap; +import org.apache.fury.util.ClassLoaderUtils; +import org.apache.fury.util.ClassLoaderUtils.ByteArrayClassLoader; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; import java.lang.ref.SoftReference; import java.util.ArrayList; import java.util.Arrays; diff --git a/java/fury-core/src/main/java/io/fury/codegen/CodegenContext.java b/java/fury-core/src/main/java/io/fury/codegen/CodegenContext.java index bb4bf424bc..37a3487e77 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/CodegenContext.java +++ b/java/fury-core/src/main/java/io/fury/codegen/CodegenContext.java @@ -17,23 +17,23 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; -import static io.fury.codegen.Code.ExprCode; -import static io.fury.codegen.CodeGenerator.alignIndent; -import static io.fury.codegen.CodeGenerator.indent; -import static io.fury.type.TypeUtils.getArrayType; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.codegen.Code.ExprCode; +import static org.apache.fury.codegen.CodeGenerator.alignIndent; +import static org.apache.fury.codegen.CodeGenerator.indent; +import static org.apache.fury.type.TypeUtils.getArrayType; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.collect.ImmutableSet; import com.google.common.reflect.TypeToken; -import io.fury.codegen.Expression.BaseInvoke; -import io.fury.codegen.Expression.Reference; -import io.fury.collection.Collections; -import io.fury.collection.Tuple2; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.StringUtils; +import org.apache.fury.codegen.Expression.BaseInvoke; +import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.collection.Collections; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/java/fury-core/src/main/java/io/fury/codegen/CodegenException.java b/java/fury-core/src/main/java/io/fury/codegen/CodegenException.java index 4b29f0cae7..5ad33fdcd7 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/CodegenException.java +++ b/java/fury-core/src/main/java/io/fury/codegen/CodegenException.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; /** * An exception to indicate codegen got wrong. diff --git a/java/fury-core/src/main/java/io/fury/codegen/CompileCallback.java b/java/fury-core/src/main/java/io/fury/codegen/CompileCallback.java index ed53e14024..c524a3ba1f 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/CompileCallback.java +++ b/java/fury-core/src/main/java/io/fury/codegen/CompileCallback.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; /** * Compile callback to be invoked just before compilation happen. This can be used to set up diff --git a/java/fury-core/src/main/java/io/fury/codegen/CompileState.java b/java/fury-core/src/main/java/io/fury/codegen/CompileState.java index 5073ae2940..2737c04336 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/CompileState.java +++ b/java/fury-core/src/main/java/io/fury/codegen/CompileState.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; import java.util.Map; import java.util.concurrent.locks.Lock; diff --git a/java/fury-core/src/main/java/io/fury/codegen/CompileUnit.java b/java/fury-core/src/main/java/io/fury/codegen/CompileUnit.java index 55d7c82c89..40dddcf888 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/CompileUnit.java +++ b/java/fury-core/src/main/java/io/fury/codegen/CompileUnit.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; -import io.fury.util.LoggerFactory; -import io.fury.util.Preconditions; -import io.fury.util.StringUtils; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.StringUtils; import java.util.function.Supplier; import org.slf4j.Logger; diff --git a/java/fury-core/src/main/java/io/fury/codegen/ExprState.java b/java/fury-core/src/main/java/io/fury/codegen/ExprState.java index 1b51e72d6b..38aa7e4eae 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/ExprState.java +++ b/java/fury-core/src/main/java/io/fury/codegen/ExprState.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; -import io.fury.codegen.Code.ExprCode; +import org.apache.fury.codegen.Code.ExprCode; /** * State for {@link Expression} when being compiling. diff --git a/java/fury-core/src/main/java/io/fury/codegen/Expression.java b/java/fury-core/src/main/java/io/fury/codegen/Expression.java index 73fd6b6063..2357aba863 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/Expression.java +++ b/java/fury-core/src/main/java/io/fury/codegen/Expression.java @@ -17,47 +17,47 @@ * under the License. */ -package io.fury.codegen; - -import static io.fury.codegen.Code.ExprCode; -import static io.fury.codegen.Code.LiteralValue; -import static io.fury.codegen.Code.LiteralValue.FalseLiteral; -import static io.fury.codegen.Code.LiteralValue.TrueLiteral; -import static io.fury.codegen.CodeGenerator.alignIndent; -import static io.fury.codegen.CodeGenerator.appendNewlineIfNeeded; -import static io.fury.codegen.CodeGenerator.indent; -import static io.fury.type.TypeUtils.BOOLEAN_TYPE; -import static io.fury.type.TypeUtils.CLASS_TYPE; -import static io.fury.type.TypeUtils.ITERABLE_TYPE; -import static io.fury.type.TypeUtils.OBJECT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_BOOLEAN_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_BYTE_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_INT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_LONG_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_SHORT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_VOID_TYPE; -import static io.fury.type.TypeUtils.STRING_TYPE; -import static io.fury.type.TypeUtils.boxedType; -import static io.fury.type.TypeUtils.defaultValue; -import static io.fury.type.TypeUtils.getArrayType; -import static io.fury.type.TypeUtils.getElementType; -import static io.fury.type.TypeUtils.getRawType; -import static io.fury.type.TypeUtils.getSizeOfPrimitiveType; -import static io.fury.type.TypeUtils.isPrimitive; -import static io.fury.type.TypeUtils.maxType; -import static io.fury.util.Preconditions.checkArgument; +package org.apache.fury.codegen; + +import static org.apache.fury.codegen.Code.ExprCode; +import static org.apache.fury.codegen.Code.LiteralValue; +import static org.apache.fury.codegen.Code.LiteralValue.FalseLiteral; +import static org.apache.fury.codegen.Code.LiteralValue.TrueLiteral; +import static org.apache.fury.codegen.CodeGenerator.alignIndent; +import static org.apache.fury.codegen.CodeGenerator.appendNewlineIfNeeded; +import static org.apache.fury.codegen.CodeGenerator.indent; +import static org.apache.fury.type.TypeUtils.BOOLEAN_TYPE; +import static org.apache.fury.type.TypeUtils.CLASS_TYPE; +import static org.apache.fury.type.TypeUtils.ITERABLE_TYPE; +import static org.apache.fury.type.TypeUtils.OBJECT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_BOOLEAN_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_BYTE_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_INT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_LONG_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_SHORT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_VOID_TYPE; +import static org.apache.fury.type.TypeUtils.STRING_TYPE; +import static org.apache.fury.type.TypeUtils.boxedType; +import static org.apache.fury.type.TypeUtils.defaultValue; +import static org.apache.fury.type.TypeUtils.getArrayType; +import static org.apache.fury.type.TypeUtils.getElementType; +import static org.apache.fury.type.TypeUtils.getRawType; +import static org.apache.fury.type.TypeUtils.getSizeOfPrimitiveType; +import static org.apache.fury.type.TypeUtils.isPrimitive; +import static org.apache.fury.type.TypeUtils.maxType; +import static org.apache.fury.util.Preconditions.checkArgument; import com.google.common.reflect.TypeToken; -import io.fury.type.TypeUtils; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.StringUtils; -import io.fury.util.function.Functions; -import io.fury.util.function.SerializableBiFunction; -import io.fury.util.function.SerializableFunction; -import io.fury.util.function.SerializableSupplier; -import io.fury.util.function.SerializableTriFunction; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; +import org.apache.fury.util.function.Functions; +import org.apache.fury.util.function.SerializableBiFunction; +import org.apache.fury.util.function.SerializableFunction; +import org.apache.fury.util.function.SerializableSupplier; +import org.apache.fury.util.function.SerializableTriFunction; import java.lang.reflect.Array; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/java/fury-core/src/main/java/io/fury/codegen/ExpressionOptimizer.java b/java/fury-core/src/main/java/io/fury/codegen/ExpressionOptimizer.java index 418dfa2e92..3f449c681f 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/ExpressionOptimizer.java +++ b/java/fury-core/src/main/java/io/fury/codegen/ExpressionOptimizer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; -import static io.fury.type.TypeUtils.PRIMITIVE_VOID_TYPE; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_VOID_TYPE; +import static org.apache.fury.type.TypeUtils.getRawType; -import io.fury.codegen.Expression.Reference; -import io.fury.util.Preconditions; -import io.fury.util.function.SerializableSupplier; +import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.function.SerializableSupplier; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedHashMap; @@ -35,7 +35,7 @@ /** * Optimizer to generate expression logic in a new method and return an {@link - * io.fury.codegen.Expression} to invoke the new generated method. + * org.apache.fury.codegen.Expression} to invoke the new generated method. * * @author chaokunyang */ diff --git a/java/fury-core/src/main/java/io/fury/codegen/ExpressionUtils.java b/java/fury-core/src/main/java/io/fury/codegen/ExpressionUtils.java index b2d6395f53..31f182eccb 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/ExpressionUtils.java +++ b/java/fury-core/src/main/java/io/fury/codegen/ExpressionUtils.java @@ -17,23 +17,23 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; -import static io.fury.codegen.Expression.Arithmetic; -import static io.fury.codegen.Expression.Comparator; -import static io.fury.codegen.Expression.IsNull; -import static io.fury.codegen.Expression.Literal; -import static io.fury.codegen.Expression.NewArray; -import static io.fury.codegen.Expression.Not; -import static io.fury.codegen.Expression.StaticInvoke; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.codegen.Expression.Arithmetic; +import static org.apache.fury.codegen.Expression.Comparator; +import static org.apache.fury.codegen.Expression.IsNull; +import static org.apache.fury.codegen.Expression.Literal; +import static org.apache.fury.codegen.Expression.NewArray; +import static org.apache.fury.codegen.Expression.Not; +import static org.apache.fury.codegen.Expression.StaticInvoke; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import io.fury.codegen.Expression.Cast; -import io.fury.codegen.Expression.Null; -import io.fury.util.Preconditions; -import io.fury.util.StringUtils; -import io.fury.util.function.Functions; +import org.apache.fury.codegen.Expression.Cast; +import org.apache.fury.codegen.Expression.Null; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.StringUtils; +import org.apache.fury.util.function.Functions; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; diff --git a/java/fury-core/src/main/java/io/fury/codegen/ExpressionVisitor.java b/java/fury-core/src/main/java/io/fury/codegen/ExpressionVisitor.java index 396c8493d3..0ba0a703b5 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/ExpressionVisitor.java +++ b/java/fury-core/src/main/java/io/fury/codegen/ExpressionVisitor.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; import com.google.common.reflect.TypeToken; -import io.fury.codegen.Expression.ListExpression; -import io.fury.codegen.Expression.Reference; -import io.fury.type.TypeUtils; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; +import org.apache.fury.codegen.Expression.ListExpression; +import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; import java.io.Serializable; import java.lang.invoke.SerializedLambda; import java.lang.reflect.Field; diff --git a/java/fury-core/src/main/java/io/fury/codegen/FieldInfo.java b/java/fury-core/src/main/java/io/fury/codegen/FieldInfo.java index 059a1d3bae..5e71fe7e23 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/FieldInfo.java +++ b/java/fury-core/src/main/java/io/fury/codegen/FieldInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; /** * A class to hold generated class fields into for code generation. diff --git a/java/fury-core/src/main/java/io/fury/codegen/JaninoUtils.java b/java/fury-core/src/main/java/io/fury/codegen/JaninoUtils.java index 00d3879732..fa23fc05b9 100644 --- a/java/fury-core/src/main/java/io/fury/codegen/JaninoUtils.java +++ b/java/fury-core/src/main/java/io/fury/codegen/JaninoUtils.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; -import io.fury.collection.Tuple2; -import io.fury.util.LoggerFactory; -import io.fury.util.ReflectionUtils; -import io.fury.util.StringUtils; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/java/fury-core/src/main/java/io/fury/collection/Collections.java b/java/fury-core/src/main/java/io/fury/collection/Collections.java index 6f30328de3..a24fb8e917 100644 --- a/java/fury-core/src/main/java/io/fury/collection/Collections.java +++ b/java/fury-core/src/main/java/io/fury/collection/Collections.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; -import static io.fury.util.unsafe._Collections.setArrayListElements; +import static org.apache.fury.util.unsafe._Collections.setArrayListElements; import java.util.ArrayList; import java.util.Collection; diff --git a/java/fury-core/src/main/java/io/fury/collection/FuryObjectMap.java b/java/fury-core/src/main/java/io/fury/collection/FuryObjectMap.java index a78545e7d0..215c7dba40 100644 --- a/java/fury-core/src/main/java/io/fury/collection/FuryObjectMap.java +++ b/java/fury-core/src/main/java/io/fury/collection/FuryObjectMap.java @@ -17,9 +17,9 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.collection; +package org.apache.fury.collection; -import io.fury.util.Preconditions; +import org.apache.fury.util.Preconditions; import java.util.Iterator; import java.util.Map; import java.util.Objects; diff --git a/java/fury-core/src/main/java/io/fury/collection/IdentityMap.java b/java/fury-core/src/main/java/io/fury/collection/IdentityMap.java index a1ed76f216..b761e950c8 100644 --- a/java/fury-core/src/main/java/io/fury/collection/IdentityMap.java +++ b/java/fury-core/src/main/java/io/fury/collection/IdentityMap.java @@ -17,7 +17,7 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.collection; +package org.apache.fury.collection; // Derived from // https://github.com/EsotericSoftware/kryo/blob/135df69526615bb3f6b34846e58ba3fec3b631c3/src/com/esotericsoftware/kryo/util/IdentityMap.java. diff --git a/java/fury-core/src/main/java/io/fury/collection/IdentityObjectIntMap.java b/java/fury-core/src/main/java/io/fury/collection/IdentityObjectIntMap.java index 658e15e921..39090bb1c2 100644 --- a/java/fury-core/src/main/java/io/fury/collection/IdentityObjectIntMap.java +++ b/java/fury-core/src/main/java/io/fury/collection/IdentityObjectIntMap.java @@ -17,7 +17,7 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.collection; +package org.apache.fury.collection; // Derived from // https://github.com/EsotericSoftware/kryo/blob/135df69526615bb3f6b34846e58ba3fec3b631c3/src/com/esotericsoftware/kryo/util/IdentityObjectIntMap.java. diff --git a/java/fury-core/src/main/java/io/fury/collection/IntArray.java b/java/fury-core/src/main/java/io/fury/collection/IntArray.java index 812f309d9e..01c2ef54ef 100644 --- a/java/fury-core/src/main/java/io/fury/collection/IntArray.java +++ b/java/fury-core/src/main/java/io/fury/collection/IntArray.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import java.util.Arrays; diff --git a/java/fury-core/src/main/java/io/fury/collection/LazyMap.java b/java/fury-core/src/main/java/io/fury/collection/LazyMap.java index b2c6859a13..f2f259ddbe 100644 --- a/java/fury-core/src/main/java/io/fury/collection/LazyMap.java +++ b/java/fury-core/src/main/java/io/fury/collection/LazyMap.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import com.google.common.collect.ForwardingMap; -import io.fury.util.Preconditions; +import org.apache.fury.util.Preconditions; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; diff --git a/java/fury-core/src/main/java/io/fury/collection/LongMap.java b/java/fury-core/src/main/java/io/fury/collection/LongMap.java index bef499ed2f..c799556608 100644 --- a/java/fury-core/src/main/java/io/fury/collection/LongMap.java +++ b/java/fury-core/src/main/java/io/fury/collection/LongMap.java @@ -17,7 +17,7 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.collection; +package org.apache.fury.collection; import java.util.Arrays; diff --git a/java/fury-core/src/main/java/io/fury/collection/MapEntry.java b/java/fury-core/src/main/java/io/fury/collection/MapEntry.java index 4494a0f3b5..22f530286f 100644 --- a/java/fury-core/src/main/java/io/fury/collection/MapEntry.java +++ b/java/fury-core/src/main/java/io/fury/collection/MapEntry.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import java.util.Map; diff --git a/java/fury-core/src/main/java/io/fury/collection/MapStatistics.java b/java/fury-core/src/main/java/io/fury/collection/MapStatistics.java index 0d455c2140..1063aa0f3e 100644 --- a/java/fury-core/src/main/java/io/fury/collection/MapStatistics.java +++ b/java/fury-core/src/main/java/io/fury/collection/MapStatistics.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; -import io.fury.annotation.Internal; +import org.apache.fury.annotation.Internal; /** * Profiling statistics for hash collision. diff --git a/java/fury-core/src/main/java/io/fury/collection/MultiKeyWeakMap.java b/java/fury-core/src/main/java/io/fury/collection/MultiKeyWeakMap.java index 5231290832..f08396f119 100644 --- a/java/fury-core/src/main/java/io/fury/collection/MultiKeyWeakMap.java +++ b/java/fury-core/src/main/java/io/fury/collection/MultiKeyWeakMap.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import com.google.common.base.FinalizableReferenceQueue; import com.google.common.base.FinalizableWeakReference; -import io.fury.util.GraalvmSupport; +import org.apache.fury.util.GraalvmSupport; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/java/fury-core/src/main/java/io/fury/collection/ObjectArray.java b/java/fury-core/src/main/java/io/fury/collection/ObjectArray.java index a4db12cf49..33a3d8cac2 100644 --- a/java/fury-core/src/main/java/io/fury/collection/ObjectArray.java +++ b/java/fury-core/src/main/java/io/fury/collection/ObjectArray.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import java.util.Arrays; diff --git a/java/fury-core/src/main/java/io/fury/collection/ObjectIntMap.java b/java/fury-core/src/main/java/io/fury/collection/ObjectIntMap.java index 0c1ec816c9..5c8ebab43c 100644 --- a/java/fury-core/src/main/java/io/fury/collection/ObjectIntMap.java +++ b/java/fury-core/src/main/java/io/fury/collection/ObjectIntMap.java @@ -17,7 +17,7 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.collection; +package org.apache.fury.collection; import java.util.HashMap; import java.util.Map; diff --git a/java/fury-core/src/main/java/io/fury/collection/ObjectMap.java b/java/fury-core/src/main/java/io/fury/collection/ObjectMap.java index 9f2c16d6d1..3dac9bbd94 100644 --- a/java/fury-core/src/main/java/io/fury/collection/ObjectMap.java +++ b/java/fury-core/src/main/java/io/fury/collection/ObjectMap.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; /** An unordered map which has better `get` performance than {@link java.util.HashMap}. */ public final class ObjectMap extends FuryObjectMap { diff --git a/java/fury-core/src/main/java/io/fury/collection/Tuple2.java b/java/fury-core/src/main/java/io/fury/collection/Tuple2.java index 3c57d2935b..2b200a3a8f 100644 --- a/java/fury-core/src/main/java/io/fury/collection/Tuple2.java +++ b/java/fury-core/src/main/java/io/fury/collection/Tuple2.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import java.io.Serializable; import java.util.Objects; diff --git a/java/fury-core/src/main/java/io/fury/collection/Tuple3.java b/java/fury-core/src/main/java/io/fury/collection/Tuple3.java index 10b82ef4c9..fc49641700 100644 --- a/java/fury-core/src/main/java/io/fury/collection/Tuple3.java +++ b/java/fury-core/src/main/java/io/fury/collection/Tuple3.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import java.io.Serializable; import java.util.Objects; diff --git a/java/fury-core/src/main/java/io/fury/config/CompatibleMode.java b/java/fury-core/src/main/java/io/fury/config/CompatibleMode.java index 8ba148d8f6..f703366f0a 100644 --- a/java/fury-core/src/main/java/io/fury/config/CompatibleMode.java +++ b/java/fury-core/src/main/java/io/fury/config/CompatibleMode.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.config; +package org.apache.fury.config; /** * Type forward/backward compatibility config. diff --git a/java/fury-core/src/main/java/io/fury/config/Config.java b/java/fury-core/src/main/java/io/fury/config/Config.java index 763c97330e..1216127024 100644 --- a/java/fury-core/src/main/java/io/fury/config/Config.java +++ b/java/fury-core/src/main/java/io/fury/config/Config.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.config; +package org.apache.fury.config; -import io.fury.Fury; -import io.fury.serializer.Serializer; -import io.fury.serializer.TimeSerializers; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.TimeSerializers; +import org.apache.fury.util.Preconditions; import java.io.Serializable; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; diff --git a/java/fury-core/src/main/java/io/fury/config/FuryBuilder.java b/java/fury-core/src/main/java/io/fury/config/FuryBuilder.java index 443b41b595..a5282cde76 100644 --- a/java/fury-core/src/main/java/io/fury/config/FuryBuilder.java +++ b/java/fury-core/src/main/java/io/fury/config/FuryBuilder.java @@ -17,21 +17,21 @@ * under the License. */ -package io.fury.config; - -import io.fury.Fury; -import io.fury.ThreadLocalFury; -import io.fury.ThreadSafeFury; -import io.fury.pool.ThreadPoolFury; -import io.fury.resolver.ClassResolver; -import io.fury.serializer.JavaSerializer; -import io.fury.serializer.ObjectStreamSerializer; -import io.fury.serializer.Serializer; -import io.fury.serializer.TimeSerializers; -import io.fury.serializer.collection.GuavaCollectionSerializers; -import io.fury.util.GraalvmSupport; -import io.fury.util.LoggerFactory; -import io.fury.util.Platform; +package org.apache.fury.config; + +import org.apache.fury.Fury; +import org.apache.fury.ThreadLocalFury; +import org.apache.fury.ThreadSafeFury; +import org.apache.fury.pool.ThreadPoolFury; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.serializer.JavaSerializer; +import org.apache.fury.serializer.ObjectStreamSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.TimeSerializers; +import org.apache.fury.serializer.collection.GuavaCollectionSerializers; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; import java.util.Objects; import java.util.concurrent.TimeUnit; import org.slf4j.Logger; @@ -161,7 +161,7 @@ public FuryBuilder withStringCompressed(boolean stringCompressed) { * the class meta data, if classloader can be updated, there may be class meta collision if * different classloaders have classes with same name. * - *

If you want to change classloader, please use {@link io.fury.util.LoaderBinding} or {@link + *

If you want to change classloader, please use {@link org.apache.fury.util.LoaderBinding} or {@link * ThreadSafeFury} to setup mapping between classloaders and fury instances. */ public FuryBuilder withClassLoader(ClassLoader classLoader) { @@ -212,7 +212,7 @@ public FuryBuilder registerGuavaTypes(boolean register) { * attack if the classes `constructor`/`equals`/`hashCode` method contain malicious code. Do not * disable class registration if you can't ensure your environment are *indeed secure*. We are not * responsible for security risks if you disable this option. If you disable this option, you can - * configure {@link io.fury.resolver.ClassChecker} by {@link ClassResolver#setClassChecker} to + * configure {@link org.apache.fury.resolver.ClassChecker} by {@link ClassResolver#setClassChecker} to * control which classes are allowed being serialized. */ public FuryBuilder requireClassRegistration(boolean requireClassRegistration) { diff --git a/java/fury-core/src/main/java/io/fury/config/Language.java b/java/fury-core/src/main/java/io/fury/config/Language.java index 34ee72bbad..4f4b2304e5 100644 --- a/java/fury-core/src/main/java/io/fury/config/Language.java +++ b/java/fury-core/src/main/java/io/fury/config/Language.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.config; +package org.apache.fury.config; /** * Language supported by fury. diff --git a/java/fury-core/src/main/java/io/fury/config/LongEncoding.java b/java/fury-core/src/main/java/io/fury/config/LongEncoding.java index 89c0b4171e..6f6b5168be 100644 --- a/java/fury-core/src/main/java/io/fury/config/LongEncoding.java +++ b/java/fury-core/src/main/java/io/fury/config/LongEncoding.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.config; +package org.apache.fury.config; /** * Encoding option for long. Default encoding is fury SLI(Small long as int) encoding: {@link #SLI}. diff --git a/java/fury-core/src/main/java/io/fury/exception/ClassNotCompatibleException.java b/java/fury-core/src/main/java/io/fury/exception/ClassNotCompatibleException.java index e1311f555c..a2e6e26873 100644 --- a/java/fury-core/src/main/java/io/fury/exception/ClassNotCompatibleException.java +++ b/java/fury-core/src/main/java/io/fury/exception/ClassNotCompatibleException.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.exception; +package org.apache.fury.exception; -import io.fury.config.CompatibleMode; +import org.apache.fury.config.CompatibleMode; /** * Exception for class compatibility. If {@link CompatibleMode#COMPATIBLE} is not enabled, and the diff --git a/java/fury-core/src/main/java/io/fury/exception/FuryException.java b/java/fury-core/src/main/java/io/fury/exception/FuryException.java index bb6415037a..69b8b9481e 100644 --- a/java/fury-core/src/main/java/io/fury/exception/FuryException.java +++ b/java/fury-core/src/main/java/io/fury/exception/FuryException.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.exception; +package org.apache.fury.exception; /** * Base class of all fury exceptions. diff --git a/java/fury-core/src/main/java/io/fury/exception/InsecureException.java b/java/fury-core/src/main/java/io/fury/exception/InsecureException.java index 2e9d07595e..10c78ab6bd 100644 --- a/java/fury-core/src/main/java/io/fury/exception/InsecureException.java +++ b/java/fury-core/src/main/java/io/fury/exception/InsecureException.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.exception; +package org.apache.fury.exception; /** * If class registration is enabled, and class of object which is being serialized is not diff --git a/java/fury-core/src/main/java/io/fury/io/ClassLoaderObjectInputStream.java b/java/fury-core/src/main/java/io/fury/io/ClassLoaderObjectInputStream.java index 2c99e5d49b..55a61582f1 100644 --- a/java/fury-core/src/main/java/io/fury/io/ClassLoaderObjectInputStream.java +++ b/java/fury-core/src/main/java/io/fury/io/ClassLoaderObjectInputStream.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.fury.io; +package org.apache.fury.io; import java.io.IOException; import java.io.InputStream; diff --git a/java/fury-core/src/main/java/io/fury/io/FuryInputStream.java b/java/fury-core/src/main/java/io/fury/io/FuryInputStream.java index 34e14cc1a9..d1a4875d7d 100644 --- a/java/fury-core/src/main/java/io/fury/io/FuryInputStream.java +++ b/java/fury-core/src/main/java/io/fury/io/FuryInputStream.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.io; +package org.apache.fury.io; -import io.fury.memory.MemoryBuffer; -import io.fury.util.Preconditions; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.Preconditions; import java.io.IOException; import java.io.InputStream; diff --git a/java/fury-core/src/main/java/io/fury/io/FuryObjectInput.java b/java/fury-core/src/main/java/io/fury/io/FuryObjectInput.java index 1995a12877..c9a0421491 100644 --- a/java/fury-core/src/main/java/io/fury/io/FuryObjectInput.java +++ b/java/fury-core/src/main/java/io/fury/io/FuryObjectInput.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.io; +package org.apache.fury.io; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.StringSerializer; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.StringSerializer; +import org.apache.fury.util.Preconditions; import java.io.IOException; import java.io.InputStream; import java.io.ObjectInput; diff --git a/java/fury-core/src/main/java/io/fury/io/FuryObjectOutput.java b/java/fury-core/src/main/java/io/fury/io/FuryObjectOutput.java index e5fb8b13b7..90a8c4537a 100644 --- a/java/fury-core/src/main/java/io/fury/io/FuryObjectOutput.java +++ b/java/fury-core/src/main/java/io/fury/io/FuryObjectOutput.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.io; +package org.apache.fury.io; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.StringSerializer; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.StringSerializer; +import org.apache.fury.util.Preconditions; import java.io.DataOutputStream; import java.io.IOException; import java.io.ObjectOutput; diff --git a/java/fury-core/src/main/java/io/fury/io/FuryOutputStream.java b/java/fury-core/src/main/java/io/fury/io/FuryOutputStream.java index 935a5d56de..b54ab2d305 100644 --- a/java/fury-core/src/main/java/io/fury/io/FuryOutputStream.java +++ b/java/fury-core/src/main/java/io/fury/io/FuryOutputStream.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.io; +package org.apache.fury.io; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryBuffer; import java.io.OutputStream; import java.nio.ByteBuffer; diff --git a/java/fury-core/src/main/java/io/fury/io/FuryReadableByteChannel.java b/java/fury-core/src/main/java/io/fury/io/FuryReadableByteChannel.java index 979cc7ecdc..65147abda1 100644 --- a/java/fury-core/src/main/java/io/fury/io/FuryReadableByteChannel.java +++ b/java/fury-core/src/main/java/io/fury/io/FuryReadableByteChannel.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.io; +package org.apache.fury.io; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryBuffer; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; diff --git a/java/fury-core/src/main/java/io/fury/io/FuryWritableByteChannel.java b/java/fury-core/src/main/java/io/fury/io/FuryWritableByteChannel.java index f13febcd09..01a0236439 100644 --- a/java/fury-core/src/main/java/io/fury/io/FuryWritableByteChannel.java +++ b/java/fury-core/src/main/java/io/fury/io/FuryWritableByteChannel.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.io; +package org.apache.fury.io; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryBuffer; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; diff --git a/java/fury-core/src/main/java/io/fury/io/MockOutputStream.java b/java/fury-core/src/main/java/io/fury/io/MockOutputStream.java index 6165c5efe7..87231780cb 100644 --- a/java/fury-core/src/main/java/io/fury/io/MockOutputStream.java +++ b/java/fury-core/src/main/java/io/fury/io/MockOutputStream.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.io; +package org.apache.fury.io; import java.io.OutputStream; import java.nio.ByteBuffer; diff --git a/java/fury-core/src/main/java/io/fury/io/MockWritableByteChannel.java b/java/fury-core/src/main/java/io/fury/io/MockWritableByteChannel.java index 2c5c7846ee..25500aa0e1 100644 --- a/java/fury-core/src/main/java/io/fury/io/MockWritableByteChannel.java +++ b/java/fury-core/src/main/java/io/fury/io/MockWritableByteChannel.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.io; +package org.apache.fury.io; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; diff --git a/java/fury-core/src/main/java/io/fury/memory/BitUtils.java b/java/fury-core/src/main/java/io/fury/memory/BitUtils.java index d684b0b75d..e29fee8a3a 100644 --- a/java/fury-core/src/main/java/io/fury/memory/BitUtils.java +++ b/java/fury-core/src/main/java/io/fury/memory/BitUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.memory; +package org.apache.fury.memory; /** * Util class for bits related operations. We assume that the bitmap data is word-aligned (that is, diff --git a/java/fury-core/src/main/java/io/fury/memory/BoundsChecking.java b/java/fury-core/src/main/java/io/fury/memory/BoundsChecking.java index e8c8bb417a..b1ac18c306 100644 --- a/java/fury-core/src/main/java/io/fury/memory/BoundsChecking.java +++ b/java/fury-core/src/main/java/io/fury/memory/BoundsChecking.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.memory; +package org.apache.fury.memory; /** * Util for check whether bounds checking should be turned on or off. diff --git a/java/fury-core/src/main/java/io/fury/memory/MemoryBuffer.java b/java/fury-core/src/main/java/io/fury/memory/MemoryBuffer.java index 3b1c4a7c40..726e17b527 100644 --- a/java/fury-core/src/main/java/io/fury/memory/MemoryBuffer.java +++ b/java/fury-core/src/main/java/io/fury/memory/MemoryBuffer.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package io.fury.memory; +package org.apache.fury.memory; -import static io.fury.util.Preconditions.checkArgument; +import static org.apache.fury.util.Preconditions.checkArgument; -import io.fury.annotation.CodegenInvoke; -import io.fury.util.Platform; -import io.fury.util.Preconditions; +import org.apache.fury.annotation.CodegenInvoke; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; import java.nio.BufferOverflowException; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; diff --git a/java/fury-core/src/main/java/io/fury/memory/MemoryUtils.java b/java/fury-core/src/main/java/io/fury/memory/MemoryUtils.java index 78cca92526..0e298edd9c 100644 --- a/java/fury-core/src/main/java/io/fury/memory/MemoryUtils.java +++ b/java/fury-core/src/main/java/io/fury/memory/MemoryUtils.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.memory; +package org.apache.fury.memory; -import io.fury.util.Platform; -import io.fury.util.Preconditions; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; diff --git a/java/fury-core/src/main/java/io/fury/pool/ClassLoaderFuryPooled.java b/java/fury-core/src/main/java/io/fury/pool/ClassLoaderFuryPooled.java index 44419ffea8..bdbb9b09f6 100644 --- a/java/fury-core/src/main/java/io/fury/pool/ClassLoaderFuryPooled.java +++ b/java/fury-core/src/main/java/io/fury/pool/ClassLoaderFuryPooled.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.pool; +package org.apache.fury.pool; -import io.fury.Fury; -import io.fury.util.LoggerFactory; +import org.apache.fury.Fury; +import org.apache.fury.util.LoggerFactory; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicInteger; diff --git a/java/fury-core/src/main/java/io/fury/pool/FuryPooledObjectFactory.java b/java/fury-core/src/main/java/io/fury/pool/FuryPooledObjectFactory.java index a1f54401e2..015dc1e7a1 100644 --- a/java/fury-core/src/main/java/io/fury/pool/FuryPooledObjectFactory.java +++ b/java/fury-core/src/main/java/io/fury/pool/FuryPooledObjectFactory.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.pool; +package org.apache.fury.pool; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import io.fury.Fury; -import io.fury.util.LoaderBinding; -import io.fury.util.LoggerFactory; +import org.apache.fury.Fury; +import org.apache.fury.util.LoaderBinding; +import org.apache.fury.util.LoggerFactory; import java.util.concurrent.TimeUnit; import java.util.function.Function; import org.slf4j.Logger; diff --git a/java/fury-core/src/main/java/io/fury/pool/ThreadPoolFury.java b/java/fury-core/src/main/java/io/fury/pool/ThreadPoolFury.java index 181e05f392..9a96085b23 100644 --- a/java/fury-core/src/main/java/io/fury/pool/ThreadPoolFury.java +++ b/java/fury-core/src/main/java/io/fury/pool/ThreadPoolFury.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.pool; +package org.apache.fury.pool; -import io.fury.Fury; -import io.fury.ThreadSafeFury; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.util.LoaderBinding; +import org.apache.fury.Fury; +import org.apache.fury.ThreadSafeFury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.util.LoaderBinding; import java.nio.ByteBuffer; import java.util.concurrent.TimeUnit; import java.util.function.Function; diff --git a/java/fury-core/src/main/java/io/fury/resolver/AllowListChecker.java b/java/fury-core/src/main/java/io/fury/resolver/AllowListChecker.java index 1b80fba0c8..68ee540c04 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/AllowListChecker.java +++ b/java/fury-core/src/main/java/io/fury/resolver/AllowListChecker.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import io.fury.Fury; -import io.fury.exception.InsecureException; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.Serializer; -import io.fury.util.LoggerFactory; +import org.apache.fury.Fury; +import org.apache.fury.exception.InsecureException; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.util.LoggerFactory; import java.util.Collection; import java.util.HashSet; import java.util.Set; diff --git a/java/fury-core/src/main/java/io/fury/resolver/BlackList.java b/java/fury-core/src/main/java/io/fury/resolver/BlackList.java index 258e0c581b..a7a6c27dfc 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/BlackList.java +++ b/java/fury-core/src/main/java/io/fury/resolver/BlackList.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; import java.io.BufferedReader; import java.io.IOException; diff --git a/java/fury-core/src/main/java/io/fury/resolver/ClassChecker.java b/java/fury-core/src/main/java/io/fury/resolver/ClassChecker.java index 62265e13ca..fad9ded07e 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/ClassChecker.java +++ b/java/fury-core/src/main/java/io/fury/resolver/ClassChecker.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; /** * Check whether class or objects of class should be serialized. If class checker will be invoked by diff --git a/java/fury-core/src/main/java/io/fury/resolver/ClassInfo.java b/java/fury-core/src/main/java/io/fury/resolver/ClassInfo.java index 7067b346a3..9af94aef82 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/ClassInfo.java +++ b/java/fury-core/src/main/java/io/fury/resolver/ClassInfo.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import io.fury.config.Language; -import io.fury.serializer.Serializer; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.function.Functions; +import org.apache.fury.config.Language; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.function.Functions; /** * This class put together object type related information to reduce array/map loop up when diff --git a/java/fury-core/src/main/java/io/fury/resolver/ClassInfoHolder.java b/java/fury-core/src/main/java/io/fury/resolver/ClassInfoHolder.java index 3c5aad02ba..3896cc3c98 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/ClassInfoHolder.java +++ b/java/fury-core/src/main/java/io/fury/resolver/ClassInfoHolder.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import io.fury.serializer.Serializer; +import org.apache.fury.serializer.Serializer; /** * A helper class for holding and update {@link ClassInfo} to reduce map look-up. diff --git a/java/fury-core/src/main/java/io/fury/resolver/ClassResolver.java b/java/fury-core/src/main/java/io/fury/resolver/ClassResolver.java index 9545dc7d79..c407fc292c 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/ClassResolver.java +++ b/java/fury-core/src/main/java/io/fury/resolver/ClassResolver.java @@ -17,85 +17,85 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import static io.fury.codegen.Expression.Invoke.inlineInvoke; -import static io.fury.codegen.ExpressionUtils.eq; -import static io.fury.serializer.CodegenSerializer.loadCodegenSerializer; -import static io.fury.serializer.CodegenSerializer.loadCompatibleCodegenSerializer; -import static io.fury.serializer.CodegenSerializer.supportCodegenForJavaSerialization; -import static io.fury.type.TypeUtils.OBJECT_TYPE; -import static io.fury.type.TypeUtils.PRIMITIVE_SHORT_TYPE; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.codegen.Expression.Invoke.inlineInvoke; +import static org.apache.fury.codegen.ExpressionUtils.eq; +import static org.apache.fury.serializer.CodegenSerializer.loadCodegenSerializer; +import static org.apache.fury.serializer.CodegenSerializer.loadCompatibleCodegenSerializer; +import static org.apache.fury.serializer.CodegenSerializer.supportCodegenForJavaSerialization; +import static org.apache.fury.type.TypeUtils.OBJECT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_SHORT_TYPE; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.annotation.CodegenInvoke; -import io.fury.annotation.Internal; -import io.fury.builder.CodecUtils; -import io.fury.builder.Generated; -import io.fury.builder.JITContext; -import io.fury.codegen.Expression; -import io.fury.codegen.Expression.Invoke; -import io.fury.codegen.Expression.Literal; -import io.fury.collection.IdentityMap; -import io.fury.collection.IdentityObjectIntMap; -import io.fury.collection.LongMap; -import io.fury.collection.ObjectMap; -import io.fury.collection.Tuple2; -import io.fury.config.CompatibleMode; -import io.fury.config.Language; -import io.fury.exception.InsecureException; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.ArraySerializers; -import io.fury.serializer.BufferSerializers; -import io.fury.serializer.CodegenSerializer.LazyInitBeanSerializer; -import io.fury.serializer.CompatibleSerializer; -import io.fury.serializer.ExternalizableSerializer; -import io.fury.serializer.JavaSerializer; -import io.fury.serializer.JdkProxySerializer; -import io.fury.serializer.LambdaSerializer; -import io.fury.serializer.LocaleSerializer; -import io.fury.serializer.MetaSharedSerializer; -import io.fury.serializer.ObjectSerializer; -import io.fury.serializer.OptionalSerializers; -import io.fury.serializer.PrimitiveSerializers; -import io.fury.serializer.ReplaceResolveSerializer; -import io.fury.serializer.Serializer; -import io.fury.serializer.SerializerFactory; -import io.fury.serializer.Serializers; -import io.fury.serializer.StringSerializer; -import io.fury.serializer.StructSerializer; -import io.fury.serializer.TimeSerializers; -import io.fury.serializer.UnexistedClassSerializers.UnexistedClassSerializer; -import io.fury.serializer.UnexistedClassSerializers.UnexistedMetaSharedClass; -import io.fury.serializer.UnexistedClassSerializers.UnexistedSkipClass; -import io.fury.serializer.collection.ChildContainerSerializers; -import io.fury.serializer.collection.CollectionSerializer; -import io.fury.serializer.collection.CollectionSerializers; -import io.fury.serializer.collection.GuavaCollectionSerializers; -import io.fury.serializer.collection.ImmutableCollectionSerializers; -import io.fury.serializer.collection.MapSerializer; -import io.fury.serializer.collection.MapSerializers; -import io.fury.serializer.collection.SynchronizedSerializers; -import io.fury.serializer.collection.UnmodifiableSerializers; -import io.fury.serializer.scala.SingletonCollectionSerializer; -import io.fury.serializer.scala.SingletonMapSerializer; -import io.fury.serializer.scala.SingletonObjectSerializer; -import io.fury.serializer.shim.ShimDispatcher; -import io.fury.type.ClassDef; -import io.fury.type.Descriptor; -import io.fury.type.GenericType; -import io.fury.type.ScalaTypes; -import io.fury.type.TypeUtils; -import io.fury.util.GraalvmSupport; -import io.fury.util.LoggerFactory; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.StringUtils; -import io.fury.util.function.Functions; +import org.apache.fury.Fury; +import org.apache.fury.annotation.CodegenInvoke; +import org.apache.fury.annotation.Internal; +import org.apache.fury.builder.CodecUtils; +import org.apache.fury.builder.Generated; +import org.apache.fury.builder.JITContext; +import org.apache.fury.codegen.Expression; +import org.apache.fury.codegen.Expression.Invoke; +import org.apache.fury.codegen.Expression.Literal; +import org.apache.fury.collection.IdentityMap; +import org.apache.fury.collection.IdentityObjectIntMap; +import org.apache.fury.collection.LongMap; +import org.apache.fury.collection.ObjectMap; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; +import org.apache.fury.exception.InsecureException; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.ArraySerializers; +import org.apache.fury.serializer.BufferSerializers; +import org.apache.fury.serializer.CodegenSerializer.LazyInitBeanSerializer; +import org.apache.fury.serializer.CompatibleSerializer; +import org.apache.fury.serializer.ExternalizableSerializer; +import org.apache.fury.serializer.JavaSerializer; +import org.apache.fury.serializer.JdkProxySerializer; +import org.apache.fury.serializer.LambdaSerializer; +import org.apache.fury.serializer.LocaleSerializer; +import org.apache.fury.serializer.MetaSharedSerializer; +import org.apache.fury.serializer.ObjectSerializer; +import org.apache.fury.serializer.OptionalSerializers; +import org.apache.fury.serializer.PrimitiveSerializers; +import org.apache.fury.serializer.ReplaceResolveSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.SerializerFactory; +import org.apache.fury.serializer.Serializers; +import org.apache.fury.serializer.StringSerializer; +import org.apache.fury.serializer.StructSerializer; +import org.apache.fury.serializer.TimeSerializers; +import org.apache.fury.serializer.UnexistedClassSerializers.UnexistedClassSerializer; +import org.apache.fury.serializer.UnexistedClassSerializers.UnexistedMetaSharedClass; +import org.apache.fury.serializer.UnexistedClassSerializers.UnexistedSkipClass; +import org.apache.fury.serializer.collection.ChildContainerSerializers; +import org.apache.fury.serializer.collection.CollectionSerializer; +import org.apache.fury.serializer.collection.CollectionSerializers; +import org.apache.fury.serializer.collection.GuavaCollectionSerializers; +import org.apache.fury.serializer.collection.ImmutableCollectionSerializers; +import org.apache.fury.serializer.collection.MapSerializer; +import org.apache.fury.serializer.collection.MapSerializers; +import org.apache.fury.serializer.collection.SynchronizedSerializers; +import org.apache.fury.serializer.collection.UnmodifiableSerializers; +import org.apache.fury.serializer.scala.SingletonCollectionSerializer; +import org.apache.fury.serializer.scala.SingletonMapSerializer; +import org.apache.fury.serializer.scala.SingletonObjectSerializer; +import org.apache.fury.serializer.shim.ShimDispatcher; +import org.apache.fury.type.ClassDef; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.GenericType; +import org.apache.fury.type.ScalaTypes; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; +import org.apache.fury.util.function.Functions; import java.io.Externalizable; import java.io.IOException; import java.io.Serializable; diff --git a/java/fury-core/src/main/java/io/fury/resolver/EnumStringBytes.java b/java/fury-core/src/main/java/io/fury/resolver/EnumStringBytes.java index 28ce8bb181..53862042b1 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/EnumStringBytes.java +++ b/java/fury-core/src/main/java/io/fury/resolver/EnumStringBytes.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import io.fury.annotation.Internal; -import io.fury.util.MurmurHash3; -import io.fury.util.Preconditions; +import org.apache.fury.annotation.Internal; +import org.apache.fury.util.MurmurHash3; +import org.apache.fury.util.Preconditions; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/java/fury-core/src/main/java/io/fury/resolver/EnumStringResolver.java b/java/fury-core/src/main/java/io/fury/resolver/EnumStringResolver.java index 52dbf2ce32..ee409dea98 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/EnumStringResolver.java +++ b/java/fury-core/src/main/java/io/fury/resolver/EnumStringResolver.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import io.fury.collection.LongMap; -import io.fury.collection.ObjectMap; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.collection.LongMap; +import org.apache.fury.collection.ObjectMap; +import org.apache.fury.memory.MemoryBuffer; import java.nio.charset.StandardCharsets; /** @@ -71,7 +71,7 @@ public void writeEnumString(MemoryBuffer buffer, String str) { public String readEnumString(MemoryBuffer buffer) { EnumStringBytes byteString = readEnumStringBytes(buffer); String str = enumStringBytes2StringMap.get(byteString); - if (str == null) { // TODO use io.fury.resolver.ObjectMap + if (str == null) { // TODO use org.apache.fury.resolver.ObjectMap str = new String(byteString.bytes, StandardCharsets.UTF_8); enumStringBytes2StringMap.put(byteString, str); } diff --git a/java/fury-core/src/main/java/io/fury/resolver/FieldResolver.java b/java/fury-core/src/main/java/io/fury/resolver/FieldResolver.java index 7ed7658d54..fd132d687b 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/FieldResolver.java +++ b/java/fury-core/src/main/java/io/fury/resolver/FieldResolver.java @@ -17,30 +17,30 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import static io.fury.resolver.ClassResolver.NO_CLASS_ID; -import static io.fury.resolver.ClassResolver.PRIMITIVE_LONG_CLASS_ID; -import static io.fury.resolver.FieldResolver.FieldInfoEncodingType.EMBED_TYPES_4; -import static io.fury.resolver.FieldResolver.FieldInfoEncodingType.EMBED_TYPES_9; -import static io.fury.resolver.FieldResolver.FieldInfoEncodingType.EMBED_TYPES_HASH; -import static io.fury.resolver.FieldResolver.FieldInfoEncodingType.SEPARATE_TYPES_HASH; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.resolver.ClassResolver.NO_CLASS_ID; +import static org.apache.fury.resolver.ClassResolver.PRIMITIVE_LONG_CLASS_ID; +import static org.apache.fury.resolver.FieldResolver.FieldInfoEncodingType.EMBED_TYPES_4; +import static org.apache.fury.resolver.FieldResolver.FieldInfoEncodingType.EMBED_TYPES_9; +import static org.apache.fury.resolver.FieldResolver.FieldInfoEncodingType.EMBED_TYPES_HASH; +import static org.apache.fury.resolver.FieldResolver.FieldInfoEncodingType.SEPARATE_TYPES_HASH; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.collection.Tuple2; -import io.fury.exception.ClassNotCompatibleException; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.PrimitiveSerializers; -import io.fury.serializer.collection.CollectionSerializer; -import io.fury.serializer.collection.MapSerializer; -import io.fury.type.Descriptor; -import io.fury.type.TypeUtils; -import io.fury.util.FieldAccessor; -import io.fury.util.MurmurHash3; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.exception.ClassNotCompatibleException; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.PrimitiveSerializers; +import org.apache.fury.serializer.collection.CollectionSerializer; +import org.apache.fury.serializer.collection.MapSerializer; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.FieldAccessor; +import org.apache.fury.util.MurmurHash3; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.nio.charset.StandardCharsets; @@ -102,7 +102,7 @@ * info is less than current field, then it will be a field not exists in current class and can be * skipped. * - * @see io.fury.serializer.CompatibleSerializerBase + * @see org.apache.fury.serializer.CompatibleSerializerBase * @author chaokunyang */ @SuppressWarnings({"rawtypes", "UnstableApiUsage"}) diff --git a/java/fury-core/src/main/java/io/fury/resolver/MapRefResolver.java b/java/fury-core/src/main/java/io/fury/resolver/MapRefResolver.java index 079e5c15b9..ba7aaf458d 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/MapRefResolver.java +++ b/java/fury-core/src/main/java/io/fury/resolver/MapRefResolver.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import io.fury.Fury; -import io.fury.collection.IdentityObjectIntMap; -import io.fury.collection.IntArray; -import io.fury.collection.MapStatistics; -import io.fury.collection.ObjectArray; -import io.fury.memory.MemoryBuffer; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.collection.IdentityObjectIntMap; +import org.apache.fury.collection.IntArray; +import org.apache.fury.collection.MapStatistics; +import org.apache.fury.collection.ObjectArray; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.Preconditions; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/java/fury-core/src/main/java/io/fury/resolver/MetaContext.java b/java/fury-core/src/main/java/io/fury/resolver/MetaContext.java index 9cddf4e3a6..98a3a27a35 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/MetaContext.java +++ b/java/fury-core/src/main/java/io/fury/resolver/MetaContext.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import io.fury.collection.IdentityObjectIntMap; -import io.fury.memory.MemoryBuffer; -import io.fury.type.ClassDef; +import org.apache.fury.collection.IdentityObjectIntMap; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.ClassDef; import java.util.ArrayList; import java.util.List; diff --git a/java/fury-core/src/main/java/io/fury/resolver/NoRefResolver.java b/java/fury-core/src/main/java/io/fury/resolver/NoRefResolver.java index 8157353678..7e8c7c8bd6 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/NoRefResolver.java +++ b/java/fury-core/src/main/java/io/fury/resolver/NoRefResolver.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; /** * A no-op resolver which ignore reference, only handle null/non-null. diff --git a/java/fury-core/src/main/java/io/fury/resolver/RefResolver.java b/java/fury-core/src/main/java/io/fury/resolver/RefResolver.java index 1dbec095a2..d3db07508d 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/RefResolver.java +++ b/java/fury-core/src/main/java/io/fury/resolver/RefResolver.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; /** * This class is used to track objects that have already been read or written. diff --git a/java/fury-core/src/main/java/io/fury/resolver/SerializationContext.java b/java/fury-core/src/main/java/io/fury/resolver/SerializationContext.java index 19c28117cd..97483da345 100644 --- a/java/fury-core/src/main/java/io/fury/resolver/SerializationContext.java +++ b/java/fury-core/src/main/java/io/fury/resolver/SerializationContext.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import io.fury.config.FuryBuilder; +import org.apache.fury.config.FuryBuilder; import java.util.IdentityHashMap; /** diff --git a/java/fury-core/src/main/java/io/fury/serializer/ArraySerializers.java b/java/fury-core/src/main/java/io/fury/serializer/ArraySerializers.java index 70e0a0f39a..96cb8ed337 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/ArraySerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/ArraySerializers.java @@ -17,21 +17,21 @@ * under the License. */ -package io.fury.serializer; - -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassInfo; -import io.fury.resolver.ClassInfoHolder; -import io.fury.resolver.ClassResolver; -import io.fury.resolver.RefResolver; -import io.fury.serializer.collection.ArrayAsList; -import io.fury.serializer.collection.CollectionFlags; -import io.fury.serializer.collection.FuryArrayAsListSerializer; -import io.fury.type.Type; -import io.fury.type.TypeUtils; -import io.fury.util.Platform; -import io.fury.util.Preconditions; +package org.apache.fury.serializer; + +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassInfo; +import org.apache.fury.resolver.ClassInfoHolder; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.RefResolver; +import org.apache.fury.serializer.collection.ArrayAsList; +import org.apache.fury.serializer.collection.CollectionFlags; +import org.apache.fury.serializer.collection.FuryArrayAsListSerializer; +import org.apache.fury.type.Type; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; import java.lang.reflect.Array; import java.lang.reflect.Modifier; import java.util.IdentityHashMap; diff --git a/java/fury-core/src/main/java/io/fury/serializer/BufferCallback.java b/java/fury-core/src/main/java/io/fury/serializer/BufferCallback.java index cfaefe81a2..0bf72e5166 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/BufferCallback.java +++ b/java/fury-core/src/main/java/io/fury/serializer/BufferCallback.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; /** * If the callback returns false, the given buffer is out-of-band; otherwise the buffer is diff --git a/java/fury-core/src/main/java/io/fury/serializer/BufferObject.java b/java/fury-core/src/main/java/io/fury/serializer/BufferObject.java index b8b9f63e80..fe97400578 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/BufferObject.java +++ b/java/fury-core/src/main/java/io/fury/serializer/BufferObject.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryBuffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/java/fury-core/src/main/java/io/fury/serializer/BufferSerializers.java b/java/fury-core/src/main/java/io/fury/serializer/BufferSerializers.java index 50da8f9124..7f8f26f067 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/BufferSerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/BufferSerializers.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.type.Type; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.Type; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/java/fury-core/src/main/java/io/fury/serializer/CodegenSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/CodegenSerializer.java index 24708a5de9..3e93f6f2ff 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/CodegenSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/CodegenSerializer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import static io.fury.util.Preconditions.checkArgument; +import static org.apache.fury.util.Preconditions.checkArgument; -import io.fury.Fury; -import io.fury.builder.CodecUtils; -import io.fury.builder.Generated; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.Fury; +import org.apache.fury.builder.CodecUtils; +import org.apache.fury.builder.Generated; +import org.apache.fury.memory.MemoryBuffer; import java.lang.reflect.Modifier; /** @@ -65,7 +65,7 @@ public static Class> loadCompatibleCodegenSerializer(Fury fury /** * A bean serializer which initializes lazily on first call read/write method. * - *

This class is used by {@link io.fury.builder.BaseObjectCodecBuilder} to avoid potential + *

This class is used by {@link org.apache.fury.builder.BaseObjectCodecBuilder} to avoid potential * recursive bean serializer creation when there is a circular reference in class children fields. */ public static final class LazyInitBeanSerializer extends Serializer { 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 ab3d2d461a..3c2df51ba4 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 @@ -17,22 +17,22 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassInfo; -import io.fury.resolver.ClassResolver; -import io.fury.resolver.FieldResolver; -import io.fury.resolver.RefResolver; -import io.fury.serializer.collection.CollectionSerializer; -import io.fury.serializer.collection.MapSerializer; -import io.fury.util.FieldAccessor; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.record.RecordInfo; -import io.fury.util.record.RecordUtils; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassInfo; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.FieldResolver; +import org.apache.fury.resolver.RefResolver; +import org.apache.fury.serializer.collection.CollectionSerializer; +import org.apache.fury.serializer.collection.MapSerializer; +import org.apache.fury.util.FieldAccessor; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.record.RecordInfo; +import org.apache.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/CompatibleSerializerBase.java b/java/fury-core/src/main/java/io/fury/serializer/CompatibleSerializerBase.java index 08bf7da4fe..b796786415 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/CompatibleSerializerBase.java +++ b/java/fury-core/src/main/java/io/fury/serializer/CompatibleSerializerBase.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; /** * Base class for compatible serializer. Both JIT mode serializer and interpreter-mode serializer diff --git a/java/fury-core/src/main/java/io/fury/serializer/ExternalizableSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/ExternalizableSerializer.java index 7cfaf542f5..51279c3ecc 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/ExternalizableSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/ExternalizableSerializer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.io.FuryObjectInput; -import io.fury.io.FuryObjectOutput; -import io.fury.memory.MemoryBuffer; -import io.fury.util.Platform; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.org.apache.furyObjectInput; +import org.apache.fury.org.apache.furyObjectOutput; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.Platform; +import org.apache.fury.util.ReflectionUtils; import java.io.Externalizable; import java.io.IOException; import java.lang.invoke.MethodHandle; diff --git a/java/fury-core/src/main/java/io/fury/serializer/ForwardSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/ForwardSerializer.java index 67c146b4e4..074deaf4e1 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/ForwardSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/ForwardSerializer.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.serializer; - -import io.fury.Fury; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.util.LoaderBinding; -import io.fury.util.LoaderBinding.StagingType; -import io.fury.util.Platform; +package org.apache.fury.serializer; + +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.util.LoaderBinding; +import org.apache.fury.util.LoaderBinding.StagingType; +import org.apache.fury.util.Platform; import java.nio.ByteBuffer; import java.util.Collections; import java.util.IdentityHashMap; diff --git a/java/fury-core/src/main/java/io/fury/serializer/JavaSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/JavaSerializer.java index 428ced1da5..dfdc52dd92 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/JavaSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/JavaSerializer.java @@ -17,16 +17,16 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.io.ClassLoaderObjectInputStream; -import io.fury.io.FuryObjectInput; -import io.fury.io.FuryObjectOutput; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassResolver; -import io.fury.util.LoggerFactory; -import io.fury.util.Platform; +import org.apache.fury.Fury; +import org.apache.fury.io.ClassLoaderObjectInputStream; +import org.apache.fury.org.apache.furyObjectInput; +import org.apache.fury.org.apache.furyObjectOutput; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/java/fury-core/src/main/java/io/fury/serializer/JdkProxySerializer.java b/java/fury-core/src/main/java/io/fury/serializer/JdkProxySerializer.java index b44efa259c..f857cd0e31 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/JdkProxySerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/JdkProxySerializer.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; diff --git a/java/fury-core/src/main/java/io/fury/serializer/LambdaSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/LambdaSerializer.java index 47776a1fb1..a4f96ac5c8 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/LambdaSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/LambdaSerializer.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; import java.io.ObjectStreamClass; import java.io.Serializable; import java.lang.invoke.SerializedLambda; diff --git a/java/fury-core/src/main/java/io/fury/serializer/LocaleSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/LocaleSerializer.java index 4cce68cdcb..8146152db7 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/LocaleSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/LocaleSerializer.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.collection.Tuple3; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.Fury; +import org.apache.fury.collection.Tuple3; +import org.apache.fury.memory.MemoryBuffer; import java.util.HashMap; import java.util.Locale; import java.util.Map; 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 617d663e5b..bfe40d6095 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 @@ -17,28 +17,28 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.builder.MetaSharedCodecBuilder; -import io.fury.collection.Tuple2; -import io.fury.collection.Tuple3; -import io.fury.config.CompatibleMode; -import io.fury.config.FuryBuilder; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassInfoHolder; -import io.fury.resolver.ClassResolver; -import io.fury.resolver.RefResolver; -import io.fury.type.ClassDef; -import io.fury.type.Descriptor; -import io.fury.type.DescriptorGrouper; -import io.fury.type.Generics; -import io.fury.util.FieldAccessor; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.record.RecordInfo; -import io.fury.util.record.RecordUtils; +import org.apache.fury.Fury; +import org.apache.fury.builder.MetaSharedCodecBuilder; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.collection.Tuple3; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassInfoHolder; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.RefResolver; +import org.apache.fury.type.ClassDef; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.DescriptorGrouper; +import org.apache.fury.type.Generics; +import org.apache.fury.util.FieldAccessor; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.record.RecordInfo; +import org.apache.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 2803041978..6f110a44fe 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 @@ -17,30 +17,30 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.collection.Tuple2; -import io.fury.collection.Tuple3; -import io.fury.exception.FuryException; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassInfo; -import io.fury.resolver.ClassInfoHolder; -import io.fury.resolver.ClassResolver; -import io.fury.resolver.RefResolver; -import io.fury.type.Descriptor; -import io.fury.type.DescriptorGrouper; -import io.fury.type.FinalObjectTypeStub; -import io.fury.type.GenericType; -import io.fury.type.Generics; -import io.fury.util.FieldAccessor; -import io.fury.util.Platform; -import io.fury.util.ReflectionUtils; -import io.fury.util.record.RecordInfo; -import io.fury.util.record.RecordUtils; +import org.apache.fury.Fury; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.collection.Tuple3; +import org.apache.fury.exception.FuryException; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassInfo; +import org.apache.fury.resolver.ClassInfoHolder; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.RefResolver; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.DescriptorGrouper; +import org.apache.fury.type.FinalObjectTypeStub; +import org.apache.fury.type.GenericType; +import org.apache.fury.type.Generics; +import org.apache.fury.util.FieldAccessor; +import org.apache.fury.util.Platform; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.record.RecordInfo; +import org.apache.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/serializer/ObjectStreamSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/ObjectStreamSerializer.java index a35016c091..b7e4789b3e 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/ObjectStreamSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/ObjectStreamSerializer.java @@ -17,24 +17,24 @@ * under the License. */ -package io.fury.serializer; - -import io.fury.Fury; -import io.fury.builder.CodecUtils; -import io.fury.builder.Generated; -import io.fury.collection.ObjectArray; -import io.fury.collection.ObjectIntMap; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassInfo; -import io.fury.resolver.ClassResolver; -import io.fury.resolver.FieldResolver; -import io.fury.resolver.FieldResolver.ClassField; -import io.fury.util.LoggerFactory; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.Utils; -import io.fury.util.unsafe._JDKAccess; +package org.apache.fury.serializer; + +import org.apache.fury.Fury; +import org.apache.fury.builder.CodecUtils; +import org.apache.fury.builder.Generated; +import org.apache.fury.collection.ObjectArray; +import org.apache.fury.collection.ObjectIntMap; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassInfo; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.FieldResolver; +import org.apache.fury.resolver.FieldResolver.ClassField; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.Utils; +import org.apache.fury.util.unsafe._JDKAccess; import java.io.Externalizable; import java.io.IOException; import java.io.InvalidObjectException; diff --git a/java/fury-core/src/main/java/io/fury/serializer/OpaqueObjects.java b/java/fury-core/src/main/java/io/fury/serializer/OpaqueObjects.java index f771d80f82..a2ffb1ccf9 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/OpaqueObjects.java +++ b/java/fury-core/src/main/java/io/fury/serializer/OpaqueObjects.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.config.Language; +import org.apache.fury.config.Language; /** * Stub objects for unsupported cross-language serializing type. diff --git a/java/fury-core/src/main/java/io/fury/serializer/OptionalSerializers.java b/java/fury-core/src/main/java/io/fury/serializer/OptionalSerializers.java index a1063b0da3..c6833aa332 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/OptionalSerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/OptionalSerializers.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; import java.util.Optional; import java.util.OptionalDouble; import java.util.OptionalInt; diff --git a/java/fury-core/src/main/java/io/fury/serializer/PrimitiveSerializers.java b/java/fury-core/src/main/java/io/fury/serializer/PrimitiveSerializers.java index 854789c9b4..0fda2bcbfe 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/PrimitiveSerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/PrimitiveSerializers.java @@ -17,17 +17,17 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import static io.fury.type.TypeUtils.PRIMITIVE_LONG_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_LONG_TYPE; -import io.fury.Fury; -import io.fury.codegen.Expression; -import io.fury.codegen.Expression.Invoke; -import io.fury.config.LongEncoding; -import io.fury.memory.MemoryBuffer; -import io.fury.type.Type; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.codegen.Expression; +import org.apache.fury.codegen.Expression.Invoke; +import org.apache.fury.config.LongEncoding; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.Type; +import org.apache.fury.util.Preconditions; /** * Serializers for java primitive types. diff --git a/java/fury-core/src/main/java/io/fury/serializer/ReplaceResolveSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/ReplaceResolveSerializer.java index 3badbc77d6..7db66180a1 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/ReplaceResolveSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/ReplaceResolveSerializer.java @@ -17,18 +17,18 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassInfo; -import io.fury.resolver.ClassResolver; -import io.fury.resolver.RefResolver; -import io.fury.util.LoggerFactory; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.unsafe._JDKAccess; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassInfo; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.RefResolver; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.unsafe._JDKAccess; import java.io.Externalizable; import java.io.ObjectStreamClass; import java.io.Serializable; diff --git a/java/fury-core/src/main/java/io/fury/serializer/Serializer.java b/java/fury-core/src/main/java/io/fury/serializer/Serializer.java index f7e1006ac0..953e31ffd1 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/Serializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/Serializer.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; -import io.fury.type.TypeUtils; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.TypeUtils; import javax.annotation.concurrent.NotThreadSafe; /** diff --git a/java/fury-core/src/main/java/io/fury/serializer/SerializerFactory.java b/java/fury-core/src/main/java/io/fury/serializer/SerializerFactory.java index 705d4fc4b1..65b70a927b 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/SerializerFactory.java +++ b/java/fury-core/src/main/java/io/fury/serializer/SerializerFactory.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; +import org.apache.fury.Fury; /** * Serializer factory for customizing serializer creation. diff --git a/java/fury-core/src/main/java/io/fury/serializer/Serializers.java b/java/fury-core/src/main/java/io/fury/serializer/Serializers.java index 4983959bf4..b9e5a8b65b 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/Serializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/Serializers.java @@ -17,24 +17,24 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import static io.fury.util.function.Functions.makeGetterFunction; +import static org.apache.fury.util.function.Functions.makeGetterFunction; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import io.fury.Fury; -import io.fury.collection.Tuple2; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassResolver; -import io.fury.type.Type; -import io.fury.type.TypeUtils; -import io.fury.util.GraalvmSupport; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.Utils; -import io.fury.util.unsafe._JDKAccess; +import org.apache.fury.Fury; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.type.Type; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.Utils; +import org.apache.fury.util.unsafe._JDKAccess; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; diff --git a/java/fury-core/src/main/java/io/fury/serializer/StringSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/StringSerializer.java index 2ac61f1dee..2c905c4893 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/StringSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/StringSerializer.java @@ -17,23 +17,23 @@ * under the License. */ -package io.fury.serializer; - -import static io.fury.type.TypeUtils.PRIMITIVE_CHAR_ARRAY_TYPE; -import static io.fury.type.TypeUtils.STRING_TYPE; - -import io.fury.Fury; -import io.fury.codegen.Expression; -import io.fury.codegen.Expression.Invoke; -import io.fury.codegen.Expression.StaticInvoke; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.type.Type; -import io.fury.util.MathUtils; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.unsafe._JDKAccess; +package org.apache.fury.serializer; + +import static org.apache.fury.type.TypeUtils.PRIMITIVE_CHAR_ARRAY_TYPE; +import static org.apache.fury.type.TypeUtils.STRING_TYPE; + +import org.apache.fury.Fury; +import org.apache.fury.codegen.Expression; +import org.apache.fury.codegen.Expression.Invoke; +import org.apache.fury.codegen.Expression.StaticInvoke; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.type.Type; +import org.apache.fury.util.MathUtils; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.unsafe._JDKAccess; import java.lang.invoke.CallSite; import java.lang.invoke.LambdaMetafactory; import java.lang.invoke.MethodHandle; diff --git a/java/fury-core/src/main/java/io/fury/serializer/StringUTF16.java b/java/fury-core/src/main/java/io/fury/serializer/StringUTF16.java index 6a117cee5d..e30541d351 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/StringUTF16.java +++ b/java/fury-core/src/main/java/io/fury/serializer/StringUTF16.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import java.nio.ByteOrder; diff --git a/java/fury-core/src/main/java/io/fury/serializer/StructSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/StructSerializer.java index 5d14a43511..3a81ef5230 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/StructSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/StructSerializer.java @@ -17,23 +17,23 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.config.Language; -import io.fury.exception.ClassNotCompatibleException; -import io.fury.memory.MemoryBuffer; -import io.fury.type.Descriptor; -import io.fury.type.GenericType; -import io.fury.type.Generics; -import io.fury.type.Type; -import io.fury.type.TypeUtils; -import io.fury.util.FieldAccessor; -import io.fury.util.LoggerFactory; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.Utils; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.exception.ClassNotCompatibleException; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.GenericType; +import org.apache.fury.type.Generics; +import org.apache.fury.type.Type; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.FieldAccessor; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.Utils; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/java/fury-core/src/main/java/io/fury/serializer/TimeSerializers.java b/java/fury-core/src/main/java/io/fury/serializer/TimeSerializers.java index a7d68553b0..631a528d3e 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/TimeSerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/TimeSerializers.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.type.Type; -import io.fury.util.DateTimeUtils; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.Type; +import org.apache.fury.util.DateTimeUtils; import java.sql.Time; import java.sql.Timestamp; import java.time.Duration; diff --git a/java/fury-core/src/main/java/io/fury/serializer/URLSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/URLSerializer.java index 2adade6a2b..9d8d0c4379 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/URLSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/URLSerializer.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.util.Platform; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.Platform; import java.net.MalformedURLException; import java.net.URL; diff --git a/java/fury-core/src/main/java/io/fury/serializer/UnexistedClassSerializers.java b/java/fury-core/src/main/java/io/fury/serializer/UnexistedClassSerializers.java index be373ac70c..38cba04cd4 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/UnexistedClassSerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/UnexistedClassSerializers.java @@ -17,28 +17,28 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.collection.IdentityObjectIntMap; -import io.fury.collection.LazyMap; -import io.fury.collection.LongMap; -import io.fury.collection.MapEntry; -import io.fury.collection.Tuple2; -import io.fury.collection.Tuple3; -import io.fury.config.CompatibleMode; -import io.fury.config.Config; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassInfo; -import io.fury.resolver.ClassInfoHolder; -import io.fury.resolver.ClassResolver; -import io.fury.resolver.MetaContext; -import io.fury.resolver.RefResolver; -import io.fury.type.ClassDef; -import io.fury.type.Descriptor; -import io.fury.type.DescriptorGrouper; -import io.fury.type.Generics; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.collection.IdentityObjectIntMap; +import org.apache.fury.collection.LazyMap; +import org.apache.fury.collection.LongMap; +import org.apache.fury.collection.MapEntry; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.collection.Tuple3; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Config; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassInfo; +import org.apache.fury.resolver.ClassInfoHolder; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.MetaContext; +import org.apache.fury.resolver.RefResolver; +import org.apache.fury.type.ClassDef; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.DescriptorGrouper; +import org.apache.fury.type.Generics; +import org.apache.fury.util.Preconditions; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/AbstractCollectionSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/collection/AbstractCollectionSerializer.java index d1a551d2ef..6fe241be07 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/AbstractCollectionSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/AbstractCollectionSerializer.java @@ -17,20 +17,20 @@ * under the License. */ -package io.fury.serializer.collection; - -import io.fury.Fury; -import io.fury.annotation.CodegenInvoke; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassInfo; -import io.fury.resolver.ClassInfoHolder; -import io.fury.resolver.ClassResolver; -import io.fury.resolver.RefResolver; -import io.fury.serializer.CompatibleSerializer; -import io.fury.serializer.Serializer; -import io.fury.type.GenericType; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; +package org.apache.fury.serializer.collection; + +import org.apache.fury.Fury; +import org.apache.fury.annotation.CodegenInvoke; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassInfo; +import org.apache.fury.resolver.ClassInfoHolder; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.RefResolver; +import org.apache.fury.serializer.CompatibleSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.type.GenericType; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; import java.lang.invoke.MethodHandle; import java.util.Collection; diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/AbstractMapSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/collection/AbstractMapSerializer.java index f7fefe1066..479f6f8f3d 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/AbstractMapSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/AbstractMapSerializer.java @@ -17,23 +17,23 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; -import static io.fury.type.TypeUtils.MAP_TYPE; +import static org.apache.fury.type.TypeUtils.MAP_TYPE; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.collection.IdentityMap; -import io.fury.collection.Tuple2; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassInfoHolder; -import io.fury.resolver.ClassResolver; -import io.fury.resolver.RefResolver; -import io.fury.serializer.Serializer; -import io.fury.type.GenericType; -import io.fury.type.Generics; -import io.fury.type.TypeUtils; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.collection.IdentityMap; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassInfoHolder; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.RefResolver; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.type.GenericType; +import org.apache.fury.type.Generics; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.ReflectionUtils; import java.lang.invoke.MethodHandle; import java.util.Map; diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/ArrayAsList.java b/java/fury-core/src/main/java/io/fury/serializer/collection/ArrayAsList.java index fd7eebccc1..996d8aaff6 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/ArrayAsList.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/ArrayAsList.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; -import io.fury.annotation.Internal; +import org.apache.fury.annotation.Internal; import java.util.AbstractList; import java.util.Iterator; import java.util.Objects; diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/ChildContainerSerializers.java b/java/fury-core/src/main/java/io/fury/serializer/collection/ChildContainerSerializers.java index 1ca14fd620..ffb96c7c61 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/ChildContainerSerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/ChildContainerSerializers.java @@ -17,20 +17,20 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; import com.google.common.collect.ImmutableSet; -import io.fury.Fury; -import io.fury.config.CompatibleMode; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassResolver; -import io.fury.resolver.FieldResolver; -import io.fury.serializer.CompatibleSerializer; -import io.fury.serializer.JavaSerializer; -import io.fury.serializer.ObjectSerializer; -import io.fury.serializer.Serializer; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.FieldResolver; +import org.apache.fury.serializer.CompatibleSerializer; +import org.apache.fury.serializer.JavaSerializer; +import org.apache.fury.serializer.ObjectSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collection; diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionFlags.java b/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionFlags.java index 7b32914c54..6d923cf12d 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionFlags.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionFlags.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; /** * Default unset bitmap flags. diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionSerializer.java index 81a0ab308b..26c2c895b2 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionSerializer.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; import java.util.Collection; /** diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionSerializers.java b/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionSerializers.java index 3014a87380..01c9250d93 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionSerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionSerializers.java @@ -17,20 +17,20 @@ * under the License. */ -package io.fury.serializer.collection; - -import io.fury.Fury; -import io.fury.config.Language; -import io.fury.exception.FuryException; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassResolver; -import io.fury.serializer.ReplaceResolveSerializer; -import io.fury.serializer.Serializer; -import io.fury.serializer.Serializers; -import io.fury.type.Type; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; +package org.apache.fury.serializer.collection; + +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.exception.FuryException; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.serializer.ReplaceResolveSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.Serializers; +import org.apache.fury.type.Type; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; import java.lang.invoke.MethodHandle; import java.lang.reflect.Field; import java.util.ArrayDeque; diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/Container.java b/java/fury-core/src/main/java/io/fury/serializer/collection/Container.java index 261dd66e93..8f8f22383e 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/Container.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/Container.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; import java.util.AbstractCollection; import java.util.AbstractMap; diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/FuryArrayAsListSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/collection/FuryArrayAsListSerializer.java index f1fb5e4a9c..f8773fc35e 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/FuryArrayAsListSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/FuryArrayAsListSerializer.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; -import io.fury.Fury; -import io.fury.annotation.Internal; -import io.fury.memory.MemoryBuffer; -import io.fury.type.Type; +import org.apache.fury.Fury; +import org.apache.fury.annotation.Internal; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.Type; import java.util.Collection; /** diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/GuavaCollectionSerializers.java b/java/fury-core/src/main/java/io/fury/serializer/collection/GuavaCollectionSerializers.java index be17e95449..bc2e85bc3e 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/GuavaCollectionSerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/GuavaCollectionSerializers.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableList; @@ -25,11 +25,11 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.ImmutableSortedSet; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.type.Type; -import io.fury.util.Platform; -import io.fury.util.unsafe._JDKAccess; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.Type; +import org.apache.fury.util.Platform; +import org.apache.fury.util.unsafe._JDKAccess; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/ImmutableCollectionSerializers.java b/java/fury-core/src/main/java/io/fury/serializer/collection/ImmutableCollectionSerializers.java index 0b621f8ad8..2ab9ff08b6 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/ImmutableCollectionSerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/ImmutableCollectionSerializers.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.util.Platform; -import io.fury.util.unsafe._JDKAccess; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.Platform; +import org.apache.fury.util.unsafe._JDKAccess; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodType; import java.util.ArrayList; diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/MapSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/collection/MapSerializer.java index 75b10a53d8..40d1a668ef 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/MapSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/MapSerializer.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; import java.util.Map; /** diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/MapSerializers.java b/java/fury-core/src/main/java/io/fury/serializer/collection/MapSerializers.java index 9a4c06df61..9b9c4394dc 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/MapSerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/MapSerializers.java @@ -17,21 +17,21 @@ * under the License. */ -package io.fury.serializer.collection; - -import io.fury.Fury; -import io.fury.collection.LazyMap; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassResolver; -import io.fury.serializer.ReplaceResolveSerializer; -import io.fury.serializer.Serializer; -import io.fury.serializer.Serializers; -import io.fury.serializer.StringSerializer; -import io.fury.type.Type; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; +package org.apache.fury.serializer.collection; + +import org.apache.fury.Fury; +import org.apache.fury.collection.LazyMap; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.serializer.ReplaceResolveSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.Serializers; +import org.apache.fury.serializer.StringSerializer; +import org.apache.fury.type.Type; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; import java.util.Collection; import java.util.Collections; import java.util.Comparator; diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/SubListSerializers.java b/java/fury-core/src/main/java/io/fury/serializer/collection/SubListSerializers.java index 59201cb687..f6b25985f4 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/SubListSerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/SubListSerializers.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; public class SubListSerializers { // ArrayListSubListSerializer diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/SynchronizedSerializers.java b/java/fury-core/src/main/java/io/fury/serializer/collection/SynchronizedSerializers.java index e93c4fdd5b..64aee533ed 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/SynchronizedSerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/SynchronizedSerializers.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.serializer.collection; - -import io.fury.Fury; -import io.fury.collection.Tuple2; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.Serializer; -import io.fury.util.LoggerFactory; -import io.fury.util.Platform; -import io.fury.util.Utils; +package org.apache.fury.serializer.collection; + +import org.apache.fury.Fury; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Utils; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/UnmodifiableSerializers.java b/java/fury-core/src/main/java/io/fury/serializer/collection/UnmodifiableSerializers.java index 7199b60b23..38d2dddf63 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/collection/UnmodifiableSerializers.java +++ b/java/fury-core/src/main/java/io/fury/serializer/collection/UnmodifiableSerializers.java @@ -17,16 +17,16 @@ * under the License. */ -package io.fury.serializer.collection; - -import io.fury.Fury; -import io.fury.collection.Tuple2; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.Serializer; -import io.fury.util.LoggerFactory; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.Utils; +package org.apache.fury.serializer.collection; + +import org.apache.fury.Fury; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.Utils; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonCollectionSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonCollectionSerializer.java index be1647112c..165735c4b8 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonCollectionSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonCollectionSerializer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.serializer.scala; +package org.apache.fury.serializer.scala; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.collection.AbstractCollectionSerializer; -import io.fury.util.GraalvmSupport; -import io.fury.util.Platform; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.collection.AbstractCollectionSerializer; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; import java.lang.reflect.Field; import java.util.Collection; diff --git a/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonMapSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonMapSerializer.java index 820078ce8c..a9fb527c7d 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonMapSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonMapSerializer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.serializer.scala; +package org.apache.fury.serializer.scala; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.collection.AbstractMapSerializer; -import io.fury.util.GraalvmSupport; -import io.fury.util.Platform; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.collection.AbstractMapSerializer; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; import java.lang.reflect.Field; import java.util.Map; diff --git a/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonObjectSerializer.java b/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonObjectSerializer.java index e0b8bded79..19e888941f 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonObjectSerializer.java +++ b/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonObjectSerializer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.serializer.scala; +package org.apache.fury.serializer.scala; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.Serializer; -import io.fury.util.GraalvmSupport; -import io.fury.util.Platform; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; import java.lang.reflect.Field; /** diff --git a/java/fury-core/src/main/java/io/fury/serializer/shim/ShimDispatcher.java b/java/fury-core/src/main/java/io/fury/serializer/shim/ShimDispatcher.java index 9badc896c7..5c8f19acdd 100644 --- a/java/fury-core/src/main/java/io/fury/serializer/shim/ShimDispatcher.java +++ b/java/fury-core/src/main/java/io/fury/serializer/shim/ShimDispatcher.java @@ -17,16 +17,16 @@ * under the License. */ -package io.fury.serializer.shim; +package org.apache.fury.serializer.shim; -import io.fury.Fury; -import io.fury.collection.FuryObjectMap; -import io.fury.collection.ObjectMap; -import io.fury.serializer.Serializer; -import io.fury.serializer.Serializers; -import io.fury.serializer.collection.CollectionSerializer; -import io.fury.serializer.collection.MapSerializers; -import io.fury.util.Preconditions; +import org.apache.fury.Fury; +import org.apache.fury.collection.FuryObjectMap; +import org.apache.fury.collection.ObjectMap; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.Serializers; +import org.apache.fury.serializer.collection.CollectionSerializer; +import org.apache.fury.serializer.collection.MapSerializers; +import org.apache.fury.util.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/java/fury-core/src/main/java/io/fury/type/ClassDef.java b/java/fury-core/src/main/java/io/fury/type/ClassDef.java index 4442dc3b0a..8c56a9da16 100644 --- a/java/fury-core/src/main/java/io/fury/type/ClassDef.java +++ b/java/fury-core/src/main/java/io/fury/type/ClassDef.java @@ -17,28 +17,28 @@ * under the License. */ -package io.fury.type; +package org.apache.fury.type; -import static io.fury.type.TypeUtils.COLLECTION_TYPE; -import static io.fury.type.TypeUtils.MAP_TYPE; -import static io.fury.type.TypeUtils.collectionOf; -import static io.fury.type.TypeUtils.mapOf; +import static org.apache.fury.type.TypeUtils.COLLECTION_TYPE; +import static org.apache.fury.type.TypeUtils.MAP_TYPE; +import static org.apache.fury.type.TypeUtils.collectionOf; +import static org.apache.fury.type.TypeUtils.mapOf; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.builder.MetaSharedCodecBuilder; -import io.fury.collection.IdentityObjectIntMap; -import io.fury.config.CompatibleMode; -import io.fury.config.FuryBuilder; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.resolver.ClassResolver; -import io.fury.serializer.CompatibleSerializer; -import io.fury.util.LoggerFactory; -import io.fury.util.MurmurHash3; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.builder.MetaSharedCodecBuilder; +import org.apache.fury.collection.IdentityObjectIntMap; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.serializer.CompatibleSerializer; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.MurmurHash3; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; import java.io.ObjectStreamClass; import java.io.Serializable; import java.lang.reflect.Field; 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 bde718df66..7b71bf41b7 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 @@ -17,21 +17,21 @@ * under the License. */ -package io.fury.type; +package org.apache.fury.type; -import static io.fury.util.Preconditions.checkArgument; +import static org.apache.fury.util.Preconditions.checkArgument; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.reflect.TypeToken; -import io.fury.annotation.Ignore; -import io.fury.annotation.Internal; -import io.fury.collection.Tuple2; -import io.fury.util.Platform; -import io.fury.util.Preconditions; -import io.fury.util.StringUtils; -import io.fury.util.record.RecordComponent; -import io.fury.util.record.RecordUtils; +import org.apache.fury.annotation.Ignore; +import org.apache.fury.annotation.Internal; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.StringUtils; +import org.apache.fury.util.record.RecordComponent; +import org.apache.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 467070b82b..3c3dfeb5bf 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 @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.type; +package org.apache.fury.type; -import static io.fury.type.TypeUtils.getSizeOfPrimitiveType; +import static org.apache.fury.type.TypeUtils.getSizeOfPrimitiveType; -import io.fury.util.record.RecordUtils; +import org.apache.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/type/FinalObjectTypeStub.java b/java/fury-core/src/main/java/io/fury/type/FinalObjectTypeStub.java index 443ac91824..0aa17956b4 100644 --- a/java/fury-core/src/main/java/io/fury/type/FinalObjectTypeStub.java +++ b/java/fury-core/src/main/java/io/fury/type/FinalObjectTypeStub.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.type; +package org.apache.fury.type; -import io.fury.annotation.Internal; +import org.apache.fury.annotation.Internal; /** * Stub class for object type which is final. * - *

{@link Object} class will be used if isn't final. No {@link io.fury.resolver.ClassInfo} should + *

{@link Object} class will be used if isn't final. No {@link org.apache.fury.resolver.ClassInfo} should * be created for this class since it has no fields, and doesn't have consistent class structure as * real class. * diff --git a/java/fury-core/src/main/java/io/fury/type/GenericType.java b/java/fury-core/src/main/java/io/fury/type/GenericType.java index 48ee70b892..0370d9b4f3 100644 --- a/java/fury-core/src/main/java/io/fury/type/GenericType.java +++ b/java/fury-core/src/main/java/io/fury/type/GenericType.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.type; +package org.apache.fury.type; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import io.fury.resolver.ClassResolver; -import io.fury.serializer.Serializer; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.serializer.Serializer; import java.lang.reflect.GenericArrayType; import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; diff --git a/java/fury-core/src/main/java/io/fury/type/Generics.java b/java/fury-core/src/main/java/io/fury/type/Generics.java index 1603896c39..ceb7b768f3 100644 --- a/java/fury-core/src/main/java/io/fury/type/Generics.java +++ b/java/fury-core/src/main/java/io/fury/type/Generics.java @@ -17,11 +17,11 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.type; +package org.apache.fury.type; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.ClassInfo; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassInfo; // Derived from // https://github.com/EsotericSoftware/kryo/blob/135df69526615bb3f6b34846e58ba3fec3b631c3/src/com/esotericsoftware/kryo/util/DefaultGenerics.java. diff --git a/java/fury-core/src/main/java/io/fury/type/ScalaTypes.java b/java/fury-core/src/main/java/io/fury/type/ScalaTypes.java index e0b46e39b2..a661188b21 100644 --- a/java/fury-core/src/main/java/io/fury/type/ScalaTypes.java +++ b/java/fury-core/src/main/java/io/fury/type/ScalaTypes.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.type; +package org.apache.fury.type; import com.google.common.reflect.TypeToken; -import io.fury.collection.Tuple2; -import io.fury.util.ReflectionUtils; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.ReflectionUtils; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/java/fury-core/src/main/java/io/fury/type/Type.java b/java/fury-core/src/main/java/io/fury/type/Type.java index 1325c3377a..c53db2bf88 100644 --- a/java/fury-core/src/main/java/io/fury/type/Type.java +++ b/java/fury-core/src/main/java/io/fury/type/Type.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.type; +package org.apache.fury.type; -import io.fury.util.Preconditions; +import org.apache.fury.util.Preconditions; /** * Keep in sync with Type::type in arrow/type_fwd.h diff --git a/java/fury-core/src/main/java/io/fury/type/TypeUtils.java b/java/fury-core/src/main/java/io/fury/type/TypeUtils.java index 40262129c3..2e6fbda2a1 100644 --- a/java/fury-core/src/main/java/io/fury/type/TypeUtils.java +++ b/java/fury-core/src/main/java/io/fury/type/TypeUtils.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.type; +package org.apache.fury.type; import com.google.common.collect.ImmutableList; import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; -import io.fury.collection.IdentityMap; -import io.fury.collection.Tuple2; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; +import org.apache.fury.collection.IdentityMap; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; import java.lang.reflect.Array; import java.lang.reflect.GenericArrayType; import java.lang.reflect.Modifier; diff --git a/java/fury-core/src/main/java/io/fury/util/ClassLoaderUtils.java b/java/fury-core/src/main/java/io/fury/util/ClassLoaderUtils.java index 47502edbf0..bcca5eb1c6 100644 --- a/java/fury-core/src/main/java/io/fury/util/ClassLoaderUtils.java +++ b/java/fury-core/src/main/java/io/fury/util/ClassLoaderUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; import java.io.IOException; import java.lang.invoke.MethodHandle; diff --git a/java/fury-core/src/main/java/io/fury/util/DateTimeUtils.java b/java/fury-core/src/main/java/io/fury/util/DateTimeUtils.java index 55defeeb0d..7c8269789b 100644 --- a/java/fury-core/src/main/java/io/fury/util/DateTimeUtils.java +++ b/java/fury-core/src/main/java/io/fury/util/DateTimeUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; import static java.util.concurrent.TimeUnit.DAYS; import static java.util.concurrent.TimeUnit.MICROSECONDS; diff --git a/java/fury-core/src/main/java/io/fury/util/DecimalUtils.java b/java/fury-core/src/main/java/io/fury/util/DecimalUtils.java index fb76c7260c..9722a5e841 100644 --- a/java/fury-core/src/main/java/io/fury/util/DecimalUtils.java +++ b/java/fury-core/src/main/java/io/fury/util/DecimalUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; public class DecimalUtils { public static final int DECIMAL_BYTE_LENGTH = 32; diff --git a/java/fury-core/src/main/java/io/fury/util/ExceptionUtils.java b/java/fury-core/src/main/java/io/fury/util/ExceptionUtils.java index cbc2e70682..01fdd32559 100644 --- a/java/fury-core/src/main/java/io/fury/util/ExceptionUtils.java +++ b/java/fury-core/src/main/java/io/fury/util/ExceptionUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; import java.lang.reflect.Field; diff --git a/java/fury-core/src/main/java/io/fury/util/FieldAccessor.java b/java/fury-core/src/main/java/io/fury/util/FieldAccessor.java index 03b8bc2afe..e9ad88d9ca 100644 --- a/java/fury-core/src/main/java/io/fury/util/FieldAccessor.java +++ b/java/fury-core/src/main/java/io/fury/util/FieldAccessor.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.util; - -import io.fury.type.TypeUtils; -import io.fury.util.function.Functions; -import io.fury.util.function.ToByteFunction; -import io.fury.util.function.ToCharFunction; -import io.fury.util.function.ToFloatFunction; -import io.fury.util.function.ToShortFunction; +package org.apache.fury.util; + +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.function.Functions; +import org.apache.fury.util.function.ToByteFunction; +import org.apache.fury.util.function.ToCharFunction; +import org.apache.fury.util.function.ToFloatFunction; +import org.apache.fury.util.function.ToShortFunction; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.function.Function; diff --git a/java/fury-core/src/main/java/io/fury/util/GraalvmSupport.java b/java/fury-core/src/main/java/io/fury/util/GraalvmSupport.java index d240962e76..777b27b09c 100644 --- a/java/fury-core/src/main/java/io/fury/util/GraalvmSupport.java +++ b/java/fury-core/src/main/java/io/fury/util/GraalvmSupport.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; /** * A helper for Graalvm native image support. diff --git a/java/fury-core/src/main/java/io/fury/util/LoaderBinding.java b/java/fury-core/src/main/java/io/fury/util/LoaderBinding.java index 42e0dfd774..024e8697c6 100644 --- a/java/fury-core/src/main/java/io/fury/util/LoaderBinding.java +++ b/java/fury-core/src/main/java/io/fury/util/LoaderBinding.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; -import io.fury.Fury; -import io.fury.annotation.Internal; +import org.apache.fury.Fury; +import org.apache.fury.annotation.Internal; import java.lang.ref.SoftReference; import java.util.HashMap; import java.util.WeakHashMap; diff --git a/java/fury-core/src/main/java/io/fury/util/LoggerFactory.java b/java/fury-core/src/main/java/io/fury/util/LoggerFactory.java index 5f961cee3e..ceca5d85cc 100644 --- a/java/fury-core/src/main/java/io/fury/util/LoggerFactory.java +++ b/java/fury-core/src/main/java/io/fury/util/LoggerFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; import org.slf4j.Logger; import org.slf4j.helpers.NOPLogger; diff --git a/java/fury-core/src/main/java/io/fury/util/MathUtils.java b/java/fury-core/src/main/java/io/fury/util/MathUtils.java index 18cdd57029..41e579f4f3 100644 --- a/java/fury-core/src/main/java/io/fury/util/MathUtils.java +++ b/java/fury-core/src/main/java/io/fury/util/MathUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; /** * Math utils. diff --git a/java/fury-core/src/main/java/io/fury/util/MurmurHash3.java b/java/fury-core/src/main/java/io/fury/util/MurmurHash3.java index c3e6e64797..3d9be9155d 100644 --- a/java/fury-core/src/main/java/io/fury/util/MurmurHash3.java +++ b/java/fury-core/src/main/java/io/fury/util/MurmurHash3.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; // Derived from // https://github.com/yonik/java_util/blob/435ae306d2f2c077d981ab4de5c9ac3c45f92a4b/src/util/hash/MurmurHash3.java. diff --git a/java/fury-core/src/main/java/io/fury/util/Platform.java b/java/fury-core/src/main/java/io/fury/util/Platform.java index a7c3537550..91b0efb738 100644 --- a/java/fury-core/src/main/java/io/fury/util/Platform.java +++ b/java/fury-core/src/main/java/io/fury/util/Platform.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package io.fury.util; +package org.apache.fury.util; -import io.fury.util.unsafe._JDKAccess; +import org.apache.fury.util.unsafe._JDKAccess; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.nio.Buffer; diff --git a/java/fury-core/src/main/java/io/fury/util/Preconditions.java b/java/fury-core/src/main/java/io/fury/util/Preconditions.java index d76fcbcc77..3759a0cb0a 100644 --- a/java/fury-core/src/main/java/io/fury/util/Preconditions.java +++ b/java/fury-core/src/main/java/io/fury/util/Preconditions.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; /** * Check utils. diff --git a/java/fury-core/src/main/java/io/fury/util/ReflectionUtils.java b/java/fury-core/src/main/java/io/fury/util/ReflectionUtils.java index a812ef8475..25dfe08f8d 100644 --- a/java/fury-core/src/main/java/io/fury/util/ReflectionUtils.java +++ b/java/fury-core/src/main/java/io/fury/util/ReflectionUtils.java @@ -17,17 +17,17 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; -import static io.fury.type.TypeUtils.OBJECT_TYPE; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.type.TypeUtils.OBJECT_TYPE; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import io.fury.annotation.CodegenInvoke; -import io.fury.annotation.Internal; -import io.fury.collection.Tuple3; -import io.fury.util.function.Functions; -import io.fury.util.unsafe._JDKAccess; +import org.apache.fury.annotation.CodegenInvoke; +import org.apache.fury.annotation.Internal; +import org.apache.fury.collection.Tuple3; +import org.apache.fury.util.function.Functions; +import org.apache.fury.util.unsafe._JDKAccess; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -472,7 +472,7 @@ public static String getPackage(Class cls) { */ public static String getCanonicalName(Class cls) { String canonicalName = cls.getCanonicalName(); - io.fury.util.Preconditions.checkArgument( + org.apache.fury.util.Preconditions.checkArgument( canonicalName != null, "Class %s doesn't have canonical name", cls); return canonicalName; } diff --git a/java/fury-core/src/main/java/io/fury/util/StringUtils.java b/java/fury-core/src/main/java/io/fury/util/StringUtils.java index 5c254dbd51..b317503a39 100644 --- a/java/fury-core/src/main/java/io/fury/util/StringUtils.java +++ b/java/fury-core/src/main/java/io/fury/util/StringUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; import com.google.common.io.BaseEncoding; import java.util.HashMap; diff --git a/java/fury-core/src/main/java/io/fury/util/UnsafeFieldAccessor.java b/java/fury-core/src/main/java/io/fury/util/UnsafeFieldAccessor.java index 931d38a8d8..89bee22ad3 100644 --- a/java/fury-core/src/main/java/io/fury/util/UnsafeFieldAccessor.java +++ b/java/fury-core/src/main/java/io/fury/util/UnsafeFieldAccessor.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; import java.lang.reflect.Field; import sun.misc.Unsafe; diff --git a/java/fury-core/src/main/java/io/fury/util/Utils.java b/java/fury-core/src/main/java/io/fury/util/Utils.java index 3ef769af5d..c390b63805 100644 --- a/java/fury-core/src/main/java/io/fury/util/Utils.java +++ b/java/fury-core/src/main/java/io/fury/util/Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; /** * Misc common utils. diff --git a/java/fury-core/src/main/java/io/fury/util/function/Functions.java b/java/fury-core/src/main/java/io/fury/util/function/Functions.java index 10ba0c3678..dc23d72442 100644 --- a/java/fury-core/src/main/java/io/fury/util/function/Functions.java +++ b/java/fury-core/src/main/java/io/fury/util/function/Functions.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.util.function; +package org.apache.fury.util.function; -import io.fury.collection.Tuple2; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; -import io.fury.util.unsafe._JDKAccess; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.unsafe._JDKAccess; import java.io.Serializable; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/java/fury-core/src/main/java/io/fury/util/function/SerializableBiFunction.java b/java/fury-core/src/main/java/io/fury/util/function/SerializableBiFunction.java index f9cd251c53..a16129ea3a 100644 --- a/java/fury-core/src/main/java/io/fury/util/function/SerializableBiFunction.java +++ b/java/fury-core/src/main/java/io/fury/util/function/SerializableBiFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util.function; +package org.apache.fury.util.function; import java.io.Serializable; import java.util.function.BiFunction; diff --git a/java/fury-core/src/main/java/io/fury/util/function/SerializableFunction.java b/java/fury-core/src/main/java/io/fury/util/function/SerializableFunction.java index 1826432661..98ad869470 100644 --- a/java/fury-core/src/main/java/io/fury/util/function/SerializableFunction.java +++ b/java/fury-core/src/main/java/io/fury/util/function/SerializableFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util.function; +package org.apache.fury.util.function; import java.io.Serializable; import java.util.function.Function; diff --git a/java/fury-core/src/main/java/io/fury/util/function/SerializableSupplier.java b/java/fury-core/src/main/java/io/fury/util/function/SerializableSupplier.java index a89293517a..c322c8a29a 100644 --- a/java/fury-core/src/main/java/io/fury/util/function/SerializableSupplier.java +++ b/java/fury-core/src/main/java/io/fury/util/function/SerializableSupplier.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util.function; +package org.apache.fury.util.function; import java.io.Serializable; import java.util.function.Supplier; diff --git a/java/fury-core/src/main/java/io/fury/util/function/SerializableTriFunction.java b/java/fury-core/src/main/java/io/fury/util/function/SerializableTriFunction.java index 541ba31a74..c1ba86e23a 100644 --- a/java/fury-core/src/main/java/io/fury/util/function/SerializableTriFunction.java +++ b/java/fury-core/src/main/java/io/fury/util/function/SerializableTriFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util.function; +package org.apache.fury.util.function; import java.io.Serializable; diff --git a/java/fury-core/src/main/java/io/fury/util/function/ToByteFunction.java b/java/fury-core/src/main/java/io/fury/util/function/ToByteFunction.java index d808bf9d31..d89f53d358 100644 --- a/java/fury-core/src/main/java/io/fury/util/function/ToByteFunction.java +++ b/java/fury-core/src/main/java/io/fury/util/function/ToByteFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util.function; +package org.apache.fury.util.function; @FunctionalInterface public interface ToByteFunction { diff --git a/java/fury-core/src/main/java/io/fury/util/function/ToCharFunction.java b/java/fury-core/src/main/java/io/fury/util/function/ToCharFunction.java index e3e7f65a68..bcbd362ed6 100644 --- a/java/fury-core/src/main/java/io/fury/util/function/ToCharFunction.java +++ b/java/fury-core/src/main/java/io/fury/util/function/ToCharFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util.function; +package org.apache.fury.util.function; @FunctionalInterface public interface ToCharFunction { diff --git a/java/fury-core/src/main/java/io/fury/util/function/ToFloatFunction.java b/java/fury-core/src/main/java/io/fury/util/function/ToFloatFunction.java index b4c1ddf3eb..e7c6246d83 100644 --- a/java/fury-core/src/main/java/io/fury/util/function/ToFloatFunction.java +++ b/java/fury-core/src/main/java/io/fury/util/function/ToFloatFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util.function; +package org.apache.fury.util.function; @FunctionalInterface public interface ToFloatFunction { diff --git a/java/fury-core/src/main/java/io/fury/util/function/ToShortFunction.java b/java/fury-core/src/main/java/io/fury/util/function/ToShortFunction.java index 1c335a0593..52bcb86afe 100644 --- a/java/fury-core/src/main/java/io/fury/util/function/ToShortFunction.java +++ b/java/fury-core/src/main/java/io/fury/util/function/ToShortFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util.function; +package org.apache.fury.util.function; @FunctionalInterface public interface ToShortFunction { diff --git a/java/fury-core/src/main/java/io/fury/util/function/TriFunction.java b/java/fury-core/src/main/java/io/fury/util/function/TriFunction.java index 2e46e1c6c8..81587b28ca 100644 --- a/java/fury-core/src/main/java/io/fury/util/function/TriFunction.java +++ b/java/fury-core/src/main/java/io/fury/util/function/TriFunction.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.util.function; +package org.apache.fury.util.function; -import io.fury.util.Preconditions; +import org.apache.fury.util.Preconditions; import java.util.function.Function; /** diff --git a/java/fury-core/src/main/java/io/fury/util/record/RecordComponent.java b/java/fury-core/src/main/java/io/fury/util/record/RecordComponent.java index 52fce7639e..68b7bf2ecc 100644 --- a/java/fury-core/src/main/java/io/fury/util/record/RecordComponent.java +++ b/java/fury-core/src/main/java/io/fury/util/record/RecordComponent.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util.record; +package org.apache.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/record/RecordInfo.java b/java/fury-core/src/main/java/io/fury/util/record/RecordInfo.java index 8acb0034b3..4446b1adee 100644 --- a/java/fury-core/src/main/java/io/fury/util/record/RecordInfo.java +++ b/java/fury-core/src/main/java/io/fury/util/record/RecordInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util.record; +package org.apache.fury.util.record; import java.util.List; diff --git a/java/fury-core/src/main/java/io/fury/util/record/RecordUtils.java b/java/fury-core/src/main/java/io/fury/util/record/RecordUtils.java index 6640d48771..ac98461754 100644 --- a/java/fury-core/src/main/java/io/fury/util/record/RecordUtils.java +++ b/java/fury-core/src/main/java/io/fury/util/record/RecordUtils.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.util.record; +package org.apache.fury.util.record; -import io.fury.collection.Tuple2; -import io.fury.util.unsafe._JDKAccess; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.unsafe._JDKAccess; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; diff --git a/java/fury-core/src/main/java/io/fury/util/unsafe/_Collections.java b/java/fury-core/src/main/java/io/fury/util/unsafe/_Collections.java index cff04d239e..f589d16a26 100644 --- a/java/fury-core/src/main/java/io/fury/util/unsafe/_Collections.java +++ b/java/fury-core/src/main/java/io/fury/util/unsafe/_Collections.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.util.unsafe; +package org.apache.fury.util.unsafe; -import io.fury.util.Platform; +import org.apache.fury.util.Platform; import java.util.ArrayList; /** diff --git a/java/fury-core/src/main/java/io/fury/util/unsafe/_JDKAccess.java b/java/fury-core/src/main/java/io/fury/util/unsafe/_JDKAccess.java index b77c0ed345..470f7d6ce1 100644 --- a/java/fury-core/src/main/java/io/fury/util/unsafe/_JDKAccess.java +++ b/java/fury-core/src/main/java/io/fury/util/unsafe/_JDKAccess.java @@ -17,17 +17,17 @@ * under the License. */ -package io.fury.util.unsafe; +package org.apache.fury.util.unsafe; -import io.fury.collection.Tuple2; -import io.fury.type.TypeUtils; -import io.fury.util.GraalvmSupport; -import io.fury.util.Preconditions; -import io.fury.util.Utils; -import io.fury.util.function.ToByteFunction; -import io.fury.util.function.ToCharFunction; -import io.fury.util.function.ToFloatFunction; -import io.fury.util.function.ToShortFunction; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.Utils; +import org.apache.fury.util.function.ToByteFunction; +import org.apache.fury.util.function.ToCharFunction; +import org.apache.fury.util.function.ToFloatFunction; +import org.apache.fury.util.function.ToShortFunction; import java.lang.invoke.CallSite; import java.lang.invoke.LambdaMetafactory; import java.lang.invoke.MethodHandle; diff --git a/java/fury-core/src/main/java/io/fury/util/unsafe/_Lookup.java b/java/fury-core/src/main/java/io/fury/util/unsafe/_Lookup.java index c7e6313786..fb8dd80815 100644 --- a/java/fury-core/src/main/java/io/fury/util/unsafe/_Lookup.java +++ b/java/fury-core/src/main/java/io/fury/util/unsafe/_Lookup.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util.unsafe; +package org.apache.fury.util.unsafe; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/java/fury-core/src/main/resources/META-INF/native-image/org.furyio/fury-core/native-image.properties b/java/fury-core/src/main/resources/META-INF/native-image/org.furyio/fury-core/native-image.properties index 6b6d22003d..a5124c4f81 100644 --- a/java/fury-core/src/main/resources/META-INF/native-image/org.furyio/fury-core/native-image.properties +++ b/java/fury-core/src/main/resources/META-INF/native-image/org.furyio/fury-core/native-image.properties @@ -17,155 +17,155 @@ # https://www.graalvm.org/latest/reference-manual/native-image/dynamic-features/Reflection/#unsafe-accesses : # The unsafe offset get on build time may be different from runtime -Args=--initialize-at-build-time=io.fury.memory.MemoryBuffer,\ - io.fury.util.GraalvmSupport,\ - io.fury.serializer.collection.UnmodifiableSerializers$Offset,\ - io.fury.serializer.collection.SynchronizedSerializers$Offset,\ - io.fury.serializer.collection.CollectionSerializers$ArraysAsListSerializer,\ - io.fury.serializer.collection.MapSerializers$EnumMapSerializer,\ - io.fury.serializer.StringSerializer$Offset,\ - io.fury.serializer.StringSerializer,\ - io.fury.serializer.Serializers,\ - io.fury.serializer.shim.ShimDispatcher,\ - io.fury.util.Platform,\ - io.fury.util.ReflectionUtils,\ - io.fury.util.unsafe._Lookup,\ - io.fury.util.unsafe._JDKAccess,\ - io.fury.type.Type,\ - io.fury.type.TypeUtils,\ - io.fury.Fury,\ - io.fury.type.Type,\ - io.fury.serializer.JavaSerializer,\ - io.fury.util.ReflectionUtils,\ - io.fury.builder.ObjectCodecBuilder,\ +Args=--initialize-at-build-time=org.apache.fury.memory.MemoryBuffer,\ + org.apache.fury.util.GraalvmSupport,\ + org.apache.fury.serializer.collection.UnmodifiableSerializers$Offset,\ + org.apache.fury.serializer.collection.SynchronizedSerializers$Offset,\ + org.apache.fury.serializer.collection.CollectionSerializers$ArraysAsListSerializer,\ + org.apache.fury.serializer.collection.MapSerializers$EnumMapSerializer,\ + org.apache.fury.serializer.StringSerializer$Offset,\ + org.apache.fury.serializer.StringSerializer,\ + org.apache.fury.serializer.Serializers,\ + org.apache.fury.serializer.shim.ShimDispatcher,\ + org.apache.fury.util.Platform,\ + org.apache.fury.util.ReflectionUtils,\ + org.apache.fury.util.unsafe._Lookup,\ + org.apache.fury.util.unsafe._JDKAccess,\ + org.apache.fury.type.Type,\ + org.apache.fury.type.TypeUtils,\ + org.apache.fury.Fury,\ + org.apache.fury.type.Type,\ + org.apache.fury.serializer.JavaSerializer,\ + org.apache.fury.util.ReflectionUtils,\ + org.apache.fury.builder.ObjectCodecBuilder,\ com.google.common.reflect.Types$ClassOwnership$1,\ - io.fury.shaded.org.codehaus.janino.Java$ArrayType,\ - io.fury.serializer.LocaleSerializer,\ - io.fury.shaded.org.codehaus.janino.Java$AbstractCompilationUnit$TypeImportOnDemandDeclaration,\ - io.fury.shaded.org.codehaus.janino.Compiler,\ - io.fury.shaded.org.codehaus.janino.UnitCompiler,\ + org.apache.fury.shaded.org.codehaus.janino.Java$ArrayType,\ + org.apache.fury.serializer.LocaleSerializer,\ + org.apache.fury.shaded.org.codehaus.janino.Java$AbstractCompilationUnit$TypeImportOnDemandDeclaration,\ + org.apache.fury.shaded.org.codehaus.janino.Compiler,\ + org.apache.fury.shaded.org.codehaus.janino.UnitCompiler,\ com.google.common.util.concurrent.SettableFuture,\ com.google.common.reflect.Types$JavaVersion$1,\ - io.fury.config.FuryBuilder,\ - io.fury.shaded.org.codehaus.janino.Java$MethodInvocation,\ - io.fury.shaded.org.codehaus.janino.Java$FunctionDeclarator$FormalParameter,\ - io.fury.shaded.org.codehaus.janino.Java$ExpressionStatement,\ - io.fury.shaded.org.codehaus.janino.Java$FunctionDeclarator$FormalParameters,\ - io.fury.shaded.org.codehaus.janino.Java$Rvalue,\ - io.fury.shaded.javassist.util.proxy.DefineClassHelper,\ - io.fury.shaded.org.codehaus.janino.Java$LocalVariableAccess,\ - io.fury.shaded.org.codehaus.janino.ClassLoaderIClassLoader,\ - io.fury.shaded.org.codehaus.janino.Java$Located$1,\ - io.fury.shaded.org.codehaus.janino.Java$EmptyStatement,\ - io.fury.shaded.org.codehaus.janino.Java$ForStatement,\ - io.fury.shaded.org.codehaus.janino.Java$Type,\ - io.fury.shaded.org.codehaus.janino.Java$Cast,\ - io.fury.shaded.org.codehaus.janino.Java$BooleanRvalue,\ - io.fury.shaded.org.codehaus.janino.IClass$PrimitiveIClass,\ - io.fury.shaded.org.codehaus.janino.Compiler$CompilerIClassLoader,\ - io.fury.shaded.javassist.util.proxy.SecurityActions,\ - io.fury.util.unsafe._Lookup,\ - io.fury.shaded.org.codehaus.commons.compiler.util.iterator.Iterables$5,\ + org.apache.fury.config.FuryBuilder,\ + org.apache.fury.shaded.org.codehaus.janino.Java$MethodInvocation,\ + org.apache.fury.shaded.org.codehaus.janino.Java$FunctionDeclarator$FormalParameter,\ + org.apache.fury.shaded.org.codehaus.janino.Java$ExpressionStatement,\ + org.apache.fury.shaded.org.codehaus.janino.Java$FunctionDeclarator$FormalParameters,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Rvalue,\ + org.apache.fury.shaded.javassist.util.proxy.DefineClassHelper,\ + org.apache.fury.shaded.org.codehaus.janino.Java$LocalVariableAccess,\ + org.apache.fury.shaded.org.codehaus.janino.ClassLoaderIClassLoader,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Located$1,\ + org.apache.fury.shaded.org.codehaus.janino.Java$EmptyStatement,\ + org.apache.fury.shaded.org.codehaus.janino.Java$ForStatement,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Type,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Cast,\ + org.apache.fury.shaded.org.codehaus.janino.Java$BooleanRvalue,\ + org.apache.fury.shaded.org.codehaus.janino.IClass$PrimitiveIClass,\ + org.apache.fury.shaded.org.codehaus.janino.Compiler$CompilerIClassLoader,\ + org.apache.fury.shaded.javassist.util.proxy.SecurityActions,\ + org.apache.fury.util.unsafe._Lookup,\ + org.apache.fury.shaded.org.codehaus.commons.compiler.util.iterator.Iterables$5,\ com.google.common.base.internal.Finalizer,\ - io.fury.serializer.ReplaceResolveSerializer,\ + org.apache.fury.serializer.ReplaceResolveSerializer,\ com.google.common.primitives.Primitives,\ - io.fury.type.GenericType,\ - io.fury.shaded.org.codehaus.janino.Java$BreakableStatement,\ - io.fury.shaded.org.codehaus.janino.Java$LocalVariableDeclarationStatement,\ - io.fury.shaded.org.codehaus.janino.TokenStreamImpl$1,\ + org.apache.fury.type.GenericType,\ + org.apache.fury.shaded.org.codehaus.janino.Java$BreakableStatement,\ + org.apache.fury.shaded.org.codehaus.janino.Java$LocalVariableDeclarationStatement,\ + org.apache.fury.shaded.org.codehaus.janino.TokenStreamImpl$1,\ com.google.common.reflect.Types$TypeVariableInvocationHandler,\ - io.fury.shaded.org.codehaus.janino.Java$ThisReference,\ - io.fury.shaded.org.codehaus.janino.IClass,\ - io.fury.shaded.org.codehaus.janino.Java$ClassLiteral,\ - io.fury.resolver.ClassResolver$2,\ - io.fury.shaded.org.codehaus.janino.Parser$1,\ - io.fury.shaded.org.codehaus.janino.Java$BinaryOperation,\ - io.fury.shaded.org.codehaus.janino.Java$Crement,\ - io.fury.shaded.org.codehaus.janino.Java$ReturnStatement,\ + org.apache.fury.shaded.org.codehaus.janino.Java$ThisReference,\ + org.apache.fury.shaded.org.codehaus.janino.IClass,\ + org.apache.fury.shaded.org.codehaus.janino.Java$ClassLiteral,\ + org.apache.fury.resolver.ClassResolver$2,\ + org.apache.fury.shaded.org.codehaus.janino.Parser$1,\ + org.apache.fury.shaded.org.codehaus.janino.Java$BinaryOperation,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Crement,\ + org.apache.fury.shaded.org.codehaus.janino.Java$ReturnStatement,\ com.google.common.reflect.Types$ClassOwnership,\ - io.fury.shaded.org.codehaus.janino.Java$WhileStatement,\ - io.fury.shaded.org.codehaus.janino.Java$FunctionDeclarator,\ - io.fury.shaded.org.codehaus.janino.Java$Atom,\ - io.fury.shaded.org.codehaus.janino.Java$SimpleType,\ - io.fury.shaded.org.codehaus.janino.Java$FieldAccessExpression,\ - io.fury.shaded.org.codehaus.janino.Java$AbstractTypeBodyDeclaration,\ - io.fury.shaded.org.codehaus.janino.Parser,\ - io.fury.shaded.org.codehaus.janino.Java$QualifiedThisReference,\ - io.fury.shaded.org.codehaus.janino.Java$Assignment,\ - io.fury.shaded.org.codehaus.janino.Java$NullLiteral,\ - io.fury.shaded.org.codehaus.janino.Java$ParenthesizedExpression,\ - io.fury.shaded.org.codehaus.janino.Java$Statement,\ - io.fury.shaded.org.codehaus.janino.IClassLoader$1,\ - io.fury.shaded.org.codehaus.janino.Java$VariableDeclarator,\ - io.fury.shaded.org.codehaus.janino.Java$AbstractCompilationUnit$SingleTypeImportDeclaration,\ - io.fury.shaded.org.codehaus.janino.Java$MethodDeclarator,\ + org.apache.fury.shaded.org.codehaus.janino.Java$WhileStatement,\ + org.apache.fury.shaded.org.codehaus.janino.Java$FunctionDeclarator,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Atom,\ + org.apache.fury.shaded.org.codehaus.janino.Java$SimpleType,\ + org.apache.fury.shaded.org.codehaus.janino.Java$FieldAccessExpression,\ + org.apache.fury.shaded.org.codehaus.janino.Java$AbstractTypeBodyDeclaration,\ + org.apache.fury.shaded.org.codehaus.janino.Parser,\ + org.apache.fury.shaded.org.codehaus.janino.Java$QualifiedThisReference,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Assignment,\ + org.apache.fury.shaded.org.codehaus.janino.Java$NullLiteral,\ + org.apache.fury.shaded.org.codehaus.janino.Java$ParenthesizedExpression,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Statement,\ + org.apache.fury.shaded.org.codehaus.janino.IClassLoader$1,\ + org.apache.fury.shaded.org.codehaus.janino.Java$VariableDeclarator,\ + org.apache.fury.shaded.org.codehaus.janino.Java$AbstractCompilationUnit$SingleTypeImportDeclaration,\ + org.apache.fury.shaded.org.codehaus.janino.Java$MethodDeclarator,\ com.google.common.base.FinalizableReferenceQueue,\ - io.fury.shaded.org.codehaus.janino.Java$AbstractCompilationUnit$ImportDeclaration,\ - io.fury.codegen.JaninoUtils,\ - io.fury.shaded.org.codehaus.janino.Java$Invocation,\ - io.fury.shaded.org.codehaus.janino.ReflectionIClass,\ - io.fury.util.record.RecordUtils,\ - io.fury.shaded.org.codehaus.janino.Java$Literal,\ - io.fury.shaded.org.codehaus.janino.IClassLoader,\ - io.fury.shaded.org.codehaus.janino.Java$PrimitiveType,\ - io.fury.shaded.org.codehaus.janino.CodeContext,\ - io.fury.serializer.collection.ImmutableCollectionSerializers,\ - io.fury.shaded.org.codehaus.janino.IClass$2,\ + org.apache.fury.shaded.org.codehaus.janino.Java$AbstractCompilationUnit$ImportDeclaration,\ + org.apache.fury.codegen.JaninoUtils,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Invocation,\ + org.apache.fury.shaded.org.codehaus.janino.ReflectionIClass,\ + org.apache.fury.util.record.RecordUtils,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Literal,\ + org.apache.fury.shaded.org.codehaus.janino.IClassLoader,\ + org.apache.fury.shaded.org.codehaus.janino.Java$PrimitiveType,\ + org.apache.fury.shaded.org.codehaus.janino.CodeContext,\ + org.apache.fury.serializer.collection.ImmutableCollectionSerializers,\ + org.apache.fury.shaded.org.codehaus.janino.IClass$2,\ com.google.common.collect.RegularImmutableMap,\ - io.fury.shaded.org.codehaus.janino.Descriptor,\ + org.apache.fury.shaded.org.codehaus.janino.Descriptor,\ com.google.common.reflect.Types$NativeTypeVariableEquals,\ - io.fury.shaded.org.codehaus.janino.Java$Located,\ - io.fury.shaded.org.codehaus.janino.Java$ReferenceType,\ - io.fury.shaded.org.codehaus.janino.Java$UnaryOperation,\ - io.fury.util.ClassLoaderUtils,\ - io.fury.shaded.org.codehaus.janino.UnitCompiler$39,\ - io.fury.shaded.org.codehaus.janino.Java$IntegerLiteral,\ - io.fury.shaded.org.codehaus.janino.Java$Lvalue,\ - io.fury.shaded.org.codehaus.janino.Java$PackageDeclaration,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Located,\ + org.apache.fury.shaded.org.codehaus.janino.Java$ReferenceType,\ + org.apache.fury.shaded.org.codehaus.janino.Java$UnaryOperation,\ + org.apache.fury.util.ClassLoaderUtils,\ + org.apache.fury.shaded.org.codehaus.janino.UnitCompiler$39,\ + org.apache.fury.shaded.org.codehaus.janino.Java$IntegerLiteral,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Lvalue,\ + org.apache.fury.shaded.org.codehaus.janino.Java$PackageDeclaration,\ com.google.common.reflect.Types$JavaVersion$4,\ - io.fury.shaded.org.codehaus.janino.Java$FieldAccess,\ - io.fury.shaded.org.codehaus.janino.Java$Block,\ - io.fury.builder.AccessorHelper,\ - io.fury.codegen.Expression$Literal,\ - io.fury.shaded.org.codehaus.janino.Java$ContinuableStatement,\ - io.fury.shaded.org.codehaus.janino.Java$IfStatement,\ + org.apache.fury.shaded.org.codehaus.janino.Java$FieldAccess,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Block,\ + org.apache.fury.builder.AccessorHelper,\ + org.apache.fury.codegen.Expression$Literal,\ + org.apache.fury.shaded.org.codehaus.janino.Java$ContinuableStatement,\ + org.apache.fury.shaded.org.codehaus.janino.Java$IfStatement,\ com.google.common.collect.RegularImmutableBiMap,\ - io.fury.shaded.org.codehaus.janino.Java$ConstructorDeclarator,\ + org.apache.fury.shaded.org.codehaus.janino.Java$ConstructorDeclarator,\ com.google.common.reflect.Types$JavaVersion$3,\ - io.fury.shaded.org.codehaus.janino.Java$SuperConstructorInvocation,\ - io.fury.shaded.org.codehaus.janino.UnitCompiler$44,\ - io.fury.shaded.org.codehaus.janino.Java$AmbiguousName,\ - io.fury.shaded.org.codehaus.janino.Scanner,\ - io.fury.shaded.org.codehaus.janino.Java$FieldDeclaration,\ - io.fury.memory.BoundsChecking,\ - io.fury.shaded.org.codehaus.janino.Java$Package,\ - io.fury.serializer.ArraySerializers,\ - io.fury.shaded.org.codehaus.janino.Java$AccessModifier,\ - io.fury.util.ClassLoaderUtils$ParentClassLoader,\ + org.apache.fury.shaded.org.codehaus.janino.Java$SuperConstructorInvocation,\ + org.apache.fury.shaded.org.codehaus.janino.UnitCompiler$44,\ + org.apache.fury.shaded.org.codehaus.janino.Java$AmbiguousName,\ + org.apache.fury.shaded.org.codehaus.janino.Scanner,\ + org.apache.fury.shaded.org.codehaus.janino.Java$FieldDeclaration,\ + org.apache.fury.memory.BoundsChecking,\ + org.apache.fury.shaded.org.codehaus.janino.Java$Package,\ + org.apache.fury.serializer.ArraySerializers,\ + org.apache.fury.shaded.org.codehaus.janino.Java$AccessModifier,\ + org.apache.fury.util.ClassLoaderUtils$ParentClassLoader,\ com.google.common.collect.RegularImmutableSortedSet,\ - io.fury.type.Descriptor,\ - io.fury.serializer.PrimitiveSerializers$1,\ + org.apache.fury.type.Descriptor,\ + org.apache.fury.serializer.PrimitiveSerializers$1,\ org.slf4j.LoggerFactory,\ - io.fury.collection.MultiKeyWeakMap,\ - io.fury.serializer.collection.UnmodifiableSerializers,\ - io.fury.codegen.CompileUnit,\ - io.fury.serializer.StringSerializer,\ + org.apache.fury.collection.MultiKeyWeakMap,\ + org.apache.fury.serializer.collection.UnmodifiableSerializers,\ + org.apache.fury.codegen.CompileUnit,\ + org.apache.fury.serializer.StringSerializer,\ com.google.common.util.concurrent.AbstractFuture$UnsafeAtomicHelper,\ - io.fury.memory.MemoryBuffer,\ + org.apache.fury.memory.MemoryBuffer,\ com.google.common.math.IntMath$1,\ - io.fury.resolver.ClassResolver,\ - io.fury.codegen.CodegenContext,\ - io.fury.serializer.collection.GuavaCollectionSerializers,\ - io.fury.util.unsafe._JDKAccess,\ - io.fury.codegen.CodeGenerator,\ - io.fury.serializer.collection.SynchronizedSerializers,\ - io.fury.util.ClassLoaderUtils$ByteArrayClassLoader,\ + org.apache.fury.resolver.ClassResolver,\ + org.apache.fury.codegen.CodegenContext,\ + org.apache.fury.serializer.collection.GuavaCollectionSerializers,\ + org.apache.fury.util.unsafe._JDKAccess,\ + org.apache.fury.codegen.CodeGenerator,\ + org.apache.fury.serializer.collection.SynchronizedSerializers,\ + org.apache.fury.util.ClassLoaderUtils$ByteArrayClassLoader,\ com.google.common.collect.AbstractIterator$1,\ com.google.common.cache.LocalCache,\ - io.fury.serializer.LambdaSerializer,\ + org.apache.fury.serializer.LambdaSerializer,\ com.google.common.collect.ImmutableSortedMap,\ - io.fury.memory.MemoryUtils,\ - io.fury.type.DescriptorGrouper,\ + org.apache.fury.memory.MemoryUtils,\ + org.apache.fury.type.DescriptorGrouper,\ sun.misc.Unsafe,\ org.slf4j.LoggerFactory,\ com.google.common.collect.Platform diff --git a/java/fury-core/src/test/java/io/fury/CrossLanguageTest.java b/java/fury-core/src/test/java/io/fury/CrossLanguageTest.java index e83671e4a9..deb8b9b6b4 100644 --- a/java/fury-core/src/test/java/io/fury/CrossLanguageTest.java +++ b/java/fury-core/src/test/java/io/fury/CrossLanguageTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.fury; +package org.apache.fury; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.hash.Hashing; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.serializer.BufferObject; -import io.fury.serializer.Serializer; -import io.fury.util.LoggerFactory; -import io.fury.util.MurmurHash3; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.BufferObject; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.MurmurHash3; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; diff --git a/java/fury-core/src/test/java/io/fury/CyclicTest.java b/java/fury-core/src/test/java/io/fury/CyclicTest.java index bfaacdf3b6..f367a07a64 100644 --- a/java/fury-core/src/test/java/io/fury/CyclicTest.java +++ b/java/fury-core/src/test/java/io/fury/CyclicTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury; +package org.apache.fury; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.fury.config.CompatibleMode; -import io.fury.config.FuryBuilder; -import io.fury.config.Language; -import io.fury.test.bean.Cyclic; -import io.fury.test.bean.FinalCyclic; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.config.Language; +import org.apache.fury.test.bean.Cyclic; +import org.apache.fury.test.bean.FinalCyclic; import java.util.ArrayList; import java.util.List; import org.testng.Assert; diff --git a/java/fury-core/src/test/java/io/fury/FuryInitPerf.java b/java/fury-core/src/test/java/io/fury/FuryInitPerf.java index acd96b4e61..da5b12621a 100644 --- a/java/fury-core/src/test/java/io/fury/FuryInitPerf.java +++ b/java/fury-core/src/test/java/io/fury/FuryInitPerf.java @@ -17,17 +17,17 @@ * under the License. */ -package io.fury; +package org.apache.fury; import com.google.common.reflect.TypeToken; -import io.fury.config.CompatibleMode; -import io.fury.config.Language; -import io.fury.resolver.MetaContext; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.BeanB; -import io.fury.test.bean.Foo; -import io.fury.type.TypeUtils; -import io.fury.util.LoggerFactory; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; +import org.apache.fury.resolver.MetaContext; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; +import org.apache.fury.test.bean.Foo; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.LoggerFactory; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/java/fury-core/src/test/java/io/fury/FuryTest.java b/java/fury-core/src/test/java/io/fury/FuryTest.java index 601b4ebab4..0105ce031b 100644 --- a/java/fury-core/src/test/java/io/fury/FuryTest.java +++ b/java/fury-core/src/test/java/io/fury/FuryTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury; +package org.apache.fury; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; @@ -27,22 +27,22 @@ import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.fury.annotation.Ignore; -import io.fury.builder.Generated; -import io.fury.config.FuryBuilder; -import io.fury.config.Language; -import io.fury.exception.InsecureException; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.serializer.ArraySerializersTest; -import io.fury.serializer.ObjectSerializer; -import io.fury.serializer.Serializer; -import io.fury.serializer.SerializersTest; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.Struct; -import io.fury.type.Descriptor; -import io.fury.util.DateTimeUtils; -import io.fury.util.Platform; +import org.apache.fury.annotation.Ignore; +import org.apache.fury.builder.Generated; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.config.Language; +import org.apache.fury.exception.InsecureException; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.ArraySerializersTest; +import org.apache.fury.serializer.ObjectSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.SerializersTest; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.Struct; +import org.apache.fury.type.Descriptor; +import org.apache.fury.util.DateTimeUtils; +import org.apache.fury.util.Platform; import java.io.*; import java.lang.invoke.MethodHandles; import java.math.BigDecimal; diff --git a/java/fury-core/src/test/java/io/fury/FuryTestBase.java b/java/fury-core/src/test/java/io/fury/FuryTestBase.java index b0f1ccd30c..481e302cfb 100644 --- a/java/fury-core/src/test/java/io/fury/FuryTestBase.java +++ b/java/fury-core/src/test/java/io/fury/FuryTestBase.java @@ -17,16 +17,16 @@ * under the License. */ -package io.fury; +package org.apache.fury; -import io.fury.config.CompatibleMode; -import io.fury.config.Language; -import io.fury.io.ClassLoaderObjectInputStream; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.MetaContext; -import io.fury.serializer.BufferObject; -import io.fury.util.Platform; -import io.fury.util.ReflectionUtils; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; +import org.apache.fury.io.ClassLoaderObjectInputStream; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.MetaContext; +import org.apache.fury.serializer.BufferObject; +import org.apache.fury.util.Platform; +import org.apache.fury.util.ReflectionUtils; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/java/fury-core/src/test/java/io/fury/OutOfBandTest.java b/java/fury-core/src/test/java/io/fury/OutOfBandTest.java index 5316bd20f6..9a2eb730ff 100644 --- a/java/fury-core/src/test/java/io/fury/OutOfBandTest.java +++ b/java/fury-core/src/test/java/io/fury/OutOfBandTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury; +package org.apache.fury; import static org.testng.Assert.assertEquals; -import io.fury.config.FuryBuilder; -import io.fury.config.Language; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.config.Language; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.concurrent.atomic.AtomicInteger; diff --git a/java/fury-core/src/test/java/io/fury/TestUtils.java b/java/fury-core/src/test/java/io/fury/TestUtils.java index 293f7f5ef7..0877509b90 100644 --- a/java/fury-core/src/test/java/io/fury/TestUtils.java +++ b/java/fury-core/src/test/java/io/fury/TestUtils.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury; +package org.apache.fury; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableMap; -import io.fury.util.FieldAccessor; -import io.fury.util.ReflectionUtils; +import org.apache.fury.util.FieldAccessor; +import org.apache.fury.util.ReflectionUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; diff --git a/java/fury-core/src/test/java/io/fury/ThreadSafeFuryTest.java b/java/fury-core/src/test/java/io/fury/ThreadSafeFuryTest.java index 6ccdf178b1..236bde2f5f 100644 --- a/java/fury-core/src/test/java/io/fury/ThreadSafeFuryTest.java +++ b/java/fury-core/src/test/java/io/fury/ThreadSafeFuryTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.fury; +package org.apache.fury; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; -import io.fury.resolver.MetaContext; -import io.fury.serializer.Serializer; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.Struct; -import io.fury.util.LoaderBinding.StagingType; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.MetaContext; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.Struct; +import org.apache.fury.util.LoaderBinding.StagingType; import java.util.WeakHashMap; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; diff --git a/java/fury-core/src/test/java/io/fury/builder/AccessorHelperTest.java b/java/fury-core/src/test/java/io/fury/builder/AccessorHelperTest.java index 817da85943..6e733331ec 100644 --- a/java/fury-core/src/test/java/io/fury/builder/AccessorHelperTest.java +++ b/java/fury-core/src/test/java/io/fury/builder/AccessorHelperTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.fury.builder; +package org.apache.fury.builder; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import io.fury.TestUtils; -import io.fury.builder.pkg.AccessLevelClass; -import io.fury.test.bean.Foo; -import io.fury.test.bean.Struct; -import io.fury.type.Descriptor; +import org.apache.fury.TestUtils; +import org.apache.fury.builder.pkg.AccessLevelClass; +import org.apache.fury.test.bean.Foo; +import org.apache.fury.test.bean.Struct; +import org.apache.fury.type.Descriptor; import java.lang.ref.WeakReference; import java.lang.reflect.Method; import java.util.concurrent.ExecutorService; diff --git a/java/fury-core/src/test/java/io/fury/builder/CodecUtilsTest.java b/java/fury-core/src/test/java/io/fury/builder/CodecUtilsTest.java index fc2f8146df..4e609f21bb 100644 --- a/java/fury-core/src/test/java/io/fury/builder/CodecUtilsTest.java +++ b/java/fury-core/src/test/java/io/fury/builder/CodecUtilsTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.builder; +package org.apache.fury.builder; import static org.testng.Assert.assertEquals; -import io.fury.Fury; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.test.bean.BeanA; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.test.bean.BeanA; import org.testng.annotations.Test; public class CodecUtilsTest { diff --git a/java/fury-core/src/test/java/io/fury/builder/JITContextTest.java b/java/fury-core/src/test/java/io/fury/builder/JITContextTest.java index 754d95fb01..1f1717a617 100644 --- a/java/fury-core/src/test/java/io/fury/builder/JITContextTest.java +++ b/java/fury-core/src/test/java/io/fury/builder/JITContextTest.java @@ -17,21 +17,21 @@ * under the License. */ -package io.fury.builder; +package org.apache.fury.builder; import static org.testng.Assert.assertEquals; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.CompatibleMode; -import io.fury.config.Language; -import io.fury.resolver.MetaContext; -import io.fury.serializer.Serializer; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.BeanB; -import io.fury.util.LoggerFactory; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; +import org.apache.fury.resolver.MetaContext; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; +import org.apache.fury.util.LoggerFactory; import java.util.List; import org.slf4j.Logger; import org.testng.Assert; diff --git a/java/fury-core/src/test/java/io/fury/builder/ObjectCodecBuilderTest.java b/java/fury-core/src/test/java/io/fury/builder/ObjectCodecBuilderTest.java index 52e9d33555..b03eb9cb0d 100644 --- a/java/fury-core/src/test/java/io/fury/builder/ObjectCodecBuilderTest.java +++ b/java/fury-core/src/test/java/io/fury/builder/ObjectCodecBuilderTest.java @@ -17,26 +17,26 @@ * under the License. */ -package io.fury.builder; +package org.apache.fury.builder; -import static io.fury.collection.Collections.ofArrayList; -import static io.fury.collection.Collections.ofHashMap; +import static org.apache.fury.collection.Collections.ofArrayList; +import static org.apache.fury.collection.Collections.ofHashMap; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.codegen.CodeGenerator; -import io.fury.codegen.CompileUnit; -import io.fury.codegen.JaninoUtils; -import io.fury.config.Language; -import io.fury.serializer.collection.CollectionSerializersTest; -import io.fury.test.bean.AccessBeans; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.BeanB; -import io.fury.test.bean.Foo; -import io.fury.test.bean.Struct; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.codegen.CompileUnit; +import org.apache.fury.codegen.JaninoUtils; +import org.apache.fury.config.Language; +import org.apache.fury.serializer.collection.CollectionSerializersTest; +import org.apache.fury.test.bean.AccessBeans; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; +import org.apache.fury.test.bean.Foo; +import org.apache.fury.test.bean.Struct; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; diff --git a/java/fury-core/src/test/java/io/fury/builder/pkg/AccessLevelClass.java b/java/fury-core/src/test/java/io/fury/builder/pkg/AccessLevelClass.java index 936c9b2880..48dae3809c 100644 --- a/java/fury-core/src/test/java/io/fury/builder/pkg/AccessLevelClass.java +++ b/java/fury-core/src/test/java/io/fury/builder/pkg/AccessLevelClass.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.builder.pkg; +package org.apache.fury.builder.pkg; public class AccessLevelClass { static class PkgLevelClass { diff --git a/java/fury-core/src/test/java/io/fury/codegen/CodeGeneratorTest.java b/java/fury-core/src/test/java/io/fury/codegen/CodeGeneratorTest.java index 53debdb586..e17cc4a28e 100644 --- a/java/fury-core/src/test/java/io/fury/codegen/CodeGeneratorTest.java +++ b/java/fury-core/src/test/java/io/fury/codegen/CodeGeneratorTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import io.fury.Fury; -import io.fury.builder.ObjectCodecBuilder; -import io.fury.collection.MultiKeyWeakMap; -import io.fury.test.bean.Foo; -import io.fury.util.ClassLoaderUtils; -import io.fury.util.ClassLoaderUtils.ByteArrayClassLoader; +import org.apache.fury.Fury; +import org.apache.fury.builder.ObjectCodecBuilder; +import org.apache.fury.collection.MultiKeyWeakMap; +import org.apache.fury.test.bean.Foo; +import org.apache.fury.util.ClassLoaderUtils; +import org.apache.fury.util.ClassLoaderUtils.ByteArrayClassLoader; import java.lang.ref.SoftReference; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/java/fury-core/src/test/java/io/fury/codegen/CodegenContextTest.java b/java/fury-core/src/test/java/io/fury/codegen/CodegenContextTest.java index 00df4317ec..4783db3da2 100644 --- a/java/fury-core/src/test/java/io/fury/codegen/CodegenContextTest.java +++ b/java/fury-core/src/test/java/io/fury/codegen/CodegenContextTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; import com.google.common.reflect.TypeToken; -import io.fury.codegen.Expression.Invoke; -import io.fury.codegen.Expression.Literal; -import io.fury.serializer.Serializer; -import io.fury.type.TypeUtils; +import org.apache.fury.codegen.Expression.Invoke; +import org.apache.fury.codegen.Expression.Literal; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.type.TypeUtils; import java.util.List; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/io/fury/codegen/ExpressionOptimizerTest.java b/java/fury-core/src/test/java/io/fury/codegen/ExpressionOptimizerTest.java index 677fb875e4..f020fd7cfe 100644 --- a/java/fury-core/src/test/java/io/fury/codegen/ExpressionOptimizerTest.java +++ b/java/fury-core/src/test/java/io/fury/codegen/ExpressionOptimizerTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import io.fury.codegen.Expression.Add; -import io.fury.codegen.Expression.Literal; -import io.fury.codegen.Expression.Return; +import org.apache.fury.codegen.Expression.Add; +import org.apache.fury.codegen.Expression.Literal; +import org.apache.fury.codegen.Expression.Return; import java.lang.reflect.Method; import java.util.Arrays; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/io/fury/codegen/ExpressionTest.java b/java/fury-core/src/test/java/io/fury/codegen/ExpressionTest.java index f712d6261b..15546e8d88 100644 --- a/java/fury-core/src/test/java/io/fury/codegen/ExpressionTest.java +++ b/java/fury-core/src/test/java/io/fury/codegen/ExpressionTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; -import static io.fury.type.TypeUtils.PRIMITIVE_SHORT_TYPE; +import static org.apache.fury.type.TypeUtils.PRIMITIVE_SHORT_TYPE; import static org.testng.Assert.assertNull; -import io.fury.codegen.Expression.ListExpression; -import io.fury.codegen.Expression.Literal; -import io.fury.codegen.Expression.Reference; -import io.fury.codegen.Expression.Return; +import org.apache.fury.codegen.Expression.ListExpression; +import org.apache.fury.codegen.Expression.Literal; +import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.codegen.Expression.Return; import org.testng.Assert; import org.testng.annotations.Test; 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 index 8874a83976..5220091e53 100644 --- a/java/fury-core/src/test/java/io/fury/codegen/ExpressionVisitorTest.java +++ b/java/fury-core/src/test/java/io/fury/codegen/ExpressionVisitorTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; import static org.testng.Assert.assertEquals; import com.google.common.reflect.TypeToken; -import io.fury.codegen.Expression.Literal; -import io.fury.util.Preconditions; -import io.fury.util.ReflectionUtils; +import org.apache.fury.codegen.Expression.Literal; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; import java.lang.invoke.SerializedLambda; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/java/fury-core/src/test/java/io/fury/codegen/JaninoUtilsTest.java b/java/fury-core/src/test/java/io/fury/codegen/JaninoUtilsTest.java index b7d1fa67bf..9e98611888 100644 --- a/java/fury-core/src/test/java/io/fury/codegen/JaninoUtilsTest.java +++ b/java/fury-core/src/test/java/io/fury/codegen/JaninoUtilsTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.codegen; +package org.apache.fury.codegen; -import io.fury.test.bean.Struct; -import io.fury.util.ClassLoaderUtils; -import io.fury.util.Platform; -import io.fury.util.ReflectionUtils; +import org.apache.fury.test.bean.Struct; +import org.apache.fury.util.ClassLoaderUtils; +import org.apache.fury.util.Platform; +import org.apache.fury.util.ReflectionUtils; import java.lang.ref.WeakReference; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; diff --git a/java/fury-core/src/test/java/io/fury/collection/CollectionsTest.java b/java/fury-core/src/test/java/io/fury/collection/CollectionsTest.java index 1e7d578106..5c02ccc27d 100644 --- a/java/fury-core/src/test/java/io/fury/collection/CollectionsTest.java +++ b/java/fury-core/src/test/java/io/fury/collection/CollectionsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import static org.testng.Assert.*; diff --git a/java/fury-core/src/test/java/io/fury/collection/FuryObjectMapTest.java b/java/fury-core/src/test/java/io/fury/collection/FuryObjectMapTest.java index bca4bff636..f63e0e0699 100644 --- a/java/fury-core/src/test/java/io/fury/collection/FuryObjectMapTest.java +++ b/java/fury-core/src/test/java/io/fury/collection/FuryObjectMapTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import java.util.HashMap; import java.util.Map; diff --git a/java/fury-core/src/test/java/io/fury/collection/IdentityObjectIntMapTest.java b/java/fury-core/src/test/java/io/fury/collection/IdentityObjectIntMapTest.java index fbb302debc..391b5efefa 100644 --- a/java/fury-core/src/test/java/io/fury/collection/IdentityObjectIntMapTest.java +++ b/java/fury-core/src/test/java/io/fury/collection/IdentityObjectIntMapTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import com.google.common.collect.ImmutableList; import java.util.ArrayList; diff --git a/java/fury-core/src/test/java/io/fury/collection/IntArrayTest.java b/java/fury-core/src/test/java/io/fury/collection/IntArrayTest.java index 3b0d0d3b08..2874b94d58 100644 --- a/java/fury-core/src/test/java/io/fury/collection/IntArrayTest.java +++ b/java/fury-core/src/test/java/io/fury/collection/IntArrayTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import static org.testng.Assert.*; diff --git a/java/fury-core/src/test/java/io/fury/collection/LazyMapTest.java b/java/fury-core/src/test/java/io/fury/collection/LazyMapTest.java index 36ea678307..500a91f447 100644 --- a/java/fury-core/src/test/java/io/fury/collection/LazyMapTest.java +++ b/java/fury-core/src/test/java/io/fury/collection/LazyMapTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.Language; -import io.fury.serializer.collection.MapSerializers; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.serializer.collection.MapSerializers; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; diff --git a/java/fury-core/src/test/java/io/fury/collection/MultiKeyWeakMapTest.java b/java/fury-core/src/test/java/io/fury/collection/MultiKeyWeakMapTest.java index 2d0b56be9d..dcec2790d7 100644 --- a/java/fury-core/src/test/java/io/fury/collection/MultiKeyWeakMapTest.java +++ b/java/fury-core/src/test/java/io/fury/collection/MultiKeyWeakMapTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; -import io.fury.util.LoggerFactory; +import org.apache.fury.util.LoggerFactory; import java.lang.ref.Reference; import java.lang.reflect.Field; import java.util.Set; diff --git a/java/fury-core/src/test/java/io/fury/collection/ObjectArrayTest.java b/java/fury-core/src/test/java/io/fury/collection/ObjectArrayTest.java index 0f3a33ddd0..3c2dc12cc9 100644 --- a/java/fury-core/src/test/java/io/fury/collection/ObjectArrayTest.java +++ b/java/fury-core/src/test/java/io/fury/collection/ObjectArrayTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotSame; diff --git a/java/fury-core/src/test/java/io/fury/collection/ObjectIntMapTest.java b/java/fury-core/src/test/java/io/fury/collection/ObjectIntMapTest.java index 2952be0e92..274d23f313 100644 --- a/java/fury-core/src/test/java/io/fury/collection/ObjectIntMapTest.java +++ b/java/fury-core/src/test/java/io/fury/collection/ObjectIntMapTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import static org.testng.Assert.assertEquals; diff --git a/java/fury-core/src/test/java/io/fury/collection/Tuple2Test.java b/java/fury-core/src/test/java/io/fury/collection/Tuple2Test.java index 767e43c96d..2063594c32 100644 --- a/java/fury-core/src/test/java/io/fury/collection/Tuple2Test.java +++ b/java/fury-core/src/test/java/io/fury/collection/Tuple2Test.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import static org.testng.Assert.*; diff --git a/java/fury-core/src/test/java/io/fury/collection/Tuple3Test.java b/java/fury-core/src/test/java/io/fury/collection/Tuple3Test.java index f5f28aeae7..6c27f8c1b2 100644 --- a/java/fury-core/src/test/java/io/fury/collection/Tuple3Test.java +++ b/java/fury-core/src/test/java/io/fury/collection/Tuple3Test.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.collection; +package org.apache.fury.collection; import static org.testng.Assert.*; diff --git a/java/fury-core/src/test/java/io/fury/io/FuryObjectInputTest.java b/java/fury-core/src/test/java/io/fury/io/FuryObjectInputTest.java index a54f7e9af0..89464cf084 100644 --- a/java/fury-core/src/test/java/io/fury/io/FuryObjectInputTest.java +++ b/java/fury-core/src/test/java/io/fury/io/FuryObjectInputTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.io; +package org.apache.fury.io; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; import java.io.IOException; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/io/fury/io/FuryObjectOutputTest.java b/java/fury-core/src/test/java/io/fury/io/FuryObjectOutputTest.java index 4656195b33..c19771c974 100644 --- a/java/fury-core/src/test/java/io/fury/io/FuryObjectOutputTest.java +++ b/java/fury-core/src/test/java/io/fury/io/FuryObjectOutputTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.io; +package org.apache.fury.io; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import io.fury.Fury; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; import java.io.IOException; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/io/fury/io/MockOutputStreamTest.java b/java/fury-core/src/test/java/io/fury/io/MockOutputStreamTest.java index d976d73a0a..ec9ae0c499 100644 --- a/java/fury-core/src/test/java/io/fury/io/MockOutputStreamTest.java +++ b/java/fury-core/src/test/java/io/fury/io/MockOutputStreamTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.io; +package org.apache.fury.io; import static org.testng.Assert.assertEquals; diff --git a/java/fury-core/src/test/java/io/fury/io/MockWritableByteChannelTest.java b/java/fury-core/src/test/java/io/fury/io/MockWritableByteChannelTest.java index 4c2491cbba..8c355e59cd 100644 --- a/java/fury-core/src/test/java/io/fury/io/MockWritableByteChannelTest.java +++ b/java/fury-core/src/test/java/io/fury/io/MockWritableByteChannelTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.io; +package org.apache.fury.io; import static org.testng.Assert.assertEquals; diff --git a/java/fury-core/src/test/java/io/fury/memory/BitUtilsTest.java b/java/fury-core/src/test/java/io/fury/memory/BitUtilsTest.java index fc63d6dc47..88c2c0b4bd 100644 --- a/java/fury-core/src/test/java/io/fury/memory/BitUtilsTest.java +++ b/java/fury-core/src/test/java/io/fury/memory/BitUtilsTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.memory; +package org.apache.fury.memory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import io.fury.util.StringUtils; +import org.apache.fury.util.StringUtils; import org.testng.annotations.Test; public class BitUtilsTest { diff --git a/java/fury-core/src/test/java/io/fury/memory/MemoryBufferTest.java b/java/fury-core/src/test/java/io/fury/memory/MemoryBufferTest.java index 06df4f3fd9..23fd897a4c 100644 --- a/java/fury-core/src/test/java/io/fury/memory/MemoryBufferTest.java +++ b/java/fury-core/src/test/java/io/fury/memory/MemoryBufferTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.memory; +package org.apache.fury.memory; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import io.fury.util.Platform; +import org.apache.fury.util.Platform; import java.nio.ByteBuffer; import java.util.Random; import org.testng.Assert; diff --git a/java/fury-core/src/test/java/io/fury/resolver/AllowListCheckerTest.java b/java/fury-core/src/test/java/io/fury/resolver/AllowListCheckerTest.java index 20940ad7fc..1b5e68e4a9 100644 --- a/java/fury-core/src/test/java/io/fury/resolver/AllowListCheckerTest.java +++ b/java/fury-core/src/test/java/io/fury/resolver/AllowListCheckerTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; import static org.testng.Assert.*; -import io.fury.Fury; -import io.fury.ThreadLocalFury; -import io.fury.ThreadSafeFury; -import io.fury.exception.InsecureException; +import org.apache.fury.Fury; +import org.apache.fury.ThreadLocalFury; +import org.apache.fury.ThreadSafeFury; +import org.apache.fury.exception.InsecureException; import org.testng.annotations.Test; public class AllowListCheckerTest { @@ -63,9 +63,9 @@ public void testCheckClassWildcard() { fury.getClassResolver().setClassChecker(checker); checker.addListener(fury.getClassResolver()); assertThrows(InsecureException.class, () -> fury.serialize(new AllowListCheckerTest())); - checker.allowClass("io.fury.*"); + checker.allowClass("org.apache.fury.*"); byte[] bytes = fury.serialize(new AllowListCheckerTest()); - checker.disallowClass("io.fury.*"); + checker.disallowClass("org.apache.fury.*"); assertThrows(InsecureException.class, () -> fury.serialize(new AllowListCheckerTest())); assertThrows(InsecureException.class, () -> fury.deserialize(bytes)); } @@ -75,7 +75,7 @@ public void testCheckClassWildcard() { fury.getClassResolver().setClassChecker(checker); checker.addListener(fury.getClassResolver()); byte[] bytes = fury.serialize(new AllowListCheckerTest()); - checker.disallowClass("io.fury.*"); + checker.disallowClass("org.apache.fury.*"); assertThrows(InsecureException.class, () -> fury.serialize(new AllowListCheckerTest())); assertThrows(InsecureException.class, () -> fury.deserialize(bytes)); } @@ -96,9 +96,9 @@ public void testThreadSafeFury() { checker.addListener(f.getClassResolver()); return f; }); - checker.allowClass("io.fury.*"); + checker.allowClass("org.apache.fury.*"); byte[] bytes = fury.serialize(new AllowListCheckerTest()); - checker.disallowClass("io.fury.*"); + checker.disallowClass("org.apache.fury.*"); assertThrows(InsecureException.class, () -> fury.serialize(new AllowListCheckerTest())); assertThrows(InsecureException.class, () -> fury.deserialize(bytes)); } diff --git a/java/fury-core/src/test/java/io/fury/resolver/BlackListTest.java b/java/fury-core/src/test/java/io/fury/resolver/BlackListTest.java index be180a1441..c940657274 100644 --- a/java/fury-core/src/test/java/io/fury/resolver/BlackListTest.java +++ b/java/fury-core/src/test/java/io/fury/resolver/BlackListTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.Language; -import io.fury.exception.InsecureException; -import io.fury.util.Platform; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.exception.InsecureException; +import org.apache.fury.util.Platform; import java.rmi.server.UnicastRemoteObject; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/io/fury/resolver/ClassResolverTest.java b/java/fury-core/src/test/java/io/fury/resolver/ClassResolverTest.java index 40e4feb51b..f889a4ec91 100644 --- a/java/fury-core/src/test/java/io/fury/resolver/ClassResolverTest.java +++ b/java/fury-core/src/test/java/io/fury/resolver/ClassResolverTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; @@ -27,25 +27,25 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Primitives; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.builder.Generated; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.resolver.longlongpkg.C1; -import io.fury.resolver.longlongpkg.C2; -import io.fury.resolver.longlongpkg.C3; -import io.fury.serializer.CompatibleSerializer; -import io.fury.serializer.ObjectSerializer; -import io.fury.serializer.Serializer; -import io.fury.serializer.Serializers; -import io.fury.serializer.collection.CollectionSerializer; -import io.fury.serializer.collection.CollectionSerializers; -import io.fury.serializer.collection.MapSerializers; -import io.fury.test.bean.BeanB; -import io.fury.type.TypeUtils; -import io.fury.util.LoggerFactory; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.builder.Generated; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.resolver.longlongpkg.C1; +import org.apache.fury.resolver.longlongpkg.C2; +import org.apache.fury.resolver.longlongpkg.C3; +import org.apache.fury.serializer.CompatibleSerializer; +import org.apache.fury.serializer.ObjectSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.Serializers; +import org.apache.fury.serializer.collection.CollectionSerializer; +import org.apache.fury.serializer.collection.CollectionSerializers; +import org.apache.fury.serializer.collection.MapSerializers; +import org.apache.fury.test.bean.BeanB; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.LoggerFactory; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; @@ -94,10 +94,10 @@ public void testPrimitivesClassId() { public void testRegisterClass() { Fury fury = Fury.builder().withLanguage(Language.JAVA).requireClassRegistration(false).build(); ClassResolver classResolver = fury.getClassResolver(); - classResolver.register(io.fury.test.bean.Foo.class); + classResolver.register(org.apache.fury.test.bean.Foo.class); Assert.assertThrows( IllegalArgumentException.class, - () -> classResolver.register(io.fury.test.bean.Foo.createCompatibleClass1())); + () -> classResolver.register(org.apache.fury.test.bean.Foo.createCompatibleClass1())); classResolver.register(Interface1.class, 200); Assert.assertThrows( IllegalArgumentException.class, () -> classResolver.register(Interface2.class, 200)); @@ -163,11 +163,11 @@ public void testGetSerializerClass() throws ClassNotFoundException { MapSerializers.ConcurrentHashMapSerializer.class); assertEquals( classResolver.getSerializerClass( - Class.forName("io.fury.serializer.collection.CollectionContainer")), + Class.forName("org.apache.fury.serializer.collection.CollectionContainer")), CollectionSerializers.DefaultJavaCollectionSerializer.class); assertEquals( classResolver.getSerializerClass( - Class.forName("io.fury.serializer.collection.MapContainer")), + Class.forName("org.apache.fury.serializer.collection.MapContainer")), MapSerializers.DefaultJavaMapSerializer.class); } @@ -230,8 +230,8 @@ public void testWriteClassName() { classResolver.reset(); buffer.writerIndex(0); buffer.readerIndex(0); - List fooList = - Arrays.asList(io.fury.test.bean.Foo.create(), io.fury.test.bean.Foo.create()); + List fooList = + Arrays.asList(org.apache.fury.test.bean.Foo.create(), org.apache.fury.test.bean.Foo.create()); Assert.assertEquals(fury.deserialize(fury.serialize(fooList)), fooList); Assert.assertEquals(fury.deserialize(fury.serialize(fooList)), fooList); } diff --git a/java/fury-core/src/test/java/io/fury/resolver/EnumStringResolverTest.java b/java/fury-core/src/test/java/io/fury/resolver/EnumStringResolverTest.java index 5ee639b90e..9b45b38f2d 100644 --- a/java/fury-core/src/test/java/io/fury/resolver/EnumStringResolverTest.java +++ b/java/fury-core/src/test/java/io/fury/resolver/EnumStringResolverTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.util.StringUtils; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.util.StringUtils; import org.testng.annotations.Test; public class EnumStringResolverTest { diff --git a/java/fury-core/src/test/java/io/fury/resolver/FieldResolverTest.java b/java/fury-core/src/test/java/io/fury/resolver/FieldResolverTest.java index a85b670f55..b1138a6d8c 100644 --- a/java/fury-core/src/test/java/io/fury/resolver/FieldResolverTest.java +++ b/java/fury-core/src/test/java/io/fury/resolver/FieldResolverTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; -import static io.fury.resolver.FieldResolver.FieldInfo; -import static io.fury.resolver.FieldResolver.computeStringHash; -import static io.fury.resolver.FieldResolver.decodeLongAsString; -import static io.fury.resolver.FieldResolver.encodeFieldNameAsLong; -import static io.fury.resolver.FieldResolver.encodingBytesLength; -import static io.fury.resolver.FieldResolver.of; +import static org.apache.fury.resolver.FieldResolver.FieldInfo; +import static org.apache.fury.resolver.FieldResolver.computeStringHash; +import static org.apache.fury.resolver.FieldResolver.decodeLongAsString; +import static org.apache.fury.resolver.FieldResolver.encodeFieldNameAsLong; +import static org.apache.fury.resolver.FieldResolver.encodingBytesLength; +import static org.apache.fury.resolver.FieldResolver.of; -import io.fury.Fury; -import io.fury.config.Language; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/java/fury-core/src/test/java/io/fury/resolver/MapRefResolverTest.java b/java/fury-core/src/test/java/io/fury/resolver/MapRefResolverTest.java index dfc856e322..d3c041bc26 100644 --- a/java/fury-core/src/test/java/io/fury/resolver/MapRefResolverTest.java +++ b/java/fury-core/src/test/java/io/fury/resolver/MapRefResolverTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryBuffer; import java.util.Map; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/io/fury/resolver/MetaContextTest.java b/java/fury-core/src/test/java/io/fury/resolver/MetaContextTest.java index 8c3a756688..ee1893b061 100644 --- a/java/fury-core/src/test/java/io/fury/resolver/MetaContextTest.java +++ b/java/fury-core/src/test/java/io/fury/resolver/MetaContextTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; import com.google.common.collect.ImmutableList; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.CompatibleMode; -import io.fury.config.Language; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.BeanB; -import io.fury.test.bean.Foo; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; +import org.apache.fury.test.bean.Foo; import java.util.ArrayList; import java.util.List; import lombok.AllArgsConstructor; diff --git a/java/fury-core/src/test/java/io/fury/resolver/NoRefResolverTest.java b/java/fury-core/src/test/java/io/fury/resolver/NoRefResolverTest.java index b0f3d4bdd1..c1af3beeb5 100644 --- a/java/fury-core/src/test/java/io/fury/resolver/NoRefResolverTest.java +++ b/java/fury-core/src/test/java/io/fury/resolver/NoRefResolverTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; import static org.testng.Assert.*; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryBuffer; import org.testng.annotations.Test; public class NoRefResolverTest { diff --git a/java/fury-core/src/test/java/io/fury/resolver/SerializationContextTest.java b/java/fury-core/src/test/java/io/fury/resolver/SerializationContextTest.java index 5a620f21df..f67d25f4f0 100644 --- a/java/fury-core/src/test/java/io/fury/resolver/SerializationContextTest.java +++ b/java/fury-core/src/test/java/io/fury/resolver/SerializationContextTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.resolver; +package org.apache.fury.resolver; import static org.testng.Assert.*; diff --git a/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C1.java b/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C1.java index 518bf0c58f..df90ac9d1f 100644 --- a/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C1.java +++ b/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C1.java @@ -17,6 +17,6 @@ * under the License. */ -package io.fury.resolver.longlongpkg; +package org.apache.fury.resolver.longlongpkg; public class C1 {} diff --git a/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C2.java b/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C2.java index 62d4b9e40c..12803a5837 100644 --- a/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C2.java +++ b/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C2.java @@ -17,6 +17,6 @@ * under the License. */ -package io.fury.resolver.longlongpkg; +package org.apache.fury.resolver.longlongpkg; public class C2 {} diff --git a/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C3.java b/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C3.java index 90500a380b..c23269e0b8 100644 --- a/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C3.java +++ b/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C3.java @@ -17,6 +17,6 @@ * under the License. */ -package io.fury.resolver.longlongpkg; +package org.apache.fury.resolver.longlongpkg; public class C3 {} diff --git a/java/fury-core/src/test/java/io/fury/serializer/ArraySerializersTest.java b/java/fury-core/src/test/java/io/fury/serializer/ArraySerializersTest.java index 67824a9a02..46b2d7bbbc 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/ArraySerializersTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/ArraySerializersTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.FuryBuilder; -import io.fury.config.Language; -import io.fury.test.bean.ArraysData; -import io.fury.type.Descriptor; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.config.Language; +import org.apache.fury.test.bean.ArraysData; +import org.apache.fury.type.Descriptor; +import org.apache.fury.util.ReflectionUtils; import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; diff --git a/java/fury-core/src/test/java/io/fury/serializer/BufferSerializersTest.java b/java/fury-core/src/test/java/io/fury/serializer/BufferSerializersTest.java index f584b01749..509aea77d5 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/BufferSerializersTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/BufferSerializersTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.FuryTestBase; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; import java.nio.ByteBuffer; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/io/fury/serializer/ClassUtils.java b/java/fury-core/src/test/java/io/fury/serializer/ClassUtils.java index 3603d1f2a6..ebe0008f5a 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/ClassUtils.java +++ b/java/fury-core/src/test/java/io/fury/serializer/ClassUtils.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.CollectionFields; -import io.fury.test.bean.MapFields; -import io.fury.test.bean.Struct; -import io.fury.util.ClassLoaderUtils; -import io.fury.util.ReflectionUtils; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.CollectionFields; +import org.apache.fury.test.bean.MapFields; +import org.apache.fury.test.bean.Struct; +import org.apache.fury.util.ClassLoaderUtils; +import org.apache.fury.util.ReflectionUtils; import java.io.ByteArrayOutputStream; import java.net.URL; import java.nio.file.Files; diff --git a/java/fury-core/src/test/java/io/fury/serializer/CodegenCompatibleSerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/CodegenCompatibleSerializerTest.java index d20e511fc7..1217d15f8e 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/CodegenCompatibleSerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/CodegenCompatibleSerializerTest.java @@ -17,23 +17,23 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import static io.fury.serializer.ClassUtils.loadClass; +import static org.apache.fury.serializer.ClassUtils.loadClass; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.CompatibleMode; -import io.fury.config.Language; -import io.fury.serializer.collection.UnmodifiableSerializersTest; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.BeanB; -import io.fury.test.bean.CollectionFields; -import io.fury.test.bean.Foo; -import io.fury.test.bean.MapFields; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; +import org.apache.fury.serializer.collection.UnmodifiableSerializersTest; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; +import org.apache.fury.test.bean.CollectionFields; +import org.apache.fury.test.bean.Foo; +import org.apache.fury.test.bean.MapFields; +import org.apache.fury.util.ReflectionUtils; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/java/fury-core/src/test/java/io/fury/serializer/CodegenSerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/CodegenSerializerTest.java index 4d2431e805..9945d0c2b0 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/CodegenSerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/CodegenSerializerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertSame; @@ -25,13 +25,13 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.CompatibleMode; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.test.bean.Cyclic; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.test.bean.Cyclic; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/java/fury-core/src/test/java/io/fury/serializer/CompatibleSerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/CompatibleSerializerTest.java index 8b0378de8a..72d9d9b059 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/CompatibleSerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/CompatibleSerializerTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.CompatibleMode; -import io.fury.config.Language; -import io.fury.serializer.collection.UnmodifiableSerializersTest; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.BeanB; -import io.fury.test.bean.CollectionFields; -import io.fury.test.bean.Foo; -import io.fury.test.bean.MapFields; -import io.fury.test.bean.Struct; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; +import org.apache.fury.serializer.collection.UnmodifiableSerializersTest; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; +import org.apache.fury.test.bean.CollectionFields; +import org.apache.fury.test.bean.Foo; +import org.apache.fury.test.bean.MapFields; +import org.apache.fury.test.bean.Struct; +import org.apache.fury.util.ReflectionUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/java/fury-core/src/test/java/io/fury/serializer/DuplicateFieldsTest.java b/java/fury-core/src/test/java/io/fury/serializer/DuplicateFieldsTest.java index b81bad0068..8b38150bc6 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/DuplicateFieldsTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/DuplicateFieldsTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static org.testng.Assert.assertEquals; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.builder.CodecUtils; -import io.fury.config.CompatibleMode; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.builder.CodecUtils; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; import lombok.EqualsAndHashCode; import lombok.ToString; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/io/fury/serializer/ExternalizableSerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/ExternalizableSerializerTest.java index e67092266b..d1f3602a19 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/ExternalizableSerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/ExternalizableSerializerTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static org.testng.Assert.assertEquals; -import io.fury.Fury; -import io.fury.config.Language; -import io.fury.serializer.test.Factory; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.serializer.test.Factory; import java.io.Externalizable; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/io/fury/serializer/ForwardSerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/ForwardSerializerTest.java index 3425333069..0078e530ca 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/ForwardSerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/ForwardSerializerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -28,10 +28,10 @@ import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import io.fury.Fury; -import io.fury.codegen.CompileUnit; -import io.fury.codegen.JaninoUtils; -import io.fury.test.bean.BeanA; +import org.apache.fury.Fury; +import org.apache.fury.codegen.CompileUnit; +import org.apache.fury.codegen.JaninoUtils; +import org.apache.fury.test.bean.BeanA; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; diff --git a/java/fury-core/src/test/java/io/fury/serializer/JavaSerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/JavaSerializerTest.java index 09b50d1fdc..729beeaec0 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/JavaSerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/JavaSerializerTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; diff --git a/java/fury-core/src/test/java/io/fury/serializer/JdkProxySerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/JdkProxySerializerTest.java index 12b1d1e830..4d0920e402 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/JdkProxySerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/JdkProxySerializerTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static org.testng.Assert.assertEquals; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.Language; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; import java.io.Serializable; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; diff --git a/java/fury-core/src/test/java/io/fury/serializer/LambdaSerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/LambdaSerializerTest.java index fbf4d7b457..c63061d269 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/LambdaSerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/LambdaSerializerTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertSame; import static org.testng.Assert.assertThrows; import static org.testng.Assert.assertTrue; -import io.fury.Fury; -import io.fury.FuryTestBase; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; import java.io.Serializable; import java.util.Arrays; import java.util.List; diff --git a/java/fury-core/src/test/java/io/fury/serializer/LocaleSerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/LocaleSerializerTest.java index caf9f2729d..0410d6a5d3 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/LocaleSerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/LocaleSerializerTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.Language; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; import java.util.Locale; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/io/fury/serializer/MetaSharedCompatibleTest.java b/java/fury-core/src/test/java/io/fury/serializer/MetaSharedCompatibleTest.java index b834d1abfe..8a979528e3 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/MetaSharedCompatibleTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/MetaSharedCompatibleTest.java @@ -17,25 +17,25 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import static io.fury.serializer.ClassUtils.loadClass; +import static org.apache.fury.serializer.ClassUtils.loadClass; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.builder.MetaSharedCodecBuilder; -import io.fury.config.CompatibleMode; -import io.fury.config.Language; -import io.fury.resolver.MetaContext; -import io.fury.serializer.collection.UnmodifiableSerializersTest; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.BeanB; -import io.fury.test.bean.CollectionFields; -import io.fury.test.bean.Foo; -import io.fury.test.bean.MapFields; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.builder.MetaSharedCodecBuilder; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; +import org.apache.fury.resolver.MetaContext; +import org.apache.fury.serializer.collection.UnmodifiableSerializersTest; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; +import org.apache.fury.test.bean.CollectionFields; +import org.apache.fury.test.bean.Foo; +import org.apache.fury.test.bean.MapFields; +import org.apache.fury.util.ReflectionUtils; import java.lang.reflect.Field; import java.util.Arrays; import java.util.HashSet; 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 index 636f06c8d1..5f86d557f9 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/ObjectSerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/ObjectSerializerTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static org.testng.Assert.assertEquals; -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 org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.test.bean.Cyclic; +import org.apache.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 index da7de332c8..d6bdd6bb4c 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/ObjectStreamSerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/ObjectStreamSerializerTest.java @@ -17,18 +17,18 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertSame; 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 org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.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/OptionalSerializersTest.java b/java/fury-core/src/test/java/io/fury/serializer/OptionalSerializersTest.java index 441434f507..0809b23c59 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/OptionalSerializersTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/OptionalSerializersTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.Language; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; import java.util.Optional; import java.util.OptionalDouble; import java.util.OptionalInt; diff --git a/java/fury-core/src/test/java/io/fury/serializer/PrimitiveSerializersTest.java b/java/fury-core/src/test/java/io/fury/serializer/PrimitiveSerializersTest.java index 6482a9cfd6..e7d56cf3c5 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/PrimitiveSerializersTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/PrimitiveSerializersTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static org.testng.Assert.*; -import io.fury.Fury; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; import org.testng.annotations.Test; public class PrimitiveSerializersTest { diff --git a/java/fury-core/src/test/java/io/fury/serializer/ProtocolInteroperabilityTest.java b/java/fury-core/src/test/java/io/fury/serializer/ProtocolInteroperabilityTest.java index 07fdcc1fa6..855436d376 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/ProtocolInteroperabilityTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/ProtocolInteroperabilityTest.java @@ -17,24 +17,24 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static com.google.common.collect.ImmutableList.of; -import static io.fury.TestUtils.mapOf; -import static io.fury.collection.Collections.ofArrayList; +import static org.apache.fury.TestUtils.mapOf; +import static org.apache.fury.collection.Collections.ofArrayList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.CompatibleMode; -import io.fury.config.Language; -import io.fury.resolver.MetaContext; -import io.fury.serializer.collection.CollectionSerializersTest; -import io.fury.serializer.collection.MapSerializersTest; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.BeanB; -import io.fury.test.bean.MapFields; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; +import org.apache.fury.resolver.MetaContext; +import org.apache.fury.serializer.collection.CollectionSerializersTest; +import org.apache.fury.serializer.collection.MapSerializersTest; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; +import org.apache.fury.test.bean.MapFields; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; 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 index 8a3f4bdf42..26243545d4 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/ReplaceResolveSerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/ReplaceResolveSerializerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertSame; @@ -26,10 +26,10 @@ 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 org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.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/SerializerFactoryTest.java b/java/fury-core/src/test/java/io/fury/serializer/SerializerFactoryTest.java index bae404c78c..c9cbf06d12 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/SerializerFactoryTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/SerializerFactoryTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.KryoSerializable; import com.esotericsoftware.kryo.io.ByteBufferInput; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import io.fury.Fury; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; import lombok.Data; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/io/fury/serializer/SerializersTest.java b/java/fury-core/src/test/java/io/fury/serializer/SerializersTest.java index 1291365f08..9782312193 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/SerializersTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/SerializersTest.java @@ -17,16 +17,16 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.FuryBuilder; -import io.fury.config.Language; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.config.Language; import java.math.BigDecimal; import java.math.BigInteger; import java.net.URI; 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 index de6be42fbe..a763084003 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/StringSerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/StringSerializerTest.java @@ -17,23 +17,23 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import static io.fury.serializer.StringSerializer.newBytesStringZeroCopy; +import static org.apache.fury.serializer.StringSerializer.newBytesStringZeroCopy; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.collection.Tuple2; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.util.MathUtils; -import io.fury.util.Platform; -import io.fury.util.ReflectionUtils; -import io.fury.util.StringUtils; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.util.MathUtils; +import org.apache.fury.util.Platform; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; import java.lang.reflect.Field; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/java/fury-core/src/test/java/io/fury/serializer/TimeSerializersTest.java b/java/fury-core/src/test/java/io/fury/serializer/TimeSerializersTest.java index af01e4c729..c05405ef4f 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/TimeSerializersTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/TimeSerializersTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.Language; -import io.fury.util.DateTimeUtils; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.util.DateTimeUtils; import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; diff --git a/java/fury-core/src/test/java/io/fury/serializer/URLSerializerTest.java b/java/fury-core/src/test/java/io/fury/serializer/URLSerializerTest.java index e35bf63dd1..d7e78977ad 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/URLSerializerTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/URLSerializerTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; -import io.fury.Fury; -import io.fury.FuryTestBase; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; import java.net.MalformedURLException; import java.net.URL; import org.testng.Assert; diff --git a/java/fury-core/src/test/java/io/fury/serializer/UnexistedClassSerializersTest.java b/java/fury-core/src/test/java/io/fury/serializer/UnexistedClassSerializersTest.java index e89b91c06f..1c95b35c6d 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/UnexistedClassSerializersTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/UnexistedClassSerializersTest.java @@ -17,19 +17,19 @@ * under the License. */ -package io.fury.serializer; +package org.apache.fury.serializer; import static org.testng.Assert.assertEquals; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.CompatibleMode; -import io.fury.config.FuryBuilder; -import io.fury.config.Language; -import io.fury.resolver.MetaContext; -import io.fury.test.bean.Struct; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.config.Language; +import org.apache.fury.resolver.MetaContext; +import org.apache.fury.test.bean.Struct; import java.util.List; import org.testng.Assert; import org.testng.annotations.DataProvider; diff --git a/java/fury-core/src/test/java/io/fury/serializer/collection/ChildContainerSerializersTest.java b/java/fury-core/src/test/java/io/fury/serializer/collection/ChildContainerSerializersTest.java index 879837c187..057d3211d9 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/collection/ChildContainerSerializersTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/collection/ChildContainerSerializersTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.CompatibleMode; -import io.fury.config.Language; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.HashMap; 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 index 46824820f6..b3a44611d2 100644 --- 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 @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; -import static io.fury.collection.Collections.ofArrayList; -import static io.fury.collection.Collections.ofHashMap; +import static org.apache.fury.collection.Collections.ofArrayList; +import static org.apache.fury.collection.Collections.ofHashMap; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertSame; @@ -28,13 +28,13 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.Language; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.serializer.collection.CollectionSerializers.JDKCompatibleCollectionSerializer; -import io.fury.type.GenericType; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.collection.CollectionSerializers.JDKCompatibleCollectionSerializer; +import org.apache.fury.type.GenericType; import java.io.Serializable; import java.util.AbstractCollection; import java.util.ArrayDeque; diff --git a/java/fury-core/src/test/java/io/fury/serializer/collection/GuavaCollectionSerializersTest.java b/java/fury-core/src/test/java/io/fury/serializer/collection/GuavaCollectionSerializersTest.java index e573b521f7..5a97463643 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/collection/GuavaCollectionSerializersTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/collection/GuavaCollectionSerializersTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableList; @@ -25,9 +25,9 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.ImmutableSortedSet; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.config.Language; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/io/fury/serializer/collection/MapSerializersTest.java b/java/fury-core/src/test/java/io/fury/serializer/collection/MapSerializersTest.java index 6ccfe9bdad..b054889748 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/collection/MapSerializersTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/collection/MapSerializersTest.java @@ -17,22 +17,22 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; import static com.google.common.collect.ImmutableList.of; -import static io.fury.TestUtils.mapOf; -import static io.fury.collection.Collections.ofArrayList; +import static org.apache.fury.TestUtils.mapOf; +import static org.apache.fury.collection.Collections.ofArrayList; import static org.testng.Assert.assertEquals; import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.collection.MapEntry; -import io.fury.config.Language; -import io.fury.serializer.collection.CollectionSerializersTest.TestEnum; -import io.fury.test.bean.MapFields; -import io.fury.type.GenericType; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.collection.MapEntry; +import org.apache.fury.config.Language; +import org.apache.fury.serializer.collection.CollectionSerializersTest.TestEnum; +import org.apache.fury.test.bean.MapFields; +import org.apache.fury.type.GenericType; import java.io.Serializable; import java.util.AbstractMap; import java.util.ArrayList; diff --git a/java/fury-core/src/test/java/io/fury/serializer/collection/SynchronizedSerializersTest.java b/java/fury-core/src/test/java/io/fury/serializer/collection/SynchronizedSerializersTest.java index 01f563100b..589f528c0c 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/collection/SynchronizedSerializersTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/collection/SynchronizedSerializersTest.java @@ -17,21 +17,21 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; 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.memory.MemoryUtils; -import io.fury.serializer.Serializer; -import io.fury.test.bean.CollectionFields; -import io.fury.util.Platform; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.test.bean.CollectionFields; +import org.apache.fury.util.Platform; +import org.apache.fury.util.ReflectionUtils; import java.util.Arrays; import java.util.Collection; import java.util.Collections; diff --git a/java/fury-core/src/test/java/io/fury/serializer/collection/UnmodifiableSerializersTest.java b/java/fury-core/src/test/java/io/fury/serializer/collection/UnmodifiableSerializersTest.java index e9fbcba171..8ff67ef244 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/collection/UnmodifiableSerializersTest.java +++ b/java/fury-core/src/test/java/io/fury/serializer/collection/UnmodifiableSerializersTest.java @@ -17,23 +17,23 @@ * under the License. */ -package io.fury.serializer.collection; +package org.apache.fury.serializer.collection; -import static io.fury.serializer.collection.UnmodifiableSerializers.createSerializer; +import static org.apache.fury.serializer.collection.UnmodifiableSerializers.createSerializer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; 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.memory.MemoryUtils; -import io.fury.serializer.Serializer; -import io.fury.test.bean.CollectionFields; -import io.fury.test.bean.MapFields; -import io.fury.util.Platform; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.test.bean.CollectionFields; +import org.apache.fury.test.bean.MapFields; +import org.apache.fury.util.Platform; +import org.apache.fury.util.ReflectionUtils; import java.util.Arrays; import java.util.Collection; import java.util.Collections; diff --git a/java/fury-core/src/test/java/io/fury/serializer/test/Factory.java b/java/fury-core/src/test/java/io/fury/serializer/test/Factory.java index ee8608f293..2428292e8d 100644 --- a/java/fury-core/src/test/java/io/fury/serializer/test/Factory.java +++ b/java/fury-core/src/test/java/io/fury/serializer/test/Factory.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.serializer.test; +package org.apache.fury.serializer.test; import java.io.Externalizable; 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 index b94d07d8d1..b6ea6e7355 100644 --- 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 @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.serializer.test; +package org.apache.fury.serializer.test; -import io.fury.util.Preconditions; +import org.apache.fury.util.Preconditions; import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; @@ -27,7 +27,7 @@ import lombok.Data; /** - * Package-private class for testing {@link io.fury.serializer.ExternalizableSerializer} when the + * Package-private class for testing {@link org.apache.fury.serializer.ExternalizableSerializer} when the * serialized class is inaccessible to the serializer. */ @Data diff --git a/java/fury-core/src/test/java/io/fury/type/ClassDefTest.java b/java/fury-core/src/test/java/io/fury/type/ClassDefTest.java index 5caa375dec..f0269d9401 100644 --- a/java/fury-core/src/test/java/io/fury/type/ClassDefTest.java +++ b/java/fury-core/src/test/java/io/fury/type/ClassDefTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.type; +package org.apache.fury.type; import static org.testng.Assert.assertEquals; import com.google.common.collect.ImmutableList; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.memory.MemoryBuffer; -import io.fury.util.ReflectionUtils; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.ReflectionUtils; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; diff --git a/java/fury-core/src/test/java/io/fury/type/DescriptorGrouperTest.java b/java/fury-core/src/test/java/io/fury/type/DescriptorGrouperTest.java index 9c3fd0938d..69861f0f40 100644 --- a/java/fury-core/src/test/java/io/fury/type/DescriptorGrouperTest.java +++ b/java/fury-core/src/test/java/io/fury/type/DescriptorGrouperTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.type; +package org.apache.fury.type; import static org.testng.Assert.*; diff --git a/java/fury-core/src/test/java/io/fury/type/DescriptorTest.java b/java/fury-core/src/test/java/io/fury/type/DescriptorTest.java index a1354eb4b0..0fedc2adbb 100644 --- a/java/fury-core/src/test/java/io/fury/type/DescriptorTest.java +++ b/java/fury-core/src/test/java/io/fury/type/DescriptorTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.type; +package org.apache.fury.type; import com.google.common.reflect.TypeToken; -import io.fury.codegen.CodeGenerator; -import io.fury.test.bean.BeanA; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.test.bean.BeanA; import java.beans.IntrospectionException; import java.beans.Introspector; import java.lang.reflect.Field; diff --git a/java/fury-core/src/test/java/io/fury/type/GenericsTest.java b/java/fury-core/src/test/java/io/fury/type/GenericsTest.java index b57169a53d..d71270b374 100644 --- a/java/fury-core/src/test/java/io/fury/type/GenericsTest.java +++ b/java/fury-core/src/test/java/io/fury/type/GenericsTest.java @@ -17,13 +17,13 @@ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package io.fury.type; +package org.apache.fury.type; import com.google.common.collect.ImmutableList; -import io.fury.Fury; -import io.fury.FuryTestBase; -import io.fury.TestUtils; -import io.fury.config.Language; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.TestUtils; +import org.apache.fury.config.Language; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/java/fury-core/src/test/java/io/fury/type/TypeUtilsTest.java b/java/fury-core/src/test/java/io/fury/type/TypeUtilsTest.java index b49ccc310d..83e79ac026 100644 --- a/java/fury-core/src/test/java/io/fury/type/TypeUtilsTest.java +++ b/java/fury-core/src/test/java/io/fury/type/TypeUtilsTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.type; +package org.apache.fury.type; import static org.testng.Assert.assertEquals; import com.google.common.collect.ImmutableList; import com.google.common.reflect.TypeToken; -import io.fury.collection.Tuple2; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.BeanB; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; import java.lang.reflect.Type; import java.util.AbstractList; import java.util.ArrayList; diff --git a/java/fury-core/src/test/java/io/fury/util/ClassLoaderUtilsTest.java b/java/fury-core/src/test/java/io/fury/util/ClassLoaderUtilsTest.java index 51eb01f389..f307d2417c 100644 --- a/java/fury-core/src/test/java/io/fury/util/ClassLoaderUtilsTest.java +++ b/java/fury-core/src/test/java/io/fury/util/ClassLoaderUtilsTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; -import io.fury.Fury; -import io.fury.codegen.CompileUnit; -import io.fury.codegen.JaninoUtils; -import io.fury.config.Language; +import org.apache.fury.Fury; +import org.apache.fury.codegen.CompileUnit; +import org.apache.fury.codegen.JaninoUtils; +import org.apache.fury.config.Language; import java.io.StringReader; import org.codehaus.janino.SimpleCompiler; import org.testng.Assert; diff --git a/java/fury-core/src/test/java/io/fury/util/DecimalUtilsTest.java b/java/fury-core/src/test/java/io/fury/util/DecimalUtilsTest.java index 11eb3eb9f5..e9dfcbb622 100644 --- a/java/fury-core/src/test/java/io/fury/util/DecimalUtilsTest.java +++ b/java/fury-core/src/test/java/io/fury/util/DecimalUtilsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/io/fury/util/FunctionsTest.java b/java/fury-core/src/test/java/io/fury/util/FunctionsTest.java index 5852f1c4b3..4702bc5fe7 100644 --- a/java/fury-core/src/test/java/io/fury/util/FunctionsTest.java +++ b/java/fury-core/src/test/java/io/fury/util/FunctionsTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; -import io.fury.util.function.Functions; -import io.fury.util.function.SerializableFunction; -import io.fury.util.function.SerializableTriFunction; -import io.fury.util.function.TriFunction; +import org.apache.fury.util.function.Functions; +import org.apache.fury.util.function.SerializableFunction; +import org.apache.fury.util.function.SerializableTriFunction; +import org.apache.fury.util.function.TriFunction; import java.util.ArrayList; import java.util.Collections; import java.util.function.Consumer; diff --git a/java/fury-core/src/test/java/io/fury/util/MurmurHash3Test.java b/java/fury-core/src/test/java/io/fury/util/MurmurHash3Test.java index c84ea802d2..fb2f513778 100644 --- a/java/fury-core/src/test/java/io/fury/util/MurmurHash3Test.java +++ b/java/fury-core/src/test/java/io/fury/util/MurmurHash3Test.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; import com.google.common.hash.Hashing; import java.util.Random; diff --git a/java/fury-core/src/test/java/io/fury/util/PlatformTest.java b/java/fury-core/src/test/java/io/fury/util/PlatformTest.java index f1cc01951d..d18588da3b 100644 --- a/java/fury-core/src/test/java/io/fury/util/PlatformTest.java +++ b/java/fury-core/src/test/java/io/fury/util/PlatformTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/java/fury-core/src/test/java/io/fury/util/ReflectionUtilsTest.java b/java/fury-core/src/test/java/io/fury/util/ReflectionUtilsTest.java index a26286c922..b26c129550 100644 --- a/java/fury-core/src/test/java/io/fury/util/ReflectionUtilsTest.java +++ b/java/fury-core/src/test/java/io/fury/util/ReflectionUtilsTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import com.google.common.collect.ImmutableList; -import io.fury.test.bean.BeanA; -import io.fury.type.Descriptor; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.type.Descriptor; import java.util.List; import org.testng.annotations.Test; 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 index d993e516bc..440522f18d 100644 --- a/java/fury-core/src/test/java/io/fury/util/StringUtilsTest.java +++ b/java/fury-core/src/test/java/io/fury/util/StringUtilsTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/java/fury-core/src/test/java/io/fury/util/UnsafeFieldAccessorTest.java b/java/fury-core/src/test/java/io/fury/util/UnsafeFieldAccessorTest.java index 76f976d15e..93bde5deaa 100644 --- a/java/fury-core/src/test/java/io/fury/util/UnsafeFieldAccessorTest.java +++ b/java/fury-core/src/test/java/io/fury/util/UnsafeFieldAccessorTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.util; +package org.apache.fury.util; import static org.testng.Assert.assertEquals; diff --git a/java/fury-core/src/test/java/io/fury/util/unsafe/JDKAccessTest.java b/java/fury-core/src/test/java/io/fury/util/unsafe/JDKAccessTest.java index 9e124373b5..aa8795ef92 100644 --- a/java/fury-core/src/test/java/io/fury/util/unsafe/JDKAccessTest.java +++ b/java/fury-core/src/test/java/io/fury/util/unsafe/JDKAccessTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.util.unsafe; +package org.apache.fury.util.unsafe; -import io.fury.util.Platform; +import org.apache.fury.util.Platform; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; diff --git a/java/fury-format/pom.xml b/java/fury-format/pom.xml index f7bab80222..ddabfd6ae4 100644 --- a/java/fury-format/pom.xml +++ b/java/fury-format/pom.xml @@ -140,15 +140,15 @@ org.codehaus - io.fury.shaded.org.codehaus + org.apache.fury.shaded.org.codehaus org.apache.arrow - io.fury.shaded.org.apache.arrow + org.apache.fury.shaded.org.apache.arrow io.netty - io.fury.shaded.io.netty + org.apache.fury.shaded.io.netty 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 index 4715964082..7192cf36e8 100644 --- 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 @@ -17,27 +17,27 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import io.fury.annotation.Internal; -import io.fury.codegen.ClosureVisitable; -import io.fury.codegen.Code; -import io.fury.codegen.CodeGenerator; -import io.fury.codegen.CodegenContext; -import io.fury.codegen.Expression; -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; +import org.apache.fury.annotation.Internal; +import org.apache.fury.codegen.ClosureVisitable; +import org.apache.fury.codegen.Code; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.codegen.CodegenContext; +import org.apache.fury.codegen.Expression; +import org.apache.fury.format.row.binary.BinaryArray; +import org.apache.fury.format.row.binary.BinaryUtils; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.StringUtils; +import org.apache.fury.util.function.SerializableBiFunction; +import org.apache.fury.util.function.SerializableFunction; /** - * Expression for iterate {@link io.fury.format.row.ArrayData} with specified not null element + * Expression for iterate {@link org.apache.fury.format.row.ArrayData} with specified not null element * action expression and null element action expression. * * @author chaokunyang diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/ArrayEncoder.java b/java/fury-format/src/main/java/io/fury/format/encoder/ArrayEncoder.java index 8eeba9de01..cd92274b85 100644 --- a/java/fury-format/src/main/java/io/fury/format/encoder/ArrayEncoder.java +++ b/java/fury-format/src/main/java/io/fury/format/encoder/ArrayEncoder.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; -import io.fury.format.row.binary.BinaryArray; +import org.apache.fury.format.row.binary.BinaryArray; import org.apache.arrow.vector.types.pojo.Field; /** diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/ArrayEncoderBuilder.java b/java/fury-format/src/main/java/io/fury/format/encoder/ArrayEncoderBuilder.java index 2b2af3a763..c90321b99a 100644 --- a/java/fury-format/src/main/java/io/fury/format/encoder/ArrayEncoderBuilder.java +++ b/java/fury-format/src/main/java/io/fury/format/encoder/ArrayEncoderBuilder.java @@ -17,23 +17,23 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; -import static io.fury.type.TypeUtils.CLASS_TYPE; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.type.TypeUtils.CLASS_TYPE; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.codegen.CodeGenerator; -import io.fury.codegen.CodegenContext; -import io.fury.codegen.Expression; -import io.fury.codegen.ExpressionUtils; -import io.fury.format.row.binary.BinaryArray; -import io.fury.format.row.binary.writer.BinaryArrayWriter; -import io.fury.format.type.TypeInference; -import io.fury.type.TypeUtils; -import io.fury.util.LoggerFactory; -import io.fury.util.StringUtils; +import org.apache.fury.Fury; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.codegen.CodegenContext; +import org.apache.fury.codegen.Expression; +import org.apache.fury.codegen.ExpressionUtils; +import org.apache.fury.format.row.binary.BinaryArray; +import org.apache.fury.format.row.binary.writer.BinaryArrayWriter; +import org.apache.fury.format.type.TypeInference; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.StringUtils; import org.apache.arrow.vector.types.pojo.Field; import org.slf4j.Logger; 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 index 33f42aa674..47e3f1585d 100644 --- 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 @@ -17,48 +17,48 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import io.fury.builder.CodecBuilder; -import io.fury.codegen.CodeGenerator; -import io.fury.codegen.CodegenContext; -import io.fury.codegen.Expression; -import io.fury.codegen.Expression.Arithmetic; -import io.fury.codegen.Expression.AssignArrayElem; -import io.fury.codegen.Expression.Cast; -import io.fury.codegen.Expression.FieldValue; -import io.fury.codegen.Expression.ForEach; -import io.fury.codegen.Expression.If; -import io.fury.codegen.Expression.Invoke; -import io.fury.codegen.Expression.ListExpression; -import io.fury.codegen.Expression.ListFromIterable; -import io.fury.codegen.Expression.Literal; -import io.fury.codegen.Expression.NewArray; -import io.fury.codegen.Expression.NewInstance; -import io.fury.codegen.Expression.Reference; -import io.fury.codegen.Expression.StaticInvoke; -import io.fury.codegen.Expression.ZipForEach; -import io.fury.codegen.ExpressionUtils; -import io.fury.format.row.ArrayData; -import io.fury.format.row.Getters; -import io.fury.format.row.MapData; -import io.fury.format.row.Row; -import io.fury.format.row.binary.BinaryArray; -import io.fury.format.row.binary.BinaryRow; -import io.fury.format.row.binary.BinaryUtils; -import io.fury.format.row.binary.writer.BinaryArrayWriter; -import io.fury.format.row.binary.writer.BinaryRowWriter; -import io.fury.format.row.binary.writer.BinaryWriter; -import io.fury.format.type.DataTypes; -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 org.apache.fury.builder.CodecBuilder; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.codegen.CodegenContext; +import org.apache.fury.codegen.Expression; +import org.apache.fury.codegen.Expression.Arithmetic; +import org.apache.fury.codegen.Expression.AssignArrayElem; +import org.apache.fury.codegen.Expression.Cast; +import org.apache.fury.codegen.Expression.FieldValue; +import org.apache.fury.codegen.Expression.ForEach; +import org.apache.fury.codegen.Expression.If; +import org.apache.fury.codegen.Expression.Invoke; +import org.apache.fury.codegen.Expression.ListExpression; +import org.apache.fury.codegen.Expression.ListFromIterable; +import org.apache.fury.codegen.Expression.Literal; +import org.apache.fury.codegen.Expression.NewArray; +import org.apache.fury.codegen.Expression.NewInstance; +import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.codegen.Expression.StaticInvoke; +import org.apache.fury.codegen.Expression.ZipForEach; +import org.apache.fury.codegen.ExpressionUtils; +import org.apache.fury.format.row.ArrayData; +import org.apache.fury.format.row.Getters; +import org.apache.fury.format.row.MapData; +import org.apache.fury.format.row.Row; +import org.apache.fury.format.row.binary.BinaryArray; +import org.apache.fury.format.row.binary.BinaryRow; +import org.apache.fury.format.row.binary.BinaryUtils; +import org.apache.fury.format.row.binary.writer.BinaryArrayWriter; +import org.apache.fury.format.row.binary.writer.BinaryRowWriter; +import org.apache.fury.format.row.binary.writer.BinaryWriter; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.DateTimeUtils; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/Encoder.java b/java/fury-format/src/main/java/io/fury/format/encoder/Encoder.java index 89f0bc4e34..b99dfdf74a 100644 --- a/java/fury-format/src/main/java/io/fury/format/encoder/Encoder.java +++ b/java/fury-format/src/main/java/io/fury/format/encoder/Encoder.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; /** * The encoding interface for encode/decode object to/from binary. The implementation class must diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/EncoderException.java b/java/fury-format/src/main/java/io/fury/format/encoder/EncoderException.java index 661a1f79a9..3d3ba3cdf2 100644 --- a/java/fury-format/src/main/java/io/fury/format/encoder/EncoderException.java +++ b/java/fury-format/src/main/java/io/fury/format/encoder/EncoderException.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; -import io.fury.exception.FuryException; +import org.apache.fury.exception.FuryException; /** * This class represents encoder-related exception. diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/Encoders.java b/java/fury-format/src/main/java/io/fury/format/encoder/Encoders.java index 6934e319c3..112fa9b8e1 100644 --- a/java/fury-format/src/main/java/io/fury/format/encoder/Encoders.java +++ b/java/fury-format/src/main/java/io/fury/format/encoder/Encoders.java @@ -17,27 +17,27 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.codegen.CodeGenerator; -import io.fury.codegen.CompileUnit; -import io.fury.collection.Tuple2; -import io.fury.exception.ClassNotCompatibleException; -import io.fury.format.row.binary.BinaryArray; -import io.fury.format.row.binary.BinaryMap; -import io.fury.format.row.binary.BinaryRow; -import io.fury.format.row.binary.writer.BinaryArrayWriter; -import io.fury.format.row.binary.writer.BinaryRowWriter; -import io.fury.format.type.DataTypes; -import io.fury.format.type.TypeInference; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.type.TypeUtils; -import io.fury.util.LoggerFactory; +import org.apache.fury.Fury; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.codegen.CompileUnit; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.exception.ClassNotCompatibleException; +import org.apache.fury.format.row.binary.BinaryArray; +import org.apache.fury.format.row.binary.BinaryMap; +import org.apache.fury.format.row.binary.BinaryRow; +import org.apache.fury.format.row.binary.writer.BinaryArrayWriter; +import org.apache.fury.format.row.binary.writer.BinaryRowWriter; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.format.type.TypeInference; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.LoggerFactory; import java.util.Collection; import java.util.HashSet; import java.util.Map; diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedArrayEncoder.java b/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedArrayEncoder.java index b6625d05fc..2f8d1d20bc 100644 --- a/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedArrayEncoder.java +++ b/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedArrayEncoder.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; -import io.fury.builder.Generated; -import io.fury.format.row.binary.BinaryArray; +import org.apache.fury.builder.Generated; +import org.apache.fury.format.row.binary.BinaryArray; /** * A list container row format codec for java bean. diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedMapEncoder.java b/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedMapEncoder.java index 3df89a0d6a..a5c524d1a2 100644 --- a/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedMapEncoder.java +++ b/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedMapEncoder.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; -import io.fury.builder.Generated; -import io.fury.format.row.binary.BinaryArray; -import io.fury.format.row.binary.BinaryMap; +import org.apache.fury.builder.Generated; +import org.apache.fury.format.row.binary.BinaryArray; +import org.apache.fury.format.row.binary.BinaryMap; /** * A map container row format codec for java bean. diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedRowEncoder.java b/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedRowEncoder.java index 7876def666..8128f7a2fd 100644 --- a/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedRowEncoder.java +++ b/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedRowEncoder.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; -import io.fury.builder.Generated; -import io.fury.format.row.binary.BinaryRow; +import org.apache.fury.builder.Generated; +import org.apache.fury.format.row.binary.BinaryRow; /** * A row format codec for java bean. diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/MapEncoder.java b/java/fury-format/src/main/java/io/fury/format/encoder/MapEncoder.java index 7b7a780df7..84a9bc108b 100644 --- a/java/fury-format/src/main/java/io/fury/format/encoder/MapEncoder.java +++ b/java/fury-format/src/main/java/io/fury/format/encoder/MapEncoder.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; -import io.fury.format.row.binary.BinaryArray; -import io.fury.format.row.binary.BinaryMap; +import org.apache.fury.format.row.binary.BinaryArray; +import org.apache.fury.format.row.binary.BinaryMap; import org.apache.arrow.vector.types.pojo.Field; /** diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/MapEncoderBuilder.java b/java/fury-format/src/main/java/io/fury/format/encoder/MapEncoderBuilder.java index 469bb5f953..f1e4dde363 100644 --- a/java/fury-format/src/main/java/io/fury/format/encoder/MapEncoderBuilder.java +++ b/java/fury-format/src/main/java/io/fury/format/encoder/MapEncoderBuilder.java @@ -17,24 +17,24 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; -import static io.fury.type.TypeUtils.CLASS_TYPE; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.type.TypeUtils.CLASS_TYPE; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.codegen.CodeGenerator; -import io.fury.codegen.CodegenContext; -import io.fury.codegen.Expression; -import io.fury.codegen.ExpressionUtils; -import io.fury.format.row.binary.BinaryArray; -import io.fury.format.row.binary.BinaryMap; -import io.fury.format.row.binary.writer.BinaryArrayWriter; -import io.fury.format.type.TypeInference; -import io.fury.type.TypeUtils; -import io.fury.util.LoggerFactory; -import io.fury.util.StringUtils; +import org.apache.fury.Fury; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.codegen.CodegenContext; +import org.apache.fury.codegen.Expression; +import org.apache.fury.codegen.ExpressionUtils; +import org.apache.fury.format.row.binary.BinaryArray; +import org.apache.fury.format.row.binary.BinaryMap; +import org.apache.fury.format.row.binary.writer.BinaryArrayWriter; +import org.apache.fury.format.type.TypeInference; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.StringUtils; import java.util.Map; import org.apache.arrow.vector.types.pojo.Field; import org.slf4j.Logger; diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/RowEncoder.java b/java/fury-format/src/main/java/io/fury/format/encoder/RowEncoder.java index 1648e11a4a..b1c2431af0 100644 --- a/java/fury-format/src/main/java/io/fury/format/encoder/RowEncoder.java +++ b/java/fury-format/src/main/java/io/fury/format/encoder/RowEncoder.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; -import io.fury.format.row.binary.BinaryRow; +import org.apache.fury.format.row.binary.BinaryRow; import org.apache.arrow.vector.types.pojo.Schema; /** 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 index d39722bcb7..9c7bdc20e1 100644 --- 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 @@ -17,37 +17,37 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; -import static io.fury.type.TypeUtils.CLASS_TYPE; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.type.TypeUtils.CLASS_TYPE; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.base.CaseFormat; import com.google.common.reflect.TypeToken; -import io.fury.Fury; -import io.fury.builder.CodecBuilder; -import io.fury.codegen.CodeGenerator; -import io.fury.codegen.CodegenContext; -import io.fury.codegen.Expression; -import io.fury.codegen.Expression.Literal; -import io.fury.codegen.Expression.Reference; -import io.fury.codegen.ExpressionUtils; -import io.fury.format.row.ArrayData; -import io.fury.format.row.MapData; -import io.fury.format.row.Row; -import io.fury.format.row.binary.BinaryArray; -import io.fury.format.row.binary.BinaryMap; -import io.fury.format.row.binary.BinaryRow; -import io.fury.format.row.binary.BinaryUtils; -import io.fury.format.row.binary.writer.BinaryRowWriter; -import io.fury.format.type.DataTypes; -import io.fury.format.type.TypeInference; -import io.fury.type.Descriptor; -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 org.apache.fury.Fury; +import org.apache.fury.builder.CodecBuilder; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.codegen.CodegenContext; +import org.apache.fury.codegen.Expression; +import org.apache.fury.codegen.Expression.Literal; +import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.codegen.ExpressionUtils; +import org.apache.fury.format.row.ArrayData; +import org.apache.fury.format.row.MapData; +import org.apache.fury.format.row.Row; +import org.apache.fury.format.row.binary.BinaryArray; +import org.apache.fury.format.row.binary.BinaryMap; +import org.apache.fury.format.row.binary.BinaryRow; +import org.apache.fury.format.row.binary.BinaryUtils; +import org.apache.fury.format.row.binary.writer.BinaryRowWriter; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.format.type.TypeInference; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.StringUtils; import java.lang.reflect.Modifier; import java.util.SortedMap; import org.apache.arrow.vector.types.pojo.Field; diff --git a/java/fury-format/src/main/java/io/fury/format/row/ArrayData.java b/java/fury-format/src/main/java/io/fury/format/row/ArrayData.java index 60b3cf0f53..e4fbba0bbf 100644 --- a/java/fury-format/src/main/java/io/fury/format/row/ArrayData.java +++ b/java/fury-format/src/main/java/io/fury/format/row/ArrayData.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.format.row; +package org.apache.fury.format.row; /** Interface for array in row format. */ public interface ArrayData extends Getters, Setters { diff --git a/java/fury-format/src/main/java/io/fury/format/row/Getters.java b/java/fury-format/src/main/java/io/fury/format/row/Getters.java index 55e4817174..679b7608db 100644 --- a/java/fury-format/src/main/java/io/fury/format/row/Getters.java +++ b/java/fury-format/src/main/java/io/fury/format/row/Getters.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.format.row; +package org.apache.fury.format.row; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryBuffer; 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/MapData.java b/java/fury-format/src/main/java/io/fury/format/row/MapData.java index bb4188ef9c..5246e929b5 100644 --- a/java/fury-format/src/main/java/io/fury/format/row/MapData.java +++ b/java/fury-format/src/main/java/io/fury/format/row/MapData.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.format.row; +package org.apache.fury.format.row; /** Interface for map in row format. */ public interface MapData { diff --git a/java/fury-format/src/main/java/io/fury/format/row/Row.java b/java/fury-format/src/main/java/io/fury/format/row/Row.java index e579d05aef..0184d719a8 100644 --- a/java/fury-format/src/main/java/io/fury/format/row/Row.java +++ b/java/fury-format/src/main/java/io/fury/format/row/Row.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.format.row; +package org.apache.fury.format.row; import org.apache.arrow.vector.types.pojo.Schema; diff --git a/java/fury-format/src/main/java/io/fury/format/row/Setters.java b/java/fury-format/src/main/java/io/fury/format/row/Setters.java index a18a5d0cb9..257555ad7d 100644 --- a/java/fury-format/src/main/java/io/fury/format/row/Setters.java +++ b/java/fury-format/src/main/java/io/fury/format/row/Setters.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.format.row; +package org.apache.fury.format.row; import java.math.BigDecimal; diff --git a/java/fury-format/src/main/java/io/fury/format/row/ValueVisitor.java b/java/fury-format/src/main/java/io/fury/format/row/ValueVisitor.java index 587a06e404..5de074c125 100644 --- a/java/fury-format/src/main/java/io/fury/format/row/ValueVisitor.java +++ b/java/fury-format/src/main/java/io/fury/format/row/ValueVisitor.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.format.row; +package org.apache.fury.format.row; -import io.fury.format.type.DefaultTypeVisitor; +import org.apache.fury.format.type.DefaultTypeVisitor; import java.util.function.Function; import org.apache.arrow.vector.types.pojo.ArrowType; 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 index 3c761fcb89..1c4428e24f 100644 --- 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 @@ -17,23 +17,23 @@ * under the License. */ -package io.fury.format.row.binary; - -import static io.fury.format.type.DataTypes.PRIMITIVE_BOOLEAN_ARRAY_FIELD; -import static io.fury.format.type.DataTypes.PRIMITIVE_BYTE_ARRAY_FIELD; -import static io.fury.format.type.DataTypes.PRIMITIVE_DOUBLE_ARRAY_FIELD; -import static io.fury.format.type.DataTypes.PRIMITIVE_FLOAT_ARRAY_FIELD; -import static io.fury.format.type.DataTypes.PRIMITIVE_INT_ARRAY_FIELD; -import static io.fury.format.type.DataTypes.PRIMITIVE_LONG_ARRAY_FIELD; -import static io.fury.format.type.DataTypes.PRIMITIVE_SHORT_ARRAY_FIELD; - -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; +package org.apache.fury.format.row.binary; + +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_BOOLEAN_ARRAY_FIELD; +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_BYTE_ARRAY_FIELD; +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_DOUBLE_ARRAY_FIELD; +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_FLOAT_ARRAY_FIELD; +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_INT_ARRAY_FIELD; +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_LONG_ARRAY_FIELD; +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_SHORT_ARRAY_FIELD; + +import org.apache.fury.format.row.ArrayData; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.memory.BitUtils; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.util.Platform; +import org.apache.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 index 82bd5590e3..fb9506e7d6 100644 --- 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 @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.format.row.binary; +package org.apache.fury.format.row.binary; -import io.fury.format.row.MapData; -import io.fury.format.type.DataTypes; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.util.Platform; +import org.apache.fury.format.row.MapData; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.util.Platform; import java.nio.ByteBuffer; import org.apache.arrow.vector.types.pojo.Field; 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 index 922bfc4010..c1a5e53847 100644 --- 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 @@ -17,16 +17,16 @@ * under the License. */ -package io.fury.format.row.binary; +package org.apache.fury.format.row.binary; -import static io.fury.util.Preconditions.checkArgument; +import static org.apache.fury.util.Preconditions.checkArgument; -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 org.apache.fury.format.row.Row; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.memory.BitUtils; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.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/row/binary/BinaryUtils.java b/java/fury-format/src/main/java/io/fury/format/row/binary/BinaryUtils.java index 5f2d8d051b..9b5b65ab72 100644 --- a/java/fury-format/src/main/java/io/fury/format/row/binary/BinaryUtils.java +++ b/java/fury-format/src/main/java/io/fury/format/row/binary/BinaryUtils.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.format.row.binary; +package org.apache.fury.format.row.binary; import com.google.common.reflect.TypeToken; -import io.fury.memory.MemoryBuffer; -import io.fury.type.TypeUtils; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.TypeUtils; /** * Util class for building generated binary encoder. diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/UnsafeTrait.java b/java/fury-format/src/main/java/io/fury/format/row/binary/UnsafeTrait.java index 93893b6482..ce6893a2ab 100644 --- a/java/fury-format/src/main/java/io/fury/format/row/binary/UnsafeTrait.java +++ b/java/fury-format/src/main/java/io/fury/format/row/binary/UnsafeTrait.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.format.row.binary; +package org.apache.fury.format.row.binary; -import static io.fury.util.DecimalUtils.DECIMAL_BYTE_LENGTH; +import static org.apache.fury.util.DecimalUtils.DECIMAL_BYTE_LENGTH; -import io.fury.format.row.Getters; -import io.fury.format.row.Setters; -import io.fury.format.type.DataTypes; -import io.fury.format.vectorized.ArrowUtils; -import io.fury.memory.MemoryBuffer; +import org.apache.fury.format.row.Getters; +import org.apache.fury.format.row.Setters; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.format.vectorized.ArrowUtils; +import org.apache.fury.memory.MemoryBuffer; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import org.apache.arrow.memory.ArrowBuf; diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryArrayWriter.java b/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryArrayWriter.java index dfae31576d..9437a92b18 100644 --- a/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryArrayWriter.java +++ b/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryArrayWriter.java @@ -17,21 +17,21 @@ * under the License. */ -package io.fury.format.row.binary.writer; - -import static io.fury.format.type.DataTypes.PRIMITIVE_BOOLEAN_ARRAY_FIELD; -import static io.fury.format.type.DataTypes.PRIMITIVE_BYTE_ARRAY_FIELD; -import static io.fury.format.type.DataTypes.PRIMITIVE_DOUBLE_ARRAY_FIELD; -import static io.fury.format.type.DataTypes.PRIMITIVE_FLOAT_ARRAY_FIELD; -import static io.fury.format.type.DataTypes.PRIMITIVE_INT_ARRAY_FIELD; -import static io.fury.format.type.DataTypes.PRIMITIVE_LONG_ARRAY_FIELD; -import static io.fury.format.type.DataTypes.PRIMITIVE_SHORT_ARRAY_FIELD; - -import io.fury.format.row.binary.BinaryArray; -import io.fury.format.type.DataTypes; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.util.Platform; +package org.apache.fury.format.row.binary.writer; + +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_BOOLEAN_ARRAY_FIELD; +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_BYTE_ARRAY_FIELD; +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_DOUBLE_ARRAY_FIELD; +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_FLOAT_ARRAY_FIELD; +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_INT_ARRAY_FIELD; +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_LONG_ARRAY_FIELD; +import static org.apache.fury.format.type.DataTypes.PRIMITIVE_SHORT_ARRAY_FIELD; + +import org.apache.fury.format.row.binary.BinaryArray; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.util.Platform; import java.math.BigDecimal; import org.apache.arrow.vector.types.pojo.ArrowType; import org.apache.arrow.vector.types.pojo.Field; diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryRowWriter.java b/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryRowWriter.java index aad2951fc9..710508962c 100644 --- a/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryRowWriter.java +++ b/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryRowWriter.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.format.row.binary.writer; +package org.apache.fury.format.row.binary.writer; -import static io.fury.memory.BitUtils.calculateBitmapWidthInBytes; +import static org.apache.fury.memory.BitUtils.calculateBitmapWidthInBytes; -import io.fury.format.row.binary.BinaryRow; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; +import org.apache.fury.format.row.binary.BinaryRow; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; import java.math.BigDecimal; import org.apache.arrow.vector.types.pojo.ArrowType; import org.apache.arrow.vector.types.pojo.Schema; diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryWriter.java b/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryWriter.java index 9b64757ebd..19b61b054c 100644 --- a/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryWriter.java +++ b/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryWriter.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.format.row.binary.writer; - -import io.fury.format.row.binary.BinaryArray; -import io.fury.format.row.binary.BinaryMap; -import io.fury.format.row.binary.BinaryRow; -import io.fury.format.vectorized.ArrowUtils; -import io.fury.memory.BitUtils; -import io.fury.memory.MemoryBuffer; -import io.fury.util.DecimalUtils; +package org.apache.fury.format.row.binary.writer; + +import org.apache.fury.format.row.binary.BinaryArray; +import org.apache.fury.format.row.binary.BinaryMap; +import org.apache.fury.format.row.binary.BinaryRow; +import org.apache.fury.format.vectorized.ArrowUtils; +import org.apache.fury.memory.BitUtils; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.DecimalUtils; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.util.ArrayList; 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 index 9ee2756e1b..ba1a6b080d 100644 --- 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 @@ -17,16 +17,16 @@ * under the License. */ -package io.fury.format.type; +package org.apache.fury.format.type; -import static io.fury.util.Preconditions.checkArgument; +import static org.apache.fury.util.Preconditions.checkArgument; -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 org.apache.fury.exception.FuryException; +import org.apache.fury.org.apache.furyOutputStream; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.Type; +import org.apache.fury.util.DecimalUtils; +import org.apache.fury.util.Preconditions; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/java/fury-format/src/main/java/io/fury/format/type/DefaultTypeVisitor.java b/java/fury-format/src/main/java/io/fury/format/type/DefaultTypeVisitor.java index 9ad195e6c4..aefac9aafa 100644 --- a/java/fury-format/src/main/java/io/fury/format/type/DefaultTypeVisitor.java +++ b/java/fury-format/src/main/java/io/fury/format/type/DefaultTypeVisitor.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.format.type; +package org.apache.fury.format.type; import org.apache.arrow.vector.types.pojo.ArrowType; diff --git a/java/fury-format/src/main/java/io/fury/format/type/TypeInference.java b/java/fury-format/src/main/java/io/fury/format/type/TypeInference.java index d57a69194a..b0d1824639 100644 --- a/java/fury-format/src/main/java/io/fury/format/type/TypeInference.java +++ b/java/fury-format/src/main/java/io/fury/format/type/TypeInference.java @@ -17,18 +17,18 @@ * under the License. */ -package io.fury.format.type; +package org.apache.fury.format.type; -import static io.fury.format.type.DataTypes.field; -import static io.fury.type.TypeUtils.getRawType; +import static org.apache.fury.format.type.DataTypes.field; +import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.base.CaseFormat; import com.google.common.reflect.TypeToken; -import io.fury.collection.Tuple2; -import io.fury.type.Descriptor; -import io.fury.type.TypeUtils; -import io.fury.util.DecimalUtils; -import io.fury.util.Preconditions; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.DecimalUtils; +import org.apache.fury.util.Preconditions; import java.util.Arrays; import java.util.LinkedHashSet; import java.util.List; diff --git a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowSerializers.java b/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowSerializers.java index 761581d91d..d697994787 100644 --- a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowSerializers.java +++ b/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowSerializers.java @@ -17,18 +17,18 @@ * under the License. */ -package io.fury.format.vectorized; - -import io.fury.Fury; -import io.fury.io.FuryReadableByteChannel; -import io.fury.io.FuryWritableByteChannel; -import io.fury.io.MockWritableByteChannel; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.serializer.BufferObject; -import io.fury.serializer.Serializers.CrossLanguageCompatibleSerializer; -import io.fury.type.Type; -import io.fury.util.Platform; +package org.apache.fury.format.vectorized; + +import org.apache.fury.Fury; +import org.apache.fury.org.apache.furyReadableByteChannel; +import org.apache.fury.org.apache.furyWritableByteChannel; +import org.apache.fury.io.MockWritableByteChannel; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.BufferObject; +import org.apache.fury.serializer.Serializers.CrossLanguageCompatibleSerializer; +import org.apache.fury.type.Type; +import org.apache.fury.util.Platform; import java.io.IOException; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; diff --git a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowTable.java b/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowTable.java index 1646776235..7ce8900f8c 100644 --- a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowTable.java +++ b/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowTable.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.format.vectorized; +package org.apache.fury.format.vectorized; -import io.fury.util.Preconditions; +import org.apache.fury.util.Preconditions; import java.util.Iterator; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.VectorLoader; diff --git a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowTableSerializer.java b/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowTableSerializer.java index 70bbd92de4..2479f383a9 100644 --- a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowTableSerializer.java +++ b/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowTableSerializer.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.format.vectorized; +package org.apache.fury.format.vectorized; -import io.fury.Fury; -import io.fury.io.FuryReadableByteChannel; -import io.fury.memory.MemoryBuffer; -import io.fury.serializer.Serializers; -import io.fury.type.Type; -import io.fury.util.Platform; +import org.apache.fury.Fury; +import org.apache.fury.org.apache.furyReadableByteChannel; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.Serializers; +import org.apache.fury.type.Type; +import org.apache.fury.util.Platform; import java.nio.channels.ReadableByteChannel; import java.util.ArrayList; import java.util.List; diff --git a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowUtils.java b/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowUtils.java index 9934f1bfd1..37b935e80a 100644 --- a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowUtils.java +++ b/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowUtils.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.format.vectorized; +package org.apache.fury.format.vectorized; -import io.fury.io.FuryInputStream; -import io.fury.io.FuryOutputStream; -import io.fury.memory.MemoryBuffer; -import io.fury.util.DecimalUtils; +import org.apache.fury.org.apache.furyInputStream; +import org.apache.fury.org.apache.furyOutputStream; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.DecimalUtils; import java.io.IOException; import java.nio.channels.Channels; import org.apache.arrow.memory.ArrowBuf; diff --git a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowWriter.java b/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowWriter.java index 1a9749e57c..eac0710d7d 100644 --- a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowWriter.java +++ b/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowWriter.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package io.fury.format.vectorized; +package org.apache.fury.format.vectorized; -import io.fury.format.row.ArrayData; -import io.fury.format.row.Getters; -import io.fury.format.row.MapData; -import io.fury.format.row.Row; -import io.fury.format.type.DefaultTypeVisitor; +import org.apache.fury.format.row.ArrayData; +import org.apache.fury.format.row.Getters; +import org.apache.fury.format.row.MapData; +import org.apache.fury.format.row.Row; +import org.apache.fury.format.type.DefaultTypeVisitor; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.stream.IntStream; diff --git a/java/fury-format/src/test/java/io/fury/format/CrossLanguageTest.java b/java/fury-format/src/test/java/io/fury/format/CrossLanguageTest.java index 91b1dd359b..06b8c3daac 100644 --- a/java/fury-format/src/test/java/io/fury/format/CrossLanguageTest.java +++ b/java/fury-format/src/test/java/io/fury/format/CrossLanguageTest.java @@ -17,29 +17,29 @@ * under the License. */ -package io.fury.format; +package org.apache.fury.format; -import static io.fury.format.vectorized.ArrowSerializersTest.assertRecordBatchEqual; -import static io.fury.format.vectorized.ArrowSerializersTest.assertTableEqual; -import static io.fury.format.vectorized.ArrowUtilsTest.createVectorSchemaRoot; +import static org.apache.fury.format.vectorized.ArrowSerializersTest.assertRecordBatchEqual; +import static org.apache.fury.format.vectorized.ArrowSerializersTest.assertTableEqual; +import static org.apache.fury.format.vectorized.ArrowUtilsTest.createVectorSchemaRoot; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import io.fury.Fury; -import io.fury.config.Language; -import io.fury.format.encoder.Encoders; -import io.fury.format.encoder.RowEncoder; -import io.fury.format.row.binary.BinaryRow; -import io.fury.format.type.DataTypes; -import io.fury.format.vectorized.ArrowSerializers; -import io.fury.format.vectorized.ArrowTable; -import io.fury.format.vectorized.ArrowUtils; -import io.fury.format.vectorized.ArrowWriter; -import io.fury.io.FuryOutputStream; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.serializer.BufferObject; -import io.fury.util.LoggerFactory; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.format.encoder.Encoders; +import org.apache.fury.format.encoder.RowEncoder; +import org.apache.fury.format.row.binary.BinaryRow; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.format.vectorized.ArrowSerializers; +import org.apache.fury.format.vectorized.ArrowTable; +import org.apache.fury.format.vectorized.ArrowUtils; +import org.apache.fury.format.vectorized.ArrowWriter; +import org.apache.fury.org.apache.furyOutputStream; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.BufferObject; +import org.apache.fury.util.LoggerFactory; import java.io.IOException; import java.nio.channels.Channels; import java.nio.file.Files; diff --git a/java/fury-format/src/test/java/io/fury/format/encoder/ArrayEncoderTest.java b/java/fury-format/src/test/java/io/fury/format/encoder/ArrayEncoderTest.java index acbc220351..c9ee5ef728 100644 --- a/java/fury-format/src/test/java/io/fury/format/encoder/ArrayEncoderTest.java +++ b/java/fury-format/src/test/java/io/fury/format/encoder/ArrayEncoderTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; import com.google.common.reflect.TypeToken; -import io.fury.format.row.binary.BinaryArray; +import org.apache.fury.format.row.binary.BinaryArray; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/java/fury-format/src/test/java/io/fury/format/encoder/CodecBuilderTest.java b/java/fury-format/src/test/java/io/fury/format/encoder/CodecBuilderTest.java index 3de6a51748..0feb7e606d 100644 --- a/java/fury-format/src/test/java/io/fury/format/encoder/CodecBuilderTest.java +++ b/java/fury-format/src/test/java/io/fury/format/encoder/CodecBuilderTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; import static org.testng.Assert.assertTrue; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.BeanB; -import io.fury.test.bean.Foo; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; +import org.apache.fury.test.bean.Foo; import java.util.concurrent.atomic.AtomicLong; import org.testng.annotations.Test; diff --git a/java/fury-format/src/test/java/io/fury/format/encoder/MapEncoderTest.java b/java/fury-format/src/test/java/io/fury/format/encoder/MapEncoderTest.java index 77fc675abc..9f19d3455b 100644 --- a/java/fury-format/src/test/java/io/fury/format/encoder/MapEncoderTest.java +++ b/java/fury-format/src/test/java/io/fury/format/encoder/MapEncoderTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; import com.google.common.reflect.TypeToken; -import io.fury.format.row.binary.BinaryMap; +import org.apache.fury.format.row.binary.BinaryMap; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/java/fury-format/src/test/java/io/fury/format/encoder/RowEncoderTest.java b/java/fury-format/src/test/java/io/fury/format/encoder/RowEncoderTest.java index 79c7b6556f..8cb4e078f0 100644 --- a/java/fury-format/src/test/java/io/fury/format/encoder/RowEncoderTest.java +++ b/java/fury-format/src/test/java/io/fury/format/encoder/RowEncoderTest.java @@ -17,14 +17,14 @@ * under the License. */ -package io.fury.format.encoder; +package org.apache.fury.format.encoder; import com.google.common.collect.ImmutableMap; -import io.fury.format.row.binary.BinaryRow; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.test.bean.BeanA; -import io.fury.test.bean.BeanB; +import org.apache.fury.format.row.binary.BinaryRow; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; import java.util.Arrays; import java.util.HashMap; import java.util.List; diff --git a/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryArrayTest.java b/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryArrayTest.java index e1e930b1fa..0972f82782 100644 --- a/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryArrayTest.java +++ b/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryArrayTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.format.row.binary; +package org.apache.fury.format.row.binary; -import io.fury.format.row.binary.writer.BinaryArrayWriter; -import io.fury.format.type.DataTypes; -import io.fury.util.LoggerFactory; +import org.apache.fury.format.row.binary.writer.BinaryArrayWriter; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.util.LoggerFactory; import java.util.Random; import org.slf4j.Logger; import org.testng.Assert; diff --git a/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryMapTest.java b/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryMapTest.java index e576339794..ff560fa15b 100644 --- a/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryMapTest.java +++ b/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryMapTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.format.row.binary; +package org.apache.fury.format.row.binary; -import io.fury.format.row.binary.writer.BinaryArrayWriter; -import io.fury.format.row.binary.writer.BinaryRowWriter; -import io.fury.format.type.DataTypes; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; +import org.apache.fury.format.row.binary.writer.BinaryArrayWriter; +import org.apache.fury.format.row.binary.writer.BinaryRowWriter; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; import java.util.Collections; import java.util.List; import org.apache.arrow.vector.types.pojo.Field; diff --git a/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryRowTest.java b/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryRowTest.java index 0bc6c8f8b8..66e0c9e91b 100644 --- a/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryRowTest.java +++ b/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryRowTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.format.row.binary; +package org.apache.fury.format.row.binary; -import io.fury.format.row.binary.writer.BinaryArrayWriter; -import io.fury.format.row.binary.writer.BinaryRowWriter; -import io.fury.format.type.DataTypes; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.util.LoggerFactory; -import io.fury.util.Platform; +import org.apache.fury.format.row.binary.writer.BinaryArrayWriter; +import org.apache.fury.format.row.binary.writer.BinaryRowWriter; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; import java.math.BigDecimal; import java.util.Arrays; import java.util.List; diff --git a/java/fury-format/src/test/java/io/fury/format/type/DataTypesTest.java b/java/fury-format/src/test/java/io/fury/format/type/DataTypesTest.java index bb7a0d1b43..eb1cfddfb2 100644 --- a/java/fury-format/src/test/java/io/fury/format/type/DataTypesTest.java +++ b/java/fury-format/src/test/java/io/fury/format/type/DataTypesTest.java @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.format.type; +package org.apache.fury.format.type; import static org.testng.Assert.assertEquals; -import io.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanA; import java.nio.ByteBuffer; import org.apache.arrow.vector.types.pojo.ArrowType; import org.apache.arrow.vector.types.pojo.Schema; diff --git a/java/fury-format/src/test/java/io/fury/format/type/TypeInferenceTest.java b/java/fury-format/src/test/java/io/fury/format/type/TypeInferenceTest.java index 28a790b84c..06b5c55efd 100644 --- a/java/fury-format/src/test/java/io/fury/format/type/TypeInferenceTest.java +++ b/java/fury-format/src/test/java/io/fury/format/type/TypeInferenceTest.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.format.type; +package org.apache.fury.format.type; import static org.testng.Assert.assertEquals; import com.google.common.base.CaseFormat; -import io.fury.test.bean.BeanA; -import io.fury.type.Descriptor; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.type.Descriptor; import java.util.List; import java.util.stream.Collectors; import org.apache.arrow.vector.types.pojo.Field; diff --git a/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowSerializersTest.java b/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowSerializersTest.java index 91775e3f3a..780ba58cf4 100644 --- a/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowSerializersTest.java +++ b/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowSerializersTest.java @@ -17,17 +17,17 @@ * under the License. */ -package io.fury.format.vectorized; +package org.apache.fury.format.vectorized; import static org.testng.Assert.assertEquals; -import io.fury.Fury; -import io.fury.config.Language; -import io.fury.io.FuryWritableByteChannel; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.resolver.ClassResolver; -import io.fury.serializer.BufferObject; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.org.apache.furyWritableByteChannel; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.serializer.BufferObject; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; diff --git a/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowUtilsTest.java b/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowUtilsTest.java index 4b56e97bd8..0566d8c000 100644 --- a/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowUtilsTest.java +++ b/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowUtilsTest.java @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.format.vectorized; +package org.apache.fury.format.vectorized; import static org.testng.Assert.assertEquals; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; diff --git a/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowWriterTest.java b/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowWriterTest.java index be32874678..1e78d05201 100644 --- a/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowWriterTest.java +++ b/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowWriterTest.java @@ -17,15 +17,15 @@ * under the License. */ -package io.fury.format.vectorized; +package org.apache.fury.format.vectorized; -import io.fury.format.encoder.Encoders; -import io.fury.format.encoder.RowEncoder; -import io.fury.format.row.binary.BinaryRow; -import io.fury.format.type.TypeInference; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.test.bean.BeanA; +import org.apache.fury.format.encoder.Encoders; +import org.apache.fury.format.encoder.RowEncoder; +import org.apache.fury.format.row.binary.BinaryRow; +import org.apache.fury.format.type.TypeInference; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.test.bean.BeanA; import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; import org.apache.arrow.vector.types.pojo.Schema; import org.testng.annotations.Test; diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/AccessBeans.java b/java/fury-test-core/src/main/java/io/fury/test/bean/AccessBeans.java index 168618e930..ab18172e0e 100644 --- a/java/fury-test-core/src/main/java/io/fury/test/bean/AccessBeans.java +++ b/java/fury-test-core/src/main/java/io/fury/test/bean/AccessBeans.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.test.bean; +package org.apache.fury.test.bean; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/ArraysData.java b/java/fury-test-core/src/main/java/io/fury/test/bean/ArraysData.java index d60e1d46be..73bb2d7979 100644 --- a/java/fury-test-core/src/main/java/io/fury/test/bean/ArraysData.java +++ b/java/fury-test-core/src/main/java/io/fury/test/bean/ArraysData.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.test.bean; +package org.apache.fury.test.bean; import java.io.Serializable; import java.util.Arrays; diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/BeanA.java b/java/fury-test-core/src/main/java/io/fury/test/bean/BeanA.java index 96990fe69a..ee656ddb5b 100644 --- a/java/fury-test-core/src/main/java/io/fury/test/bean/BeanA.java +++ b/java/fury-test-core/src/main/java/io/fury/test/bean/BeanA.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.test.bean; +package org.apache.fury.test.bean; import java.io.Serializable; import java.math.BigDecimal; diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/BeanB.java b/java/fury-test-core/src/main/java/io/fury/test/bean/BeanB.java index c23fd3ab44..4b77f098db 100644 --- a/java/fury-test-core/src/main/java/io/fury/test/bean/BeanB.java +++ b/java/fury-test-core/src/main/java/io/fury/test/bean/BeanB.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.test.bean; +package org.apache.fury.test.bean; import java.io.Serializable; import java.util.ArrayList; diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/CollectionFields.java b/java/fury-test-core/src/main/java/io/fury/test/bean/CollectionFields.java index 32ab365ca4..8d9a4f6277 100644 --- a/java/fury-test-core/src/main/java/io/fury/test/bean/CollectionFields.java +++ b/java/fury-test-core/src/main/java/io/fury/test/bean/CollectionFields.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.test.bean; +package org.apache.fury.test.bean; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/Cyclic.java b/java/fury-test-core/src/main/java/io/fury/test/bean/Cyclic.java index 925c61376b..fac7aaa2cf 100644 --- a/java/fury-test-core/src/main/java/io/fury/test/bean/Cyclic.java +++ b/java/fury-test-core/src/main/java/io/fury/test/bean/Cyclic.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.test.bean; +package org.apache.fury.test.bean; import java.util.Objects; diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/FinalCyclic.java b/java/fury-test-core/src/main/java/io/fury/test/bean/FinalCyclic.java index 7dd6de8649..90ce243001 100644 --- a/java/fury-test-core/src/main/java/io/fury/test/bean/FinalCyclic.java +++ b/java/fury-test-core/src/main/java/io/fury/test/bean/FinalCyclic.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.test.bean; +package org.apache.fury.test.bean; import java.util.Objects; diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/Foo.java b/java/fury-test-core/src/main/java/io/fury/test/bean/Foo.java index d09c2b88ff..6549f2ffce 100644 --- a/java/fury-test-core/src/main/java/io/fury/test/bean/Foo.java +++ b/java/fury-test-core/src/main/java/io/fury/test/bean/Foo.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.test.bean; +package org.apache.fury.test.bean; import java.io.Serializable; import java.util.Random; diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/MapFields.java b/java/fury-test-core/src/main/java/io/fury/test/bean/MapFields.java index e742ffe4e4..54f2551300 100644 --- a/java/fury-test-core/src/main/java/io/fury/test/bean/MapFields.java +++ b/java/fury-test-core/src/main/java/io/fury/test/bean/MapFields.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.test.bean; +package org.apache.fury.test.bean; import java.util.EnumMap; import java.util.HashMap; diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/Struct.java b/java/fury-test-core/src/main/java/io/fury/test/bean/Struct.java index 7b55853862..05a2870b78 100644 --- a/java/fury-test-core/src/main/java/io/fury/test/bean/Struct.java +++ b/java/fury-test-core/src/main/java/io/fury/test/bean/Struct.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.test.bean; +package org.apache.fury.test.bean; import java.io.Serializable; import java.lang.ref.SoftReference; @@ -236,10 +236,10 @@ public static Class createNumberStructClass(String classname, int repeat, boo + "import java.util.*;\n" + "public final class %s implements java.io.Serializable {\n" + " public String toString() {\n" - + " return io.fury.test.bean.Struct.toString(this);\n" + + " return org.apache.fury.test.bean.Struct.toString(this);\n" + " }\n" + " public boolean equals(Object o) {\n" - + " return io.fury.test.bean.Struct.equalsWith(this, o);\n" + + " return org.apache.fury.test.bean.Struct.equalsWith(this, o);\n" + " }\n", classname)); @@ -288,10 +288,10 @@ public static Class createStructClass(String classname, int repeat, boolean c + "import java.util.*;\n" + "public final class %s implements java.io.Serializable {\n" + " public String toString() {\n" - + " return io.fury.test.bean.Struct.toString(this);\n" + + " return org.apache.fury.test.bean.Struct.toString(this);\n" + " }\n" + " public boolean equals(Object o) {\n" - + " return io.fury.test.bean.Struct.equalsWith(this, o);\n" + + " return org.apache.fury.test.bean.Struct.equalsWith(this, o);\n" + " }\n", classname)); diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/TestUtils.java b/java/fury-test-core/src/main/java/io/fury/test/bean/TestUtils.java index a655236c8e..2db4d3481e 100644 --- a/java/fury-test-core/src/main/java/io/fury/test/bean/TestUtils.java +++ b/java/fury-test-core/src/main/java/io/fury/test/bean/TestUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.test.bean; +package org.apache.fury.test.bean; import java.util.Random; diff --git a/java/fury-test-core/src/test/java/io/fury/test/bean/StructTest.java b/java/fury-test-core/src/test/java/io/fury/test/bean/StructTest.java index 7fdbd28353..41f7f1c4b9 100644 --- a/java/fury-test-core/src/test/java/io/fury/test/bean/StructTest.java +++ b/java/fury-test-core/src/test/java/io/fury/test/bean/StructTest.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.test.bean; +package org.apache.fury.test.bean; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-testsuite/src/test/java/io/fury/benchmark/DeserializationBenchmark.java b/java/fury-testsuite/src/test/java/io/fury/benchmark/DeserializationBenchmark.java index eb3eef089e..025a547109 100644 --- a/java/fury-testsuite/src/test/java/io/fury/benchmark/DeserializationBenchmark.java +++ b/java/fury-testsuite/src/test/java/io/fury/benchmark/DeserializationBenchmark.java @@ -17,20 +17,20 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; import static org.testng.Assert.assertEquals; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import io.fury.Fury; -import io.fury.config.Language; -import io.fury.format.encoder.Encoders; -import io.fury.format.encoder.RowEncoder; -import io.fury.format.row.binary.BinaryRow; -import io.fury.test.bean.Foo; -import io.fury.util.LoggerFactory; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.format.encoder.Encoders; +import org.apache.fury.format.encoder.RowEncoder; +import org.apache.fury.format.row.binary.BinaryRow; +import org.apache.fury.test.bean.Foo; +import org.apache.fury.util.LoggerFactory; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -57,7 +57,7 @@ public void setArrSize() { } } - // mvn test -Dtest=io.fury.benchmark.DeserializationBenchmark#deserializationBenchmark + // mvn test -Dtest=org.apache.fury.benchmark.DeserializationBenchmark#deserializationBenchmark // -DiterNums=10000000 @Test(enabled = false) public void deserializationBenchmark() throws Exception { diff --git a/java/fury-testsuite/src/test/java/io/fury/benchmark/SerializationBenchmark.java b/java/fury-testsuite/src/test/java/io/fury/benchmark/SerializationBenchmark.java index f8f36e26ef..9a8102bf1c 100644 --- a/java/fury-testsuite/src/test/java/io/fury/benchmark/SerializationBenchmark.java +++ b/java/fury-testsuite/src/test/java/io/fury/benchmark/SerializationBenchmark.java @@ -17,18 +17,18 @@ * under the License. */ -package io.fury.benchmark; +package org.apache.fury.benchmark; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Output; -import io.fury.Fury; -import io.fury.config.Language; -import io.fury.format.encoder.Encoders; -import io.fury.format.encoder.RowEncoder; -import io.fury.memory.MemoryBuffer; -import io.fury.memory.MemoryUtils; -import io.fury.test.bean.Foo; -import io.fury.util.LoggerFactory; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.format.encoder.Encoders; +import org.apache.fury.format.encoder.RowEncoder; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.test.bean.Foo; +import org.apache.fury.util.LoggerFactory; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; @@ -53,7 +53,7 @@ public void setArrSize() { // mvn test -DargLine="-XX:+PrintCompilation -XX:+UnlockDiagnosticVMOptions -XX:+PrintInlining" // ... - // mvn test -Dtest=io.fury.benchmark.SerializationBenchmark#serializationBenchmark + // mvn test -Dtest=org.apache.fury.benchmark.SerializationBenchmark#serializationBenchmark // -DiterNums=10000000 @Test(enabled = false) public void serializationBenchmark() throws Exception { diff --git a/java/fury-testsuite/src/test/java/io/fury/test/BeanMock.java b/java/fury-testsuite/src/test/java/io/fury/test/BeanMock.java index b49bd76c9d..5770942f36 100644 --- a/java/fury-testsuite/src/test/java/io/fury/test/BeanMock.java +++ b/java/fury-testsuite/src/test/java/io/fury/test/BeanMock.java @@ -17,7 +17,7 @@ * under the License. */ -package io.fury.test; +package org.apache.fury.test; import java.beans.BeanInfo; import java.beans.IntrospectionException; diff --git a/java/fury-testsuite/src/test/java/io/fury/test/DTOTest.java b/java/fury-testsuite/src/test/java/io/fury/test/DTOTest.java index 7b1b5706a8..b72004e010 100644 --- a/java/fury-testsuite/src/test/java/io/fury/test/DTOTest.java +++ b/java/fury-testsuite/src/test/java/io/fury/test/DTOTest.java @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.test; +package org.apache.fury.test; -import io.fury.Fury; -import io.fury.config.Language; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; import java.io.Serializable; import java.util.Date; import java.util.List; diff --git a/java/fury-testsuite/src/test/java/io/fury/test/ReadResolveCircularTest.java b/java/fury-testsuite/src/test/java/io/fury/test/ReadResolveCircularTest.java index 01d678f789..4552785a2a 100644 --- a/java/fury-testsuite/src/test/java/io/fury/test/ReadResolveCircularTest.java +++ b/java/fury-testsuite/src/test/java/io/fury/test/ReadResolveCircularTest.java @@ -17,9 +17,9 @@ * under the License. */ -package io.fury.test; +package org.apache.fury.test; -import io.fury.Fury; +import org.apache.fury.Fury; import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.Serializable; diff --git a/java/fury-testsuite/src/test/java/org/test/Org.java b/java/fury-testsuite/src/test/java/org/test/Org.java index 517e1afa50..2a58b5efc8 100644 --- a/java/fury-testsuite/src/test/java/org/test/Org.java +++ b/java/fury-testsuite/src/test/java/org/test/Org.java @@ -19,9 +19,9 @@ package org.test; -import io.fury.Fury; -import io.fury.config.CompatibleMode; -import io.fury.config.Language; +import org.apache.fury.Fury; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; import java.io.Serializable; import java.util.List; import org.testng.Assert; diff --git a/python/pyfury/type.py b/python/pyfury/type.py index cd9e53c992..e2aea26290 100644 --- a/python/pyfury/type.py +++ b/python/pyfury/type.py @@ -121,7 +121,7 @@ def get_qualified_classname(obj): class FuryType(enum.Enum): """ Fury added type for cross-language serialization. - See `io.fury.types.Type` + See `org.apache.fury.types.Type` """ NA = 0 diff --git a/scala/src/main/java/io/fury/serializer/scala/ScalaDispatcher.java b/scala/src/main/java/io/fury/serializer/scala/ScalaDispatcher.java index 4e26ef0430..4102d6675d 100644 --- a/scala/src/main/java/io/fury/serializer/scala/ScalaDispatcher.java +++ b/scala/src/main/java/io/fury/serializer/scala/ScalaDispatcher.java @@ -17,13 +17,13 @@ * under the License. */ -package io.fury.serializer.scala; +package org.apache.fury.serializer.scala; import com.google.common.base.Preconditions; -import io.fury.Fury; -import io.fury.serializer.JavaSerializer; -import io.fury.serializer.Serializer; -import io.fury.serializer.SerializerFactory; +import org.apache.fury.Fury; +import org.apache.fury.serializer.JavaSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.SerializerFactory; import scala.collection.generic.DefaultSerializable; import java.lang.reflect.Method; diff --git a/scala/src/main/scala/io/fury/serializer/scala/CollectionSerializer.scala b/scala/src/main/scala/io/fury/serializer/scala/CollectionSerializer.scala index db09f9a858..88cac4d4a2 100644 --- a/scala/src/main/scala/io/fury/serializer/scala/CollectionSerializer.scala +++ b/scala/src/main/scala/io/fury/serializer/scala/CollectionSerializer.scala @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.serializer.scala +package org.apache.fury.serializer.scala -import io.fury.Fury -import io.fury.memory.MemoryBuffer -import io.fury.serializer.collection.AbstractCollectionSerializer +import org.apache.fury.Fury +import org.apache.fury.memory.MemoryBuffer +import org.apache.fury.serializer.collection.AbstractCollectionSerializer import java.util import scala.collection.{Factory, Iterable, mutable} diff --git a/scala/src/main/scala/io/fury/serializer/scala/MapSerializer.scala b/scala/src/main/scala/io/fury/serializer/scala/MapSerializer.scala index 8b18dbc86f..bc884fee63 100644 --- a/scala/src/main/scala/io/fury/serializer/scala/MapSerializer.scala +++ b/scala/src/main/scala/io/fury/serializer/scala/MapSerializer.scala @@ -17,12 +17,12 @@ * under the License. */ -package io.fury.serializer.scala +package org.apache.fury.serializer.scala -import io.fury.Fury -import io.fury.collection.MapEntry -import io.fury.memory.MemoryBuffer -import io.fury.serializer.collection.AbstractMapSerializer +import org.apache.fury.Fury +import org.apache.fury.collection.MapEntry +import org.apache.fury.memory.MemoryBuffer +import org.apache.fury.serializer.collection.AbstractMapSerializer import java.util import scala.collection.{Factory, mutable} diff --git a/scala/src/test/scala/io/fury/serializer/CollectionSerializerTest.scala b/scala/src/test/scala/io/fury/serializer/CollectionSerializerTest.scala index 2effa12714..ff3719e5ed 100644 --- a/scala/src/test/scala/io/fury/serializer/CollectionSerializerTest.scala +++ b/scala/src/test/scala/io/fury/serializer/CollectionSerializerTest.scala @@ -17,11 +17,11 @@ * under the License. */ -package io.fury.serializer +package org.apache.fury.serializer -import io.fury.Fury -import io.fury.config.Language -import io.fury.serializer.scala.ScalaDispatcher +import org.apache.fury.Fury +import org.apache.fury.config.Language +import org.apache.fury.serializer.scala.ScalaDispatcher import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/scala/src/test/scala/io/fury/serializer/ScalaTest.scala b/scala/src/test/scala/io/fury/serializer/ScalaTest.scala index 9d067960d3..150c317320 100644 --- a/scala/src/test/scala/io/fury/serializer/ScalaTest.scala +++ b/scala/src/test/scala/io/fury/serializer/ScalaTest.scala @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.serializer +package org.apache.fury.serializer -import io.fury.Fury -import io.fury.config.Language +import org.apache.fury.Fury +import org.apache.fury.config.Language import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/scala/src/test/scala/io/fury/serializer/SingleObjectSerializerTest.scala b/scala/src/test/scala/io/fury/serializer/SingleObjectSerializerTest.scala index 92d8c8e674..b79533b6d8 100644 --- a/scala/src/test/scala/io/fury/serializer/SingleObjectSerializerTest.scala +++ b/scala/src/test/scala/io/fury/serializer/SingleObjectSerializerTest.scala @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.serializer +package org.apache.fury.serializer -import io.fury.Fury -import io.fury.config.Language +import org.apache.fury.Fury +import org.apache.fury.config.Language import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/scala/src/test/scala/io/fury/serializer/TupleTest.scala b/scala/src/test/scala/io/fury/serializer/TupleTest.scala index 06d48dd89e..be129206c7 100644 --- a/scala/src/test/scala/io/fury/serializer/TupleTest.scala +++ b/scala/src/test/scala/io/fury/serializer/TupleTest.scala @@ -17,10 +17,10 @@ * under the License. */ -package io.fury.serializer +package org.apache.fury.serializer -import io.fury.Fury -import io.fury.config.Language +import org.apache.fury.Fury +import org.apache.fury.config.Language import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec From aed795d979e28dc0e41024a3adf7cb9e52dbe3ca Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 26 Dec 2023 19:20:26 +0800 Subject: [PATCH 2/8] more Signed-off-by: tison --- README.md | 10 +++---- docs/guide/scala_guide.md | 2 +- integration_tests/graalvm_tests/pom.xml | 4 +-- .../jdk_compatibility_tests/pom.xml | 4 +-- integration_tests/latest_jdk_tests/pom.xml | 6 ++--- integration_tests/perftests/pom.xml | 4 +-- java/fury-benchmark/README.md | 27 +++++++++---------- java/fury-benchmark/pom.xml | 8 +++--- .../apache}/fury/benchmark/ArraySuite.java | 0 .../apache}/fury/benchmark/Benchmark.java | 0 .../fury/benchmark/CollectionSuite.java | 0 .../fury/benchmark/CompressStringSuite.java | 0 .../fury/benchmark/Identity2IdMap.java | 0 .../benchmark/IntsDeserializationSuite.java | 0 .../benchmark/IntsSerializationSuite.java | 0 .../LongStringDeserializationSuite.java | 0 .../LongStringSerializationSuite.java | 0 .../benchmark/LongsDeserializationSuite.java | 0 .../benchmark/LongsSerializationSuite.java | 0 .../apache}/fury/benchmark/MapSuite.java | 0 .../apache}/fury/benchmark/MemorySuite.java | 0 .../fury/benchmark/NewJava11StringSuite.java | 0 .../fury/benchmark/NewStringSuite.java | 0 .../apache}/fury/benchmark/RowSuite.java | 0 .../benchmark/StringDeserializationSuite.java | 0 .../benchmark/StringSerializationSuite.java | 0 .../benchmark/UserTypeDeserializeSuite.java | 0 .../benchmark/UserTypeSerializeSuite.java | 0 .../apache}/fury/benchmark/ZeroCopySuite.java | 0 .../benchmark/data/ComparableByteArray.java | 0 .../data/CustomJDKSerialization.java | 0 .../apache}/fury/benchmark/data/Data.java | 0 .../apache}/fury/benchmark/data/Image.java | 0 .../apache}/fury/benchmark/data/Media.java | 0 .../fury/benchmark/data/MediaContent.java | 0 .../apache}/fury/benchmark/data/Sample.java | 0 .../data/SerializableByteBuffer.java | 0 .../apache}/fury/benchmark/data/Struct.java | 0 .../fury/benchmark/state/BenchmarkState.java | 0 .../fury/benchmark/state/BufferType.java | 0 .../fury/benchmark/state/FstState.java | 0 .../fury/benchmark/state/FuryState.java | 0 .../fury/benchmark/state/HessionState.java | 0 .../fury/benchmark/state/JDKState.java | 0 .../fury/benchmark/state/JsonbState.java | 0 .../fury/benchmark/state/KryoState.java | 0 .../fury/benchmark/state/ObjectType.java | 0 .../fury/benchmark/state/ProtostuffState.java | 0 java/fury-core/pom.xml | 6 ++--- .../java/{io => org/apache}/fury/Fury.java | 0 .../apache}/fury/ThreadLocalFury.java | 0 .../apache}/fury/ThreadSafeFury.java | 0 .../fury/annotation/CodegenInvoke.java | 0 .../apache}/fury/annotation/Ignore.java | 0 .../apache}/fury/annotation/Internal.java | 0 .../apache}/fury/annotation/Public.java | 0 .../apache}/fury/builder/AccessorHelper.java | 0 .../fury/builder/BaseObjectCodecBuilder.java | 0 .../apache}/fury/builder/CodecBuilder.java | 0 .../apache}/fury/builder/CodecUtils.java | 0 .../fury/builder/CompatibleCodecBuilder.java | 0 .../apache}/fury/builder/Generated.java | 0 .../apache}/fury/builder/JITContext.java | 0 .../fury/builder/MetaSharedCodecBuilder.java | 0 .../fury/builder/ObjectCodecBuilder.java | 0 .../fury/builder/ObjectCodecOptimizer.java | 0 .../apache}/fury/builder/package-info.java | 0 .../fury/codegen/ClosureVisitable.java | 0 .../{io => org/apache}/fury/codegen/Code.java | 0 .../apache}/fury/codegen/CodeFormatter.java | 0 .../apache}/fury/codegen/CodeGenerator.java | 0 .../apache}/fury/codegen/CodegenContext.java | 0 .../fury/codegen/CodegenException.java | 0 .../apache}/fury/codegen/CompileCallback.java | 0 .../apache}/fury/codegen/CompileState.java | 0 .../apache}/fury/codegen/CompileUnit.java | 0 .../apache}/fury/codegen/ExprState.java | 0 .../apache}/fury/codegen/Expression.java | 0 .../fury/codegen/ExpressionOptimizer.java | 0 .../apache}/fury/codegen/ExpressionUtils.java | 0 .../fury/codegen/ExpressionVisitor.java | 0 .../apache}/fury/codegen/FieldInfo.java | 0 .../apache}/fury/codegen/JaninoUtils.java | 0 .../apache}/fury/collection/Collections.java | 0 .../fury/collection/FuryObjectMap.java | 0 .../apache}/fury/collection/IdentityMap.java | 0 .../fury/collection/IdentityObjectIntMap.java | 0 .../apache}/fury/collection/IntArray.java | 0 .../apache}/fury/collection/LazyMap.java | 0 .../apache}/fury/collection/LongMap.java | 0 .../apache}/fury/collection/MapEntry.java | 0 .../fury/collection/MapStatistics.java | 0 .../fury/collection/MultiKeyWeakMap.java | 0 .../apache}/fury/collection/ObjectArray.java | 0 .../apache}/fury/collection/ObjectIntMap.java | 0 .../apache}/fury/collection/ObjectMap.java | 0 .../apache}/fury/collection/Tuple2.java | 0 .../apache}/fury/collection/Tuple3.java | 0 .../apache}/fury/config/CompatibleMode.java | 0 .../apache}/fury/config/Config.java | 0 .../apache}/fury/config/FuryBuilder.java | 0 .../apache}/fury/config/Language.java | 0 .../apache}/fury/config/LongEncoding.java | 0 .../ClassNotCompatibleException.java | 0 .../apache}/fury/exception/FuryException.java | 0 .../fury/exception/InsecureException.java | 0 .../fury/io/ClassLoaderObjectInputStream.java | 0 .../apache}/fury/io/FuryInputStream.java | 0 .../apache}/fury/io/FuryObjectInput.java | 0 .../apache}/fury/io/FuryObjectOutput.java | 0 .../apache}/fury/io/FuryOutputStream.java | 0 .../fury/io/FuryReadableByteChannel.java | 0 .../fury/io/FuryWritableByteChannel.java | 0 .../apache}/fury/io/MockOutputStream.java | 0 .../fury/io/MockWritableByteChannel.java | 0 .../apache}/fury/memory/BitUtils.java | 0 .../apache}/fury/memory/BoundsChecking.java | 0 .../apache}/fury/memory/MemoryBuffer.java | 0 .../apache}/fury/memory/MemoryUtils.java | 0 .../fury/pool/ClassLoaderFuryPooled.java | 0 .../fury/pool/FuryPooledObjectFactory.java | 0 .../apache}/fury/pool/ThreadPoolFury.java | 0 .../fury/resolver/AllowListChecker.java | 0 .../apache}/fury/resolver/BlackList.java | 0 .../apache}/fury/resolver/ClassChecker.java | 0 .../apache}/fury/resolver/ClassInfo.java | 0 .../fury/resolver/ClassInfoHolder.java | 0 .../apache}/fury/resolver/ClassResolver.java | 0 .../fury/resolver/EnumStringBytes.java | 0 .../fury/resolver/EnumStringResolver.java | 0 .../apache}/fury/resolver/FieldResolver.java | 0 .../apache}/fury/resolver/MapRefResolver.java | 0 .../apache}/fury/resolver/MetaContext.java | 0 .../apache}/fury/resolver/NoRefResolver.java | 0 .../apache}/fury/resolver/RefResolver.java | 0 .../fury/resolver/SerializationContext.java | 0 .../fury/serializer/ArraySerializers.java | 0 .../fury/serializer/BufferCallback.java | 0 .../apache}/fury/serializer/BufferObject.java | 0 .../fury/serializer/BufferSerializers.java | 0 .../fury/serializer/CodegenSerializer.java | 0 .../fury/serializer/CompatibleSerializer.java | 0 .../serializer/CompatibleSerializerBase.java | 0 .../serializer/ExternalizableSerializer.java | 0 .../fury/serializer/ForwardSerializer.java | 0 .../fury/serializer/JavaSerializer.java | 0 .../fury/serializer/JdkProxySerializer.java | 0 .../fury/serializer/LambdaSerializer.java | 0 .../fury/serializer/LocaleSerializer.java | 0 .../fury/serializer/MetaSharedSerializer.java | 0 .../fury/serializer/ObjectSerializer.java | 0 .../serializer/ObjectStreamSerializer.java | 0 .../fury/serializer/OpaqueObjects.java | 0 .../fury/serializer/OptionalSerializers.java | 0 .../fury/serializer/PrimitiveSerializers.java | 0 .../serializer/ReplaceResolveSerializer.java | 0 .../apache}/fury/serializer/Serializer.java | 0 .../fury/serializer/SerializerFactory.java | 0 .../apache}/fury/serializer/Serializers.java | 0 .../fury/serializer/StringSerializer.java | 0 .../apache}/fury/serializer/StringUTF16.java | 0 .../fury/serializer/StructSerializer.java | 0 .../fury/serializer/TimeSerializers.java | 0 .../fury/serializer/URLSerializer.java | 0 .../serializer/UnexistedClassSerializers.java | 0 .../AbstractCollectionSerializer.java | 0 .../collection/AbstractMapSerializer.java | 0 .../serializer/collection/ArrayAsList.java | 0 .../collection/ChildContainerSerializers.java | 0 .../collection/CollectionFlags.java | 0 .../collection/CollectionSerializer.java | 0 .../collection/CollectionSerializers.java | 0 .../fury/serializer/collection/Container.java | 0 .../collection/FuryArrayAsListSerializer.java | 0 .../GuavaCollectionSerializers.java | 0 .../ImmutableCollectionSerializers.java | 0 .../serializer/collection/MapSerializer.java | 0 .../serializer/collection/MapSerializers.java | 0 .../collection/SubListSerializers.java | 0 .../collection/SynchronizedSerializers.java | 0 .../collection/UnmodifiableSerializers.java | 0 .../scala/SingletonCollectionSerializer.java | 0 .../scala/SingletonMapSerializer.java | 0 .../scala/SingletonObjectSerializer.java | 0 .../fury/serializer/shim/ShimDispatcher.java | 0 .../apache}/fury/type/ClassDef.java | 0 .../apache}/fury/type/Descriptor.java | 0 .../apache}/fury/type/DescriptorGrouper.java | 0 .../fury/type/FinalObjectTypeStub.java | 0 .../apache}/fury/type/GenericType.java | 0 .../apache}/fury/type/Generics.java | 0 .../apache}/fury/type/ScalaTypes.java | 0 .../{io => org/apache}/fury/type/Type.java | 0 .../apache}/fury/type/TypeUtils.java | 0 .../apache}/fury/util/ClassLoaderUtils.java | 0 .../apache}/fury/util/DateTimeUtils.java | 0 .../apache}/fury/util/DecimalUtils.java | 0 .../apache}/fury/util/ExceptionUtils.java | 0 .../apache}/fury/util/FieldAccessor.java | 0 .../apache}/fury/util/GraalvmSupport.java | 0 .../apache}/fury/util/LoaderBinding.java | 0 .../apache}/fury/util/LoggerFactory.java | 0 .../apache}/fury/util/MathUtils.java | 0 .../apache}/fury/util/MurmurHash3.java | 0 .../apache}/fury/util/Platform.java | 0 .../apache}/fury/util/Preconditions.java | 0 .../apache}/fury/util/ReflectionUtils.java | 0 .../apache}/fury/util/StringUtils.java | 0 .../fury/util/UnsafeFieldAccessor.java | 0 .../{io => org/apache}/fury/util/Utils.java | 0 .../apache}/fury/util/function/Functions.java | 0 .../util/function/SerializableBiFunction.java | 0 .../util/function/SerializableFunction.java | 0 .../util/function/SerializableSupplier.java | 0 .../function/SerializableTriFunction.java | 0 .../fury/util/function/ToByteFunction.java | 0 .../fury/util/function/ToCharFunction.java | 0 .../fury/util/function/ToFloatFunction.java | 0 .../fury/util/function/ToShortFunction.java | 0 .../fury/util/function/TriFunction.java | 0 .../fury/util/record/RecordComponent.java | 0 .../apache}/fury/util/record/RecordInfo.java | 0 .../apache}/fury/util/record/RecordUtils.java | 0 .../fury/util/unsafe/_Collections.java | 0 .../apache}/fury/util/unsafe/_JDKAccess.java | 0 .../apache}/fury/util/unsafe/_Lookup.java | 0 .../apache}/fury/CrossLanguageTest.java | 0 .../{io => org/apache}/fury/CyclicTest.java | 0 .../{io => org/apache}/fury/FuryInitPerf.java | 0 .../{io => org/apache}/fury/FuryTest.java | 0 .../{io => org/apache}/fury/FuryTestBase.java | 0 .../apache}/fury/OutOfBandTest.java | 0 .../{io => org/apache}/fury/TestUtils.java | 0 .../apache}/fury/ThreadSafeFuryTest.java | 0 .../fury/builder/AccessorHelperTest.java | 0 .../apache}/fury/builder/CodecUtilsTest.java | 0 .../apache}/fury/builder/JITContextTest.java | 0 .../fury/builder/ObjectCodecBuilderTest.java | 0 .../fury/builder/pkg/AccessLevelClass.java | 0 .../fury/codegen/CodeGeneratorTest.java | 0 .../fury/codegen/CodegenContextTest.java | 0 .../fury/codegen/ExpressionOptimizerTest.java | 0 .../apache}/fury/codegen/ExpressionTest.java | 0 .../fury/codegen/ExpressionVisitorTest.java | 0 .../apache}/fury/codegen/JaninoUtilsTest.java | 0 .../fury/collection/CollectionsTest.java | 0 .../fury/collection/FuryObjectMapTest.java | 0 .../collection/IdentityObjectIntMapTest.java | 0 .../apache}/fury/collection/IntArrayTest.java | 0 .../apache}/fury/collection/LazyMapTest.java | 0 .../fury/collection/MultiKeyWeakMapTest.java | 0 .../fury/collection/ObjectArrayTest.java | 0 .../fury/collection/ObjectIntMapTest.java | 0 .../apache}/fury/collection/Tuple2Test.java | 0 .../apache}/fury/collection/Tuple3Test.java | 0 .../apache}/fury/io/FuryObjectInputTest.java | 0 .../apache}/fury/io/FuryObjectOutputTest.java | 0 .../apache}/fury/io/MockOutputStreamTest.java | 0 .../fury/io/MockWritableByteChannelTest.java | 0 .../apache}/fury/memory/BitUtilsTest.java | 0 .../apache}/fury/memory/MemoryBufferTest.java | 0 .../fury/resolver/AllowListCheckerTest.java | 0 .../apache}/fury/resolver/BlackListTest.java | 0 .../fury/resolver/ClassResolverTest.java | 0 .../fury/resolver/EnumStringResolverTest.java | 0 .../fury/resolver/FieldResolverTest.java | 0 .../fury/resolver/MapRefResolverTest.java | 0 .../fury/resolver/MetaContextTest.java | 0 .../fury/resolver/NoRefResolverTest.java | 0 .../resolver/SerializationContextTest.java | 0 .../apache}/fury/resolver/longlongpkg/C1.java | 0 .../apache}/fury/resolver/longlongpkg/C2.java | 0 .../apache}/fury/resolver/longlongpkg/C3.java | 0 .../fury/serializer/ArraySerializersTest.java | 0 .../serializer/BufferSerializersTest.java | 0 .../apache}/fury/serializer/ClassUtils.java | 0 .../CodegenCompatibleSerializerTest.java | 0 .../serializer/CodegenSerializerTest.java | 0 .../serializer/CompatibleSerializerTest.java | 0 .../fury/serializer/DuplicateFieldsTest.java | 0 .../ExternalizableSerializerTest.java | 0 .../serializer/ForwardSerializerTest.java | 0 .../fury/serializer/JavaSerializerTest.java | 0 .../serializer/JdkProxySerializerTest.java | 0 .../fury/serializer/LambdaSerializerTest.java | 0 .../fury/serializer/LocaleSerializerTest.java | 0 .../serializer/MetaSharedCompatibleTest.java | 0 .../fury/serializer/ObjectSerializerTest.java | 0 .../ObjectStreamSerializerTest.java | 0 .../serializer/OptionalSerializersTest.java | 0 .../serializer/PrimitiveSerializersTest.java | 0 .../ProtocolInteroperabilityTest.java | 0 .../ReplaceResolveSerializerTest.java | 0 .../serializer/SerializerFactoryTest.java | 0 .../fury/serializer/SerializersTest.java | 0 .../fury/serializer/StringSerializerTest.java | 0 .../fury/serializer/TimeSerializersTest.java | 0 .../fury/serializer/URLSerializerTest.java | 0 .../UnexistedClassSerializersTest.java | 0 .../ChildContainerSerializersTest.java | 0 .../collection/CollectionSerializersTest.java | 0 .../GuavaCollectionSerializersTest.java | 0 .../collection/MapSerializersTest.java | 0 .../SynchronizedSerializersTest.java | 0 .../UnmodifiableSerializersTest.java | 0 .../apache}/fury/serializer/test/Factory.java | 0 .../fury/serializer/test/Inaccessible.java | 0 .../apache}/fury/type/ClassDefTest.java | 0 .../fury/type/DescriptorGrouperTest.java | 0 .../apache}/fury/type/DescriptorTest.java | 0 .../apache}/fury/type/GenericsTest.java | 0 .../apache}/fury/type/TypeUtilsTest.java | 0 .../fury/util/ClassLoaderUtilsTest.java | 0 .../apache}/fury/util/DecimalUtilsTest.java | 0 .../apache}/fury/util/FunctionsTest.java | 0 .../apache}/fury/util/MurmurHash3Test.java | 0 .../apache}/fury/util/PlatformTest.java | 0 .../fury/util/ReflectionUtilsTest.java | 0 .../apache}/fury/util/StringUtilsTest.java | 0 .../fury/util/UnsafeFieldAccessorTest.java | 0 .../fury/util/unsafe/JDKAccessTest.java | 0 java/fury-format/README.md | 4 ++- java/fury-format/pom.xml | 8 +++--- .../fury/format/encoder/ArrayDataForEach.java | 0 .../fury/format/encoder/ArrayEncoder.java | 0 .../format/encoder/ArrayEncoderBuilder.java | 0 .../encoder/BaseBinaryEncoderBuilder.java | 0 .../apache}/fury/format/encoder/Encoder.java | 0 .../fury/format/encoder/EncoderException.java | 0 .../apache}/fury/format/encoder/Encoders.java | 0 .../format/encoder/GeneratedArrayEncoder.java | 0 .../format/encoder/GeneratedMapEncoder.java | 0 .../format/encoder/GeneratedRowEncoder.java | 0 .../fury/format/encoder/MapEncoder.java | 0 .../format/encoder/MapEncoderBuilder.java | 0 .../fury/format/encoder/RowEncoder.java | 0 .../format/encoder/RowEncoderBuilder.java | 0 .../apache}/fury/format/row/ArrayData.java | 0 .../apache}/fury/format/row/Getters.java | 0 .../apache}/fury/format/row/MapData.java | 0 .../apache}/fury/format/row/Row.java | 0 .../apache}/fury/format/row/Setters.java | 0 .../apache}/fury/format/row/ValueVisitor.java | 0 .../fury/format/row/binary/BinaryArray.java | 0 .../fury/format/row/binary/BinaryMap.java | 0 .../fury/format/row/binary/BinaryRow.java | 0 .../fury/format/row/binary/BinaryUtils.java | 0 .../fury/format/row/binary/UnsafeTrait.java | 0 .../row/binary/writer/BinaryArrayWriter.java | 0 .../row/binary/writer/BinaryRowWriter.java | 0 .../row/binary/writer/BinaryWriter.java | 0 .../apache}/fury/format/type/DataTypes.java | 0 .../fury/format/type/DefaultTypeVisitor.java | 0 .../fury/format/type/TypeInference.java | 0 .../format/vectorized/ArrowSerializers.java | 0 .../fury/format/vectorized/ArrowTable.java | 0 .../vectorized/ArrowTableSerializer.java | 0 .../fury/format/vectorized/ArrowUtils.java | 0 .../fury/format/vectorized/ArrowWriter.java | 0 .../fury/format/CrossLanguageTest.java | 0 .../fury/format/encoder/ArrayEncoderTest.java | 0 .../fury/format/encoder/CodecBuilderTest.java | 0 .../fury/format/encoder/MapEncoderTest.java | 0 .../fury/format/encoder/RowEncoderTest.java | 0 .../format/row/binary/BinaryArrayTest.java | 0 .../fury/format/row/binary/BinaryMapTest.java | 0 .../fury/format/row/binary/BinaryRowTest.java | 0 .../fury/format/type/DataTypesTest.java | 0 .../fury/format/type/TypeInferenceTest.java | 0 .../vectorized/ArrowSerializersTest.java | 0 .../format/vectorized/ArrowUtilsTest.java | 0 .../format/vectorized/ArrowWriterTest.java | 0 java/fury-test-core/pom.xml | 2 +- .../apache}/fury/test/bean/AccessBeans.java | 0 .../apache}/fury/test/bean/ArraysData.java | 0 .../apache}/fury/test/bean/BeanA.java | 0 .../apache}/fury/test/bean/BeanB.java | 0 .../fury/test/bean/CollectionFields.java | 0 .../apache}/fury/test/bean/Cyclic.java | 0 .../apache}/fury/test/bean/FinalCyclic.java | 0 .../apache}/fury/test/bean/Foo.java | 0 .../apache}/fury/test/bean/MapFields.java | 0 .../apache}/fury/test/bean/Struct.java | 0 .../apache}/fury/test/bean/TestUtils.java | 0 .../apache}/fury/test/bean/StructTest.java | 0 java/fury-testsuite/README.md | 4 +-- java/fury-testsuite/pom.xml | 8 +++--- .../benchmark/DeserializationBenchmark.java | 0 .../benchmark/SerializationBenchmark.java | 0 .../apache}/fury/test/BeanMock.java | 0 .../{io => org/apache}/fury/test/DTOTest.java | 0 .../fury/test/ReadResolveCircularTest.java | 0 java/pom.xml | 4 +-- scala/build.sbt | 2 +- 394 files changed, 51 insertions(+), 52 deletions(-) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/ArraySuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/Benchmark.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/CollectionSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/CompressStringSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/Identity2IdMap.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/IntsDeserializationSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/IntsSerializationSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/LongStringDeserializationSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/LongStringSerializationSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/LongsDeserializationSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/LongsSerializationSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/MapSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/MemorySuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/NewJava11StringSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/NewStringSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/RowSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/StringDeserializationSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/StringSerializationSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/UserTypeDeserializeSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/UserTypeSerializeSuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/ZeroCopySuite.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/data/ComparableByteArray.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/data/CustomJDKSerialization.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/data/Data.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/data/Image.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/data/Media.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/data/MediaContent.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/data/Sample.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/data/SerializableByteBuffer.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/data/Struct.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/state/BenchmarkState.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/state/BufferType.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/state/FstState.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/state/FuryState.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/state/HessionState.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/state/JDKState.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/state/JsonbState.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/state/KryoState.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/state/ObjectType.java (100%) rename java/fury-benchmark/src/main/java/{io => org/apache}/fury/benchmark/state/ProtostuffState.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/Fury.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/ThreadLocalFury.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/ThreadSafeFury.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/annotation/CodegenInvoke.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/annotation/Ignore.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/annotation/Internal.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/annotation/Public.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/builder/AccessorHelper.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/builder/BaseObjectCodecBuilder.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/builder/CodecBuilder.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/builder/CodecUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/builder/CompatibleCodecBuilder.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/builder/Generated.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/builder/JITContext.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/builder/MetaSharedCodecBuilder.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/builder/ObjectCodecBuilder.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/builder/ObjectCodecOptimizer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/builder/package-info.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/ClosureVisitable.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/Code.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/CodeFormatter.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/CodeGenerator.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/CodegenContext.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/CodegenException.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/CompileCallback.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/CompileState.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/CompileUnit.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/ExprState.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/Expression.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/ExpressionOptimizer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/ExpressionUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/ExpressionVisitor.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/FieldInfo.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/codegen/JaninoUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/Collections.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/FuryObjectMap.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/IdentityMap.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/IdentityObjectIntMap.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/IntArray.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/LazyMap.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/LongMap.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/MapEntry.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/MapStatistics.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/MultiKeyWeakMap.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/ObjectArray.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/ObjectIntMap.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/ObjectMap.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/Tuple2.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/collection/Tuple3.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/config/CompatibleMode.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/config/Config.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/config/FuryBuilder.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/config/Language.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/config/LongEncoding.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/exception/ClassNotCompatibleException.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/exception/FuryException.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/exception/InsecureException.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/io/ClassLoaderObjectInputStream.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/io/FuryInputStream.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/io/FuryObjectInput.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/io/FuryObjectOutput.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/io/FuryOutputStream.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/io/FuryReadableByteChannel.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/io/FuryWritableByteChannel.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/io/MockOutputStream.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/io/MockWritableByteChannel.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/memory/BitUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/memory/BoundsChecking.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/memory/MemoryBuffer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/memory/MemoryUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/pool/ClassLoaderFuryPooled.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/pool/FuryPooledObjectFactory.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/pool/ThreadPoolFury.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/AllowListChecker.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/BlackList.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/ClassChecker.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/ClassInfo.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/ClassInfoHolder.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/ClassResolver.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/EnumStringBytes.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/EnumStringResolver.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/FieldResolver.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/MapRefResolver.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/MetaContext.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/NoRefResolver.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/RefResolver.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/resolver/SerializationContext.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/ArraySerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/BufferCallback.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/BufferObject.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/BufferSerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/CodegenSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/CompatibleSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/CompatibleSerializerBase.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/ExternalizableSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/ForwardSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/JavaSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/JdkProxySerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/LambdaSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/LocaleSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/MetaSharedSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/ObjectSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/ObjectStreamSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/OpaqueObjects.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/OptionalSerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/PrimitiveSerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/ReplaceResolveSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/Serializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/SerializerFactory.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/Serializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/StringSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/StringUTF16.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/StructSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/TimeSerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/URLSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/UnexistedClassSerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/AbstractCollectionSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/AbstractMapSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/ArrayAsList.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/ChildContainerSerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/CollectionFlags.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/CollectionSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/CollectionSerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/Container.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/FuryArrayAsListSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/GuavaCollectionSerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/ImmutableCollectionSerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/MapSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/MapSerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/SubListSerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/SynchronizedSerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/collection/UnmodifiableSerializers.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/scala/SingletonCollectionSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/scala/SingletonMapSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/scala/SingletonObjectSerializer.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/serializer/shim/ShimDispatcher.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/type/ClassDef.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/type/Descriptor.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/type/DescriptorGrouper.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/type/FinalObjectTypeStub.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/type/GenericType.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/type/Generics.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/type/ScalaTypes.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/type/Type.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/type/TypeUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/ClassLoaderUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/DateTimeUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/DecimalUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/ExceptionUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/FieldAccessor.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/GraalvmSupport.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/LoaderBinding.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/LoggerFactory.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/MathUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/MurmurHash3.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/Platform.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/Preconditions.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/ReflectionUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/StringUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/UnsafeFieldAccessor.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/Utils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/function/Functions.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/function/SerializableBiFunction.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/function/SerializableFunction.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/function/SerializableSupplier.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/function/SerializableTriFunction.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/function/ToByteFunction.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/function/ToCharFunction.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/function/ToFloatFunction.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/function/ToShortFunction.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/function/TriFunction.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/record/RecordComponent.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/record/RecordInfo.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/record/RecordUtils.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/unsafe/_Collections.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/unsafe/_JDKAccess.java (100%) rename java/fury-core/src/main/java/{io => org/apache}/fury/util/unsafe/_Lookup.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/CrossLanguageTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/CyclicTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/FuryInitPerf.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/FuryTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/FuryTestBase.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/OutOfBandTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/TestUtils.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/ThreadSafeFuryTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/builder/AccessorHelperTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/builder/CodecUtilsTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/builder/JITContextTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/builder/ObjectCodecBuilderTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/builder/pkg/AccessLevelClass.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/codegen/CodeGeneratorTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/codegen/CodegenContextTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/codegen/ExpressionOptimizerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/codegen/ExpressionTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/codegen/ExpressionVisitorTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/codegen/JaninoUtilsTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/collection/CollectionsTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/collection/FuryObjectMapTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/collection/IdentityObjectIntMapTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/collection/IntArrayTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/collection/LazyMapTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/collection/MultiKeyWeakMapTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/collection/ObjectArrayTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/collection/ObjectIntMapTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/collection/Tuple2Test.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/collection/Tuple3Test.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/io/FuryObjectInputTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/io/FuryObjectOutputTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/io/MockOutputStreamTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/io/MockWritableByteChannelTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/memory/BitUtilsTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/memory/MemoryBufferTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/resolver/AllowListCheckerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/resolver/BlackListTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/resolver/ClassResolverTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/resolver/EnumStringResolverTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/resolver/FieldResolverTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/resolver/MapRefResolverTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/resolver/MetaContextTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/resolver/NoRefResolverTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/resolver/SerializationContextTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/resolver/longlongpkg/C1.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/resolver/longlongpkg/C2.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/resolver/longlongpkg/C3.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/ArraySerializersTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/BufferSerializersTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/ClassUtils.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/CodegenCompatibleSerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/CodegenSerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/CompatibleSerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/DuplicateFieldsTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/ExternalizableSerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/ForwardSerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/JavaSerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/JdkProxySerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/LambdaSerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/LocaleSerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/MetaSharedCompatibleTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/ObjectSerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/ObjectStreamSerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/OptionalSerializersTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/PrimitiveSerializersTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/ProtocolInteroperabilityTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/ReplaceResolveSerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/SerializerFactoryTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/SerializersTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/StringSerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/TimeSerializersTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/URLSerializerTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/UnexistedClassSerializersTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/collection/ChildContainerSerializersTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/collection/CollectionSerializersTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/collection/GuavaCollectionSerializersTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/collection/MapSerializersTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/collection/SynchronizedSerializersTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/collection/UnmodifiableSerializersTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/test/Factory.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/serializer/test/Inaccessible.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/type/ClassDefTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/type/DescriptorGrouperTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/type/DescriptorTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/type/GenericsTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/type/TypeUtilsTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/util/ClassLoaderUtilsTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/util/DecimalUtilsTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/util/FunctionsTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/util/MurmurHash3Test.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/util/PlatformTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/util/ReflectionUtilsTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/util/StringUtilsTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/util/UnsafeFieldAccessorTest.java (100%) rename java/fury-core/src/test/java/{io => org/apache}/fury/util/unsafe/JDKAccessTest.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/ArrayDataForEach.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/ArrayEncoder.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/ArrayEncoderBuilder.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/BaseBinaryEncoderBuilder.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/Encoder.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/EncoderException.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/Encoders.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/GeneratedArrayEncoder.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/GeneratedMapEncoder.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/GeneratedRowEncoder.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/MapEncoder.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/MapEncoderBuilder.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/RowEncoder.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/encoder/RowEncoderBuilder.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/ArrayData.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/Getters.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/MapData.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/Row.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/Setters.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/ValueVisitor.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/binary/BinaryArray.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/binary/BinaryMap.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/binary/BinaryRow.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/binary/BinaryUtils.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/binary/UnsafeTrait.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/binary/writer/BinaryArrayWriter.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/binary/writer/BinaryRowWriter.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/row/binary/writer/BinaryWriter.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/type/DataTypes.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/type/DefaultTypeVisitor.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/type/TypeInference.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/vectorized/ArrowSerializers.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/vectorized/ArrowTable.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/vectorized/ArrowTableSerializer.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/vectorized/ArrowUtils.java (100%) rename java/fury-format/src/main/java/{io => org/apache}/fury/format/vectorized/ArrowWriter.java (100%) rename java/fury-format/src/test/java/{io => org/apache}/fury/format/CrossLanguageTest.java (100%) rename java/fury-format/src/test/java/{io => org/apache}/fury/format/encoder/ArrayEncoderTest.java (100%) rename java/fury-format/src/test/java/{io => org/apache}/fury/format/encoder/CodecBuilderTest.java (100%) rename java/fury-format/src/test/java/{io => org/apache}/fury/format/encoder/MapEncoderTest.java (100%) rename java/fury-format/src/test/java/{io => org/apache}/fury/format/encoder/RowEncoderTest.java (100%) rename java/fury-format/src/test/java/{io => org/apache}/fury/format/row/binary/BinaryArrayTest.java (100%) rename java/fury-format/src/test/java/{io => org/apache}/fury/format/row/binary/BinaryMapTest.java (100%) rename java/fury-format/src/test/java/{io => org/apache}/fury/format/row/binary/BinaryRowTest.java (100%) rename java/fury-format/src/test/java/{io => org/apache}/fury/format/type/DataTypesTest.java (100%) rename java/fury-format/src/test/java/{io => org/apache}/fury/format/type/TypeInferenceTest.java (100%) rename java/fury-format/src/test/java/{io => org/apache}/fury/format/vectorized/ArrowSerializersTest.java (100%) rename java/fury-format/src/test/java/{io => org/apache}/fury/format/vectorized/ArrowUtilsTest.java (100%) rename java/fury-format/src/test/java/{io => org/apache}/fury/format/vectorized/ArrowWriterTest.java (100%) rename java/fury-test-core/src/main/java/{io => org/apache}/fury/test/bean/AccessBeans.java (100%) rename java/fury-test-core/src/main/java/{io => org/apache}/fury/test/bean/ArraysData.java (100%) rename java/fury-test-core/src/main/java/{io => org/apache}/fury/test/bean/BeanA.java (100%) rename java/fury-test-core/src/main/java/{io => org/apache}/fury/test/bean/BeanB.java (100%) rename java/fury-test-core/src/main/java/{io => org/apache}/fury/test/bean/CollectionFields.java (100%) rename java/fury-test-core/src/main/java/{io => org/apache}/fury/test/bean/Cyclic.java (100%) rename java/fury-test-core/src/main/java/{io => org/apache}/fury/test/bean/FinalCyclic.java (100%) rename java/fury-test-core/src/main/java/{io => org/apache}/fury/test/bean/Foo.java (100%) rename java/fury-test-core/src/main/java/{io => org/apache}/fury/test/bean/MapFields.java (100%) rename java/fury-test-core/src/main/java/{io => org/apache}/fury/test/bean/Struct.java (100%) rename java/fury-test-core/src/main/java/{io => org/apache}/fury/test/bean/TestUtils.java (100%) rename java/fury-test-core/src/test/java/{io => org/apache}/fury/test/bean/StructTest.java (100%) rename java/fury-testsuite/src/test/java/{io => org/apache}/fury/benchmark/DeserializationBenchmark.java (100%) rename java/fury-testsuite/src/test/java/{io => org/apache}/fury/benchmark/SerializationBenchmark.java (100%) rename java/fury-testsuite/src/test/java/{io => org/apache}/fury/test/BeanMock.java (100%) rename java/fury-testsuite/src/test/java/{io => org/apache}/fury/test/DTOTest.java (100%) rename java/fury-testsuite/src/test/java/{io => org/apache}/fury/test/ReadResolveCircularTest.java (100%) diff --git a/README.md b/README.md index 0b767e70af..42b222c4b1 100644 --- a/README.md +++ b/README.md @@ -95,13 +95,13 @@ Nightly snapshot: - org.furyio + org.apache.fury fury-core 0.5.0-SNAPSHOT @@ -109,13 +109,13 @@ Nightly snapshot: Release version: ```xml - org.furyio + org.apache.fury fury-core 0.4.1 @@ -123,7 +123,7 @@ Release version: ### Scala ```sbt -libraryDependencies += "org.furyio" % "fury-core" % "0.4.1" +libraryDependencies += "org.apache.fury" % "fury-core" % "0.4.1" ``` ### Python diff --git a/docs/guide/scala_guide.md b/docs/guide/scala_guide.md index f984ad8073..ae1aa2f456 100644 --- a/docs/guide/scala_guide.md +++ b/docs/guide/scala_guide.md @@ -15,7 +15,7 @@ Scala 2 and 3 are both supported. ## Install ```sbt -libraryDependencies += "org.furyio" % "fury-core" % "0.4.1" +libraryDependencies += "org.apache.fury" % "fury-core" % "0.4.1" ``` ## Fury creation diff --git a/integration_tests/graalvm_tests/pom.xml b/integration_tests/graalvm_tests/pom.xml index 9a7a5599f3..9c6b5a3ee5 100644 --- a/integration_tests/graalvm_tests/pom.xml +++ b/integration_tests/graalvm_tests/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.furyio + org.apache.fury graalvm_tests 0.5.0-SNAPSHOT @@ -51,7 +51,7 @@ - org.furyio + org.apache.fury fury-core ${project.version} diff --git a/integration_tests/jdk_compatibility_tests/pom.xml b/integration_tests/jdk_compatibility_tests/pom.xml index d960640835..36e253c3b4 100644 --- a/integration_tests/jdk_compatibility_tests/pom.xml +++ b/integration_tests/jdk_compatibility_tests/pom.xml @@ -24,7 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.furyio + org.apache.fury jdk_compatibility_tests 0.5.0-SNAPSHOT @@ -36,7 +36,7 @@ - org.furyio + org.apache.fury fury-benchmark ${project.version} diff --git a/integration_tests/latest_jdk_tests/pom.xml b/integration_tests/latest_jdk_tests/pom.xml index cf68014d51..6e00f0b42e 100644 --- a/integration_tests/latest_jdk_tests/pom.xml +++ b/integration_tests/latest_jdk_tests/pom.xml @@ -24,7 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.furyio + org.apache.fury latest_jdk_tests 0.5.0-SNAPSHOT @@ -36,12 +36,12 @@ - org.furyio + org.apache.fury fury-core ${project.version} - org.furyio + org.apache.fury fury-test-core ${project.version} diff --git a/integration_tests/perftests/pom.xml b/integration_tests/perftests/pom.xml index 4af4625d26..639b57a162 100644 --- a/integration_tests/perftests/pom.xml +++ b/integration_tests/perftests/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.furyio + org.apache.fury perftests 0.5.0-SNAPSHOT @@ -51,7 +51,7 @@ - org.furyio + org.apache.fury fury-benchmark ${project.version} diff --git a/java/fury-benchmark/README.md b/java/fury-benchmark/README.md index f2ecd85c70..4ed3691d2f 100644 --- a/java/fury-benchmark/README.md +++ b/java/fury-benchmark/README.md @@ -1,4 +1,5 @@ # Fury Java Benchmark + Fury Java Benchmark contains benchmarks for: - Fury - JDK @@ -13,7 +14,7 @@ Fury Java Benchmark contains benchmarks for: # How to run -``` +```bash # Install fury cd ../java && mvn install -DskipTests && cd - @@ -32,7 +33,7 @@ cd .. && mvn -T10 install -DskipTests -Dcheckstyle.skip -Dlicense.skip -Dmaven.j mvn exec:java -Dexec.args="-f 3 -wi 5 -i 15 -t 1 -w 2s -r 2s -rf csv" ``` -See org.openjdk.jmh.runner.options.CommandLineOptions for more information about jmh options: +See `org.openjdk.jmh.runner.options.CommandLineOptions` for more information about jmh options: ``` -f fork @@ -47,7 +48,9 @@ See org.openjdk.jmh.runner.options.CommandLineOptions for more information about Save benchmark data to specified dir, then run `tool.py` to plot graphs. # Plotting + Fury uses pandas to process the jmh data, and uses matplotlib for plotting. + ```bash pip install pandas matplotlib python analyze.py @@ -57,7 +60,7 @@ python analyze.py Using `async-profiler` to generate flame graph. -``` +```bash export pic=s1.html nohup java -jar target/benchmarks.jar 'io.*Fury.*deserialize*' -f 1 -wi 1 -i 1 -t 1 -w 1s -r 35s -rf csv & profiler.sh -d 30 -f $pic `jps | grep ForkedMain | awk '{print $1}'` @@ -65,21 +68,15 @@ profiler.sh -d 30 -f $pic `jps | grep ForkedMain | awk '{print $1}'` # JIT optimization -1. Use `-XX:+PrintCompilation -XX:+UnlockDiagnosticVMOptions -XX:+PrintInlining` to inspect jit: - java -XX:+PrintCompilation -XX:+UnlockDiagnosticVMOptions -XX:+PrintInlining -jar target/benchmarks.jar io.*Fury.* - UserTypeBenchmark.serialize -f 0 -wi 1 -i 1 -t 1 -w 1s -r 35s -rf csv > compile.log +1. Use `-XX:+PrintCompilation -XX:+UnlockDiagnosticVMOptions -XX:+PrintInlining` to inspect JIT: + `java -XX:+PrintCompilation -XX:+UnlockDiagnosticVMOptions -XX:+PrintInlining -jar target/benchmarks.jar org.apache.fury.*Fury.* UserTypeBenchmark.serialize -f 0 -wi 1 -i 1 -t 1 -w 1s -r 35s -rf csv > compile.log` 2. Determine what the flags are set to on current platform: - -* Use `java ${other_options} -XX:+PrintFlagsFinal -version`, should include all other options on the command line - because some options affect others, particularly when setting GC-related flags. -* `jcmd $pid VM.flags -all` - -XX:FreqInlineSize= flag specifies the maximum number of bytecode instructions to inline for a method. - The default value depends on the platform – for 64-bit Linux, it's 325. - + * Use `java ${other_options} -XX:+PrintFlagsFinal -version`, should include all other options on the command line because some options affect others, particularly when setting GC-related flags. + * `jcmd $pid VM.flags -all` -XX:FreqInlineSize= flag specifies the maximum number of bytecode instructions to inline for a method. The default value depends on the platform – for 64-bit Linux, it's 325. 3. `hot method too big` need to be optimized. 4. See: - 4.1 https://wiki.openjdk.java.net/display/HotSpot/Server+Compiler+Inlining+Messages - 4.2 https://techblug.wordpress.com/2013/08/19/java-jit-compiler-inlining/ + * https://wiki.openjdk.java.net/display/HotSpot/Server+Compiler+Inlining+Messages + * https://techblug.wordpress.com/2013/08/19/java-jit-compiler-inlining/ 5. escape analysis 6. -server -XX:+TieredCompilation: In Java 8, when the server compiler is enabled, tiered compilation is also enabled by default. 64-bit java8 use server compiler by default(use java -version to check). diff --git a/java/fury-benchmark/pom.xml b/java/fury-benchmark/pom.xml index 8c18f8ce59..db44ee34ae 100644 --- a/java/fury-benchmark/pom.xml +++ b/java/fury-benchmark/pom.xml @@ -25,7 +25,7 @@ fury-parent - org.furyio + org.apache.fury 0.5.0-SNAPSHOT @@ -76,17 +76,17 @@ - org.furyio + org.apache.fury fury-core ${project.version} - org.furyio + org.apache.fury fury-format ${project.version} - org.furyio + org.apache.fury fury-test-core ${project.version} diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/ArraySuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/ArraySuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/ArraySuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/ArraySuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/Benchmark.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/Benchmark.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/Benchmark.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/Benchmark.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/CollectionSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/CollectionSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/CollectionSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/CollectionSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/CompressStringSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/CompressStringSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/Identity2IdMap.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/Identity2IdMap.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/IntsDeserializationSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/IntsDeserializationSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/IntsDeserializationSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/IntsDeserializationSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/IntsSerializationSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/IntsSerializationSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/IntsSerializationSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/IntsSerializationSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/LongStringDeserializationSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongStringDeserializationSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/LongStringDeserializationSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongStringDeserializationSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/LongStringSerializationSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongStringSerializationSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/LongStringSerializationSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongStringSerializationSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/LongsDeserializationSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongsDeserializationSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/LongsDeserializationSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongsDeserializationSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/LongsSerializationSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongsSerializationSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/LongsSerializationSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongsSerializationSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/MapSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/MapSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/MapSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/MapSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/MemorySuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/MemorySuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/MemorySuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/MemorySuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/NewJava11StringSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/NewJava11StringSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/NewJava11StringSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/NewJava11StringSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/NewStringSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/NewStringSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/NewStringSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/NewStringSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/RowSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/RowSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/RowSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/RowSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/StringDeserializationSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/StringDeserializationSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/StringDeserializationSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/StringDeserializationSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/StringSerializationSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/StringSerializationSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/StringSerializationSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/StringSerializationSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/UserTypeDeserializeSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/UserTypeDeserializeSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/UserTypeDeserializeSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/UserTypeDeserializeSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/UserTypeSerializeSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/UserTypeSerializeSuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/UserTypeSerializeSuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/UserTypeSerializeSuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/ZeroCopySuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/ZeroCopySuite.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/ZeroCopySuite.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/ZeroCopySuite.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/ComparableByteArray.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/ComparableByteArray.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/data/ComparableByteArray.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/ComparableByteArray.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/CustomJDKSerialization.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/CustomJDKSerialization.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/data/CustomJDKSerialization.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/CustomJDKSerialization.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Data.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Data.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/data/Data.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Data.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Image.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Image.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/data/Image.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Image.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Media.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Media.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/data/Media.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Media.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/MediaContent.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/MediaContent.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/data/MediaContent.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/MediaContent.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Sample.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Sample.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/data/Sample.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Sample.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/SerializableByteBuffer.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/SerializableByteBuffer.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/data/SerializableByteBuffer.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/SerializableByteBuffer.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/data/Struct.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Struct.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/data/Struct.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Struct.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/BenchmarkState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/BenchmarkState.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/state/BenchmarkState.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/BenchmarkState.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/BufferType.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/BufferType.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/state/BufferType.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/BufferType.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/FstState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/FstState.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/state/FstState.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/FstState.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/FuryState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/FuryState.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/state/FuryState.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/FuryState.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/HessionState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/HessionState.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/state/HessionState.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/HessionState.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/JDKState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/JDKState.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/state/JDKState.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/JDKState.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/JsonbState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/state/JsonbState.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/KryoState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/KryoState.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/state/KryoState.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/KryoState.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/ObjectType.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/ObjectType.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/state/ObjectType.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/ObjectType.java diff --git a/java/fury-benchmark/src/main/java/io/fury/benchmark/state/ProtostuffState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/ProtostuffState.java similarity index 100% rename from java/fury-benchmark/src/main/java/io/fury/benchmark/state/ProtostuffState.java rename to java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/ProtostuffState.java diff --git a/java/fury-core/pom.xml b/java/fury-core/pom.xml index a990e73acd..8527ea8a19 100644 --- a/java/fury-core/pom.xml +++ b/java/fury-core/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.furyio + org.apache.fury fury-parent 0.5.0-SNAPSHOT @@ -39,7 +39,7 @@ - https://furyio.org + https://fury.apache.org chaokunyang @@ -72,7 +72,7 @@ javassist - org.furyio + org.apache.fury fury-test-core ${project.version} test diff --git a/java/fury-core/src/main/java/io/fury/Fury.java b/java/fury-core/src/main/java/org/apache/fury/Fury.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/Fury.java rename to java/fury-core/src/main/java/org/apache/fury/Fury.java diff --git a/java/fury-core/src/main/java/io/fury/ThreadLocalFury.java b/java/fury-core/src/main/java/org/apache/fury/ThreadLocalFury.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/ThreadLocalFury.java rename to java/fury-core/src/main/java/org/apache/fury/ThreadLocalFury.java diff --git a/java/fury-core/src/main/java/io/fury/ThreadSafeFury.java b/java/fury-core/src/main/java/org/apache/fury/ThreadSafeFury.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/ThreadSafeFury.java rename to java/fury-core/src/main/java/org/apache/fury/ThreadSafeFury.java diff --git a/java/fury-core/src/main/java/io/fury/annotation/CodegenInvoke.java b/java/fury-core/src/main/java/org/apache/fury/annotation/CodegenInvoke.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/annotation/CodegenInvoke.java rename to java/fury-core/src/main/java/org/apache/fury/annotation/CodegenInvoke.java diff --git a/java/fury-core/src/main/java/io/fury/annotation/Ignore.java b/java/fury-core/src/main/java/org/apache/fury/annotation/Ignore.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/annotation/Ignore.java rename to java/fury-core/src/main/java/org/apache/fury/annotation/Ignore.java diff --git a/java/fury-core/src/main/java/io/fury/annotation/Internal.java b/java/fury-core/src/main/java/org/apache/fury/annotation/Internal.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/annotation/Internal.java rename to java/fury-core/src/main/java/org/apache/fury/annotation/Internal.java diff --git a/java/fury-core/src/main/java/io/fury/annotation/Public.java b/java/fury-core/src/main/java/org/apache/fury/annotation/Public.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/annotation/Public.java rename to java/fury-core/src/main/java/org/apache/fury/annotation/Public.java diff --git a/java/fury-core/src/main/java/io/fury/builder/AccessorHelper.java b/java/fury-core/src/main/java/org/apache/fury/builder/AccessorHelper.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/builder/AccessorHelper.java rename to java/fury-core/src/main/java/org/apache/fury/builder/AccessorHelper.java diff --git a/java/fury-core/src/main/java/io/fury/builder/BaseObjectCodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/builder/BaseObjectCodecBuilder.java rename to java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java diff --git a/java/fury-core/src/main/java/io/fury/builder/CodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/CodecBuilder.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/builder/CodecBuilder.java rename to java/fury-core/src/main/java/org/apache/fury/builder/CodecBuilder.java diff --git a/java/fury-core/src/main/java/io/fury/builder/CodecUtils.java b/java/fury-core/src/main/java/org/apache/fury/builder/CodecUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/builder/CodecUtils.java rename to java/fury-core/src/main/java/org/apache/fury/builder/CodecUtils.java diff --git a/java/fury-core/src/main/java/io/fury/builder/CompatibleCodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/builder/CompatibleCodecBuilder.java rename to java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java diff --git a/java/fury-core/src/main/java/io/fury/builder/Generated.java b/java/fury-core/src/main/java/org/apache/fury/builder/Generated.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/builder/Generated.java rename to java/fury-core/src/main/java/org/apache/fury/builder/Generated.java diff --git a/java/fury-core/src/main/java/io/fury/builder/JITContext.java b/java/fury-core/src/main/java/org/apache/fury/builder/JITContext.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/builder/JITContext.java rename to java/fury-core/src/main/java/org/apache/fury/builder/JITContext.java diff --git a/java/fury-core/src/main/java/io/fury/builder/MetaSharedCodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/MetaSharedCodecBuilder.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/builder/MetaSharedCodecBuilder.java rename to java/fury-core/src/main/java/org/apache/fury/builder/MetaSharedCodecBuilder.java diff --git a/java/fury-core/src/main/java/io/fury/builder/ObjectCodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/builder/ObjectCodecBuilder.java rename to java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java diff --git a/java/fury-core/src/main/java/io/fury/builder/ObjectCodecOptimizer.java b/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecOptimizer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/builder/ObjectCodecOptimizer.java rename to java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecOptimizer.java diff --git a/java/fury-core/src/main/java/io/fury/builder/package-info.java b/java/fury-core/src/main/java/org/apache/fury/builder/package-info.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/builder/package-info.java rename to java/fury-core/src/main/java/org/apache/fury/builder/package-info.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/ClosureVisitable.java b/java/fury-core/src/main/java/org/apache/fury/codegen/ClosureVisitable.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/ClosureVisitable.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/ClosureVisitable.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/Code.java b/java/fury-core/src/main/java/org/apache/fury/codegen/Code.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/Code.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/Code.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/CodeFormatter.java b/java/fury-core/src/main/java/org/apache/fury/codegen/CodeFormatter.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/CodeFormatter.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/CodeFormatter.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/CodeGenerator.java b/java/fury-core/src/main/java/org/apache/fury/codegen/CodeGenerator.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/CodeGenerator.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/CodeGenerator.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/CodegenContext.java b/java/fury-core/src/main/java/org/apache/fury/codegen/CodegenContext.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/CodegenContext.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/CodegenContext.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/CodegenException.java b/java/fury-core/src/main/java/org/apache/fury/codegen/CodegenException.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/CodegenException.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/CodegenException.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/CompileCallback.java b/java/fury-core/src/main/java/org/apache/fury/codegen/CompileCallback.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/CompileCallback.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/CompileCallback.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/CompileState.java b/java/fury-core/src/main/java/org/apache/fury/codegen/CompileState.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/CompileState.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/CompileState.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/CompileUnit.java b/java/fury-core/src/main/java/org/apache/fury/codegen/CompileUnit.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/CompileUnit.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/CompileUnit.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/ExprState.java b/java/fury-core/src/main/java/org/apache/fury/codegen/ExprState.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/ExprState.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/ExprState.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/Expression.java b/java/fury-core/src/main/java/org/apache/fury/codegen/Expression.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/Expression.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/Expression.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/ExpressionOptimizer.java b/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionOptimizer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/ExpressionOptimizer.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionOptimizer.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/ExpressionUtils.java b/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/ExpressionUtils.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionUtils.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/ExpressionVisitor.java b/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionVisitor.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/ExpressionVisitor.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionVisitor.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/FieldInfo.java b/java/fury-core/src/main/java/org/apache/fury/codegen/FieldInfo.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/FieldInfo.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/FieldInfo.java diff --git a/java/fury-core/src/main/java/io/fury/codegen/JaninoUtils.java b/java/fury-core/src/main/java/org/apache/fury/codegen/JaninoUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/codegen/JaninoUtils.java rename to java/fury-core/src/main/java/org/apache/fury/codegen/JaninoUtils.java diff --git a/java/fury-core/src/main/java/io/fury/collection/Collections.java b/java/fury-core/src/main/java/org/apache/fury/collection/Collections.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/Collections.java rename to java/fury-core/src/main/java/org/apache/fury/collection/Collections.java diff --git a/java/fury-core/src/main/java/io/fury/collection/FuryObjectMap.java b/java/fury-core/src/main/java/org/apache/fury/collection/FuryObjectMap.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/FuryObjectMap.java rename to java/fury-core/src/main/java/org/apache/fury/collection/FuryObjectMap.java diff --git a/java/fury-core/src/main/java/io/fury/collection/IdentityMap.java b/java/fury-core/src/main/java/org/apache/fury/collection/IdentityMap.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/IdentityMap.java rename to java/fury-core/src/main/java/org/apache/fury/collection/IdentityMap.java diff --git a/java/fury-core/src/main/java/io/fury/collection/IdentityObjectIntMap.java b/java/fury-core/src/main/java/org/apache/fury/collection/IdentityObjectIntMap.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/IdentityObjectIntMap.java rename to java/fury-core/src/main/java/org/apache/fury/collection/IdentityObjectIntMap.java diff --git a/java/fury-core/src/main/java/io/fury/collection/IntArray.java b/java/fury-core/src/main/java/org/apache/fury/collection/IntArray.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/IntArray.java rename to java/fury-core/src/main/java/org/apache/fury/collection/IntArray.java diff --git a/java/fury-core/src/main/java/io/fury/collection/LazyMap.java b/java/fury-core/src/main/java/org/apache/fury/collection/LazyMap.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/LazyMap.java rename to java/fury-core/src/main/java/org/apache/fury/collection/LazyMap.java diff --git a/java/fury-core/src/main/java/io/fury/collection/LongMap.java b/java/fury-core/src/main/java/org/apache/fury/collection/LongMap.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/LongMap.java rename to java/fury-core/src/main/java/org/apache/fury/collection/LongMap.java diff --git a/java/fury-core/src/main/java/io/fury/collection/MapEntry.java b/java/fury-core/src/main/java/org/apache/fury/collection/MapEntry.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/MapEntry.java rename to java/fury-core/src/main/java/org/apache/fury/collection/MapEntry.java diff --git a/java/fury-core/src/main/java/io/fury/collection/MapStatistics.java b/java/fury-core/src/main/java/org/apache/fury/collection/MapStatistics.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/MapStatistics.java rename to java/fury-core/src/main/java/org/apache/fury/collection/MapStatistics.java diff --git a/java/fury-core/src/main/java/io/fury/collection/MultiKeyWeakMap.java b/java/fury-core/src/main/java/org/apache/fury/collection/MultiKeyWeakMap.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/MultiKeyWeakMap.java rename to java/fury-core/src/main/java/org/apache/fury/collection/MultiKeyWeakMap.java diff --git a/java/fury-core/src/main/java/io/fury/collection/ObjectArray.java b/java/fury-core/src/main/java/org/apache/fury/collection/ObjectArray.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/ObjectArray.java rename to java/fury-core/src/main/java/org/apache/fury/collection/ObjectArray.java diff --git a/java/fury-core/src/main/java/io/fury/collection/ObjectIntMap.java b/java/fury-core/src/main/java/org/apache/fury/collection/ObjectIntMap.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/ObjectIntMap.java rename to java/fury-core/src/main/java/org/apache/fury/collection/ObjectIntMap.java diff --git a/java/fury-core/src/main/java/io/fury/collection/ObjectMap.java b/java/fury-core/src/main/java/org/apache/fury/collection/ObjectMap.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/ObjectMap.java rename to java/fury-core/src/main/java/org/apache/fury/collection/ObjectMap.java diff --git a/java/fury-core/src/main/java/io/fury/collection/Tuple2.java b/java/fury-core/src/main/java/org/apache/fury/collection/Tuple2.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/Tuple2.java rename to java/fury-core/src/main/java/org/apache/fury/collection/Tuple2.java diff --git a/java/fury-core/src/main/java/io/fury/collection/Tuple3.java b/java/fury-core/src/main/java/org/apache/fury/collection/Tuple3.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/collection/Tuple3.java rename to java/fury-core/src/main/java/org/apache/fury/collection/Tuple3.java diff --git a/java/fury-core/src/main/java/io/fury/config/CompatibleMode.java b/java/fury-core/src/main/java/org/apache/fury/config/CompatibleMode.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/config/CompatibleMode.java rename to java/fury-core/src/main/java/org/apache/fury/config/CompatibleMode.java diff --git a/java/fury-core/src/main/java/io/fury/config/Config.java b/java/fury-core/src/main/java/org/apache/fury/config/Config.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/config/Config.java rename to java/fury-core/src/main/java/org/apache/fury/config/Config.java diff --git a/java/fury-core/src/main/java/io/fury/config/FuryBuilder.java b/java/fury-core/src/main/java/org/apache/fury/config/FuryBuilder.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/config/FuryBuilder.java rename to java/fury-core/src/main/java/org/apache/fury/config/FuryBuilder.java diff --git a/java/fury-core/src/main/java/io/fury/config/Language.java b/java/fury-core/src/main/java/org/apache/fury/config/Language.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/config/Language.java rename to java/fury-core/src/main/java/org/apache/fury/config/Language.java diff --git a/java/fury-core/src/main/java/io/fury/config/LongEncoding.java b/java/fury-core/src/main/java/org/apache/fury/config/LongEncoding.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/config/LongEncoding.java rename to java/fury-core/src/main/java/org/apache/fury/config/LongEncoding.java diff --git a/java/fury-core/src/main/java/io/fury/exception/ClassNotCompatibleException.java b/java/fury-core/src/main/java/org/apache/fury/exception/ClassNotCompatibleException.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/exception/ClassNotCompatibleException.java rename to java/fury-core/src/main/java/org/apache/fury/exception/ClassNotCompatibleException.java diff --git a/java/fury-core/src/main/java/io/fury/exception/FuryException.java b/java/fury-core/src/main/java/org/apache/fury/exception/FuryException.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/exception/FuryException.java rename to java/fury-core/src/main/java/org/apache/fury/exception/FuryException.java diff --git a/java/fury-core/src/main/java/io/fury/exception/InsecureException.java b/java/fury-core/src/main/java/org/apache/fury/exception/InsecureException.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/exception/InsecureException.java rename to java/fury-core/src/main/java/org/apache/fury/exception/InsecureException.java diff --git a/java/fury-core/src/main/java/io/fury/io/ClassLoaderObjectInputStream.java b/java/fury-core/src/main/java/org/apache/fury/io/ClassLoaderObjectInputStream.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/io/ClassLoaderObjectInputStream.java rename to java/fury-core/src/main/java/org/apache/fury/io/ClassLoaderObjectInputStream.java diff --git a/java/fury-core/src/main/java/io/fury/io/FuryInputStream.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/io/FuryInputStream.java rename to java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java diff --git a/java/fury-core/src/main/java/io/fury/io/FuryObjectInput.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryObjectInput.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/io/FuryObjectInput.java rename to java/fury-core/src/main/java/org/apache/fury/io/FuryObjectInput.java diff --git a/java/fury-core/src/main/java/io/fury/io/FuryObjectOutput.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryObjectOutput.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/io/FuryObjectOutput.java rename to java/fury-core/src/main/java/org/apache/fury/io/FuryObjectOutput.java diff --git a/java/fury-core/src/main/java/io/fury/io/FuryOutputStream.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryOutputStream.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/io/FuryOutputStream.java rename to java/fury-core/src/main/java/org/apache/fury/io/FuryOutputStream.java diff --git a/java/fury-core/src/main/java/io/fury/io/FuryReadableByteChannel.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryReadableByteChannel.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/io/FuryReadableByteChannel.java rename to java/fury-core/src/main/java/org/apache/fury/io/FuryReadableByteChannel.java diff --git a/java/fury-core/src/main/java/io/fury/io/FuryWritableByteChannel.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryWritableByteChannel.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/io/FuryWritableByteChannel.java rename to java/fury-core/src/main/java/org/apache/fury/io/FuryWritableByteChannel.java diff --git a/java/fury-core/src/main/java/io/fury/io/MockOutputStream.java b/java/fury-core/src/main/java/org/apache/fury/io/MockOutputStream.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/io/MockOutputStream.java rename to java/fury-core/src/main/java/org/apache/fury/io/MockOutputStream.java diff --git a/java/fury-core/src/main/java/io/fury/io/MockWritableByteChannel.java b/java/fury-core/src/main/java/org/apache/fury/io/MockWritableByteChannel.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/io/MockWritableByteChannel.java rename to java/fury-core/src/main/java/org/apache/fury/io/MockWritableByteChannel.java diff --git a/java/fury-core/src/main/java/io/fury/memory/BitUtils.java b/java/fury-core/src/main/java/org/apache/fury/memory/BitUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/memory/BitUtils.java rename to java/fury-core/src/main/java/org/apache/fury/memory/BitUtils.java diff --git a/java/fury-core/src/main/java/io/fury/memory/BoundsChecking.java b/java/fury-core/src/main/java/org/apache/fury/memory/BoundsChecking.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/memory/BoundsChecking.java rename to java/fury-core/src/main/java/org/apache/fury/memory/BoundsChecking.java diff --git a/java/fury-core/src/main/java/io/fury/memory/MemoryBuffer.java b/java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/memory/MemoryBuffer.java rename to java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java diff --git a/java/fury-core/src/main/java/io/fury/memory/MemoryUtils.java b/java/fury-core/src/main/java/org/apache/fury/memory/MemoryUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/memory/MemoryUtils.java rename to java/fury-core/src/main/java/org/apache/fury/memory/MemoryUtils.java diff --git a/java/fury-core/src/main/java/io/fury/pool/ClassLoaderFuryPooled.java b/java/fury-core/src/main/java/org/apache/fury/pool/ClassLoaderFuryPooled.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/pool/ClassLoaderFuryPooled.java rename to java/fury-core/src/main/java/org/apache/fury/pool/ClassLoaderFuryPooled.java diff --git a/java/fury-core/src/main/java/io/fury/pool/FuryPooledObjectFactory.java b/java/fury-core/src/main/java/org/apache/fury/pool/FuryPooledObjectFactory.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/pool/FuryPooledObjectFactory.java rename to java/fury-core/src/main/java/org/apache/fury/pool/FuryPooledObjectFactory.java diff --git a/java/fury-core/src/main/java/io/fury/pool/ThreadPoolFury.java b/java/fury-core/src/main/java/org/apache/fury/pool/ThreadPoolFury.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/pool/ThreadPoolFury.java rename to java/fury-core/src/main/java/org/apache/fury/pool/ThreadPoolFury.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/AllowListChecker.java b/java/fury-core/src/main/java/org/apache/fury/resolver/AllowListChecker.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/AllowListChecker.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/AllowListChecker.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/BlackList.java b/java/fury-core/src/main/java/org/apache/fury/resolver/BlackList.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/BlackList.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/BlackList.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/ClassChecker.java b/java/fury-core/src/main/java/org/apache/fury/resolver/ClassChecker.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/ClassChecker.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/ClassChecker.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/ClassInfo.java b/java/fury-core/src/main/java/org/apache/fury/resolver/ClassInfo.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/ClassInfo.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/ClassInfo.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/ClassInfoHolder.java b/java/fury-core/src/main/java/org/apache/fury/resolver/ClassInfoHolder.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/ClassInfoHolder.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/ClassInfoHolder.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/ClassResolver.java b/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/ClassResolver.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/EnumStringBytes.java b/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringBytes.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/EnumStringBytes.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringBytes.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/EnumStringResolver.java b/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringResolver.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/EnumStringResolver.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringResolver.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/FieldResolver.java b/java/fury-core/src/main/java/org/apache/fury/resolver/FieldResolver.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/FieldResolver.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/FieldResolver.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/MapRefResolver.java b/java/fury-core/src/main/java/org/apache/fury/resolver/MapRefResolver.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/MapRefResolver.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/MapRefResolver.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/MetaContext.java b/java/fury-core/src/main/java/org/apache/fury/resolver/MetaContext.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/MetaContext.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/MetaContext.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/NoRefResolver.java b/java/fury-core/src/main/java/org/apache/fury/resolver/NoRefResolver.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/NoRefResolver.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/NoRefResolver.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/RefResolver.java b/java/fury-core/src/main/java/org/apache/fury/resolver/RefResolver.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/RefResolver.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/RefResolver.java diff --git a/java/fury-core/src/main/java/io/fury/resolver/SerializationContext.java b/java/fury-core/src/main/java/org/apache/fury/resolver/SerializationContext.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/resolver/SerializationContext.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/SerializationContext.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/ArraySerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ArraySerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/ArraySerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/ArraySerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/BufferCallback.java b/java/fury-core/src/main/java/org/apache/fury/serializer/BufferCallback.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/BufferCallback.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/BufferCallback.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/BufferObject.java b/java/fury-core/src/main/java/org/apache/fury/serializer/BufferObject.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/BufferObject.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/BufferObject.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/BufferSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/BufferSerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/BufferSerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/BufferSerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/CodegenSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/CodegenSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/CodegenSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/CodegenSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/CompatibleSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/CompatibleSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/CompatibleSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/CompatibleSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/CompatibleSerializerBase.java b/java/fury-core/src/main/java/org/apache/fury/serializer/CompatibleSerializerBase.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/CompatibleSerializerBase.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/CompatibleSerializerBase.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/ExternalizableSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/ExternalizableSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/ForwardSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ForwardSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/ForwardSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/ForwardSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/JavaSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/JavaSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/JdkProxySerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/JdkProxySerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/JdkProxySerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/JdkProxySerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/LambdaSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/LambdaSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/LambdaSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/LambdaSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/LocaleSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/LocaleSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/LocaleSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/LocaleSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/MetaSharedSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/MetaSharedSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/ObjectSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/ObjectSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/ObjectSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/ObjectStreamSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/ObjectStreamSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/OpaqueObjects.java b/java/fury-core/src/main/java/org/apache/fury/serializer/OpaqueObjects.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/OpaqueObjects.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/OpaqueObjects.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/OptionalSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/OptionalSerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/OptionalSerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/OptionalSerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/PrimitiveSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/PrimitiveSerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/PrimitiveSerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/PrimitiveSerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/ReplaceResolveSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ReplaceResolveSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/ReplaceResolveSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/ReplaceResolveSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/Serializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/Serializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/Serializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/Serializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/SerializerFactory.java b/java/fury-core/src/main/java/org/apache/fury/serializer/SerializerFactory.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/SerializerFactory.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/SerializerFactory.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/Serializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/Serializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/StringSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/StringSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/StringUTF16.java b/java/fury-core/src/main/java/org/apache/fury/serializer/StringUTF16.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/StringUTF16.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/StringUTF16.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/StructSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/StructSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/TimeSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/TimeSerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/TimeSerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/TimeSerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/URLSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/URLSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/URLSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/URLSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/UnexistedClassSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/UnexistedClassSerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/UnexistedClassSerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/UnexistedClassSerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/AbstractCollectionSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractCollectionSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/AbstractCollectionSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractCollectionSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/AbstractMapSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractMapSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/AbstractMapSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractMapSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/ArrayAsList.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ArrayAsList.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/ArrayAsList.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/ArrayAsList.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/ChildContainerSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ChildContainerSerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/ChildContainerSerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/ChildContainerSerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionFlags.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionFlags.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/CollectionFlags.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionFlags.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/CollectionSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/CollectionSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/CollectionSerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/Container.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/Container.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/Container.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/Container.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/FuryArrayAsListSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/FuryArrayAsListSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/FuryArrayAsListSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/FuryArrayAsListSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/GuavaCollectionSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/GuavaCollectionSerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/GuavaCollectionSerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/GuavaCollectionSerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/ImmutableCollectionSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ImmutableCollectionSerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/ImmutableCollectionSerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/ImmutableCollectionSerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/MapSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/MapSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/MapSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/MapSerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/SubListSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SubListSerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/SubListSerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/SubListSerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/SynchronizedSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/SynchronizedSerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/collection/UnmodifiableSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/collection/UnmodifiableSerializers.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonCollectionSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonCollectionSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/scala/SingletonCollectionSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonCollectionSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonMapSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonMapSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/scala/SingletonMapSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonMapSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/scala/SingletonObjectSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonObjectSerializer.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/scala/SingletonObjectSerializer.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonObjectSerializer.java diff --git a/java/fury-core/src/main/java/io/fury/serializer/shim/ShimDispatcher.java b/java/fury-core/src/main/java/org/apache/fury/serializer/shim/ShimDispatcher.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/serializer/shim/ShimDispatcher.java rename to java/fury-core/src/main/java/org/apache/fury/serializer/shim/ShimDispatcher.java diff --git a/java/fury-core/src/main/java/io/fury/type/ClassDef.java b/java/fury-core/src/main/java/org/apache/fury/type/ClassDef.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/type/ClassDef.java rename to java/fury-core/src/main/java/org/apache/fury/type/ClassDef.java diff --git a/java/fury-core/src/main/java/io/fury/type/Descriptor.java b/java/fury-core/src/main/java/org/apache/fury/type/Descriptor.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/type/Descriptor.java rename to java/fury-core/src/main/java/org/apache/fury/type/Descriptor.java diff --git a/java/fury-core/src/main/java/io/fury/type/DescriptorGrouper.java b/java/fury-core/src/main/java/org/apache/fury/type/DescriptorGrouper.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/type/DescriptorGrouper.java rename to java/fury-core/src/main/java/org/apache/fury/type/DescriptorGrouper.java diff --git a/java/fury-core/src/main/java/io/fury/type/FinalObjectTypeStub.java b/java/fury-core/src/main/java/org/apache/fury/type/FinalObjectTypeStub.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/type/FinalObjectTypeStub.java rename to java/fury-core/src/main/java/org/apache/fury/type/FinalObjectTypeStub.java diff --git a/java/fury-core/src/main/java/io/fury/type/GenericType.java b/java/fury-core/src/main/java/org/apache/fury/type/GenericType.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/type/GenericType.java rename to java/fury-core/src/main/java/org/apache/fury/type/GenericType.java diff --git a/java/fury-core/src/main/java/io/fury/type/Generics.java b/java/fury-core/src/main/java/org/apache/fury/type/Generics.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/type/Generics.java rename to java/fury-core/src/main/java/org/apache/fury/type/Generics.java diff --git a/java/fury-core/src/main/java/io/fury/type/ScalaTypes.java b/java/fury-core/src/main/java/org/apache/fury/type/ScalaTypes.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/type/ScalaTypes.java rename to java/fury-core/src/main/java/org/apache/fury/type/ScalaTypes.java diff --git a/java/fury-core/src/main/java/io/fury/type/Type.java b/java/fury-core/src/main/java/org/apache/fury/type/Type.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/type/Type.java rename to java/fury-core/src/main/java/org/apache/fury/type/Type.java diff --git a/java/fury-core/src/main/java/io/fury/type/TypeUtils.java b/java/fury-core/src/main/java/org/apache/fury/type/TypeUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/type/TypeUtils.java rename to java/fury-core/src/main/java/org/apache/fury/type/TypeUtils.java diff --git a/java/fury-core/src/main/java/io/fury/util/ClassLoaderUtils.java b/java/fury-core/src/main/java/org/apache/fury/util/ClassLoaderUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/ClassLoaderUtils.java rename to java/fury-core/src/main/java/org/apache/fury/util/ClassLoaderUtils.java diff --git a/java/fury-core/src/main/java/io/fury/util/DateTimeUtils.java b/java/fury-core/src/main/java/org/apache/fury/util/DateTimeUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/DateTimeUtils.java rename to java/fury-core/src/main/java/org/apache/fury/util/DateTimeUtils.java diff --git a/java/fury-core/src/main/java/io/fury/util/DecimalUtils.java b/java/fury-core/src/main/java/org/apache/fury/util/DecimalUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/DecimalUtils.java rename to java/fury-core/src/main/java/org/apache/fury/util/DecimalUtils.java diff --git a/java/fury-core/src/main/java/io/fury/util/ExceptionUtils.java b/java/fury-core/src/main/java/org/apache/fury/util/ExceptionUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/ExceptionUtils.java rename to java/fury-core/src/main/java/org/apache/fury/util/ExceptionUtils.java diff --git a/java/fury-core/src/main/java/io/fury/util/FieldAccessor.java b/java/fury-core/src/main/java/org/apache/fury/util/FieldAccessor.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/FieldAccessor.java rename to java/fury-core/src/main/java/org/apache/fury/util/FieldAccessor.java diff --git a/java/fury-core/src/main/java/io/fury/util/GraalvmSupport.java b/java/fury-core/src/main/java/org/apache/fury/util/GraalvmSupport.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/GraalvmSupport.java rename to java/fury-core/src/main/java/org/apache/fury/util/GraalvmSupport.java diff --git a/java/fury-core/src/main/java/io/fury/util/LoaderBinding.java b/java/fury-core/src/main/java/org/apache/fury/util/LoaderBinding.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/LoaderBinding.java rename to java/fury-core/src/main/java/org/apache/fury/util/LoaderBinding.java diff --git a/java/fury-core/src/main/java/io/fury/util/LoggerFactory.java b/java/fury-core/src/main/java/org/apache/fury/util/LoggerFactory.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/LoggerFactory.java rename to java/fury-core/src/main/java/org/apache/fury/util/LoggerFactory.java diff --git a/java/fury-core/src/main/java/io/fury/util/MathUtils.java b/java/fury-core/src/main/java/org/apache/fury/util/MathUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/MathUtils.java rename to java/fury-core/src/main/java/org/apache/fury/util/MathUtils.java diff --git a/java/fury-core/src/main/java/io/fury/util/MurmurHash3.java b/java/fury-core/src/main/java/org/apache/fury/util/MurmurHash3.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/MurmurHash3.java rename to java/fury-core/src/main/java/org/apache/fury/util/MurmurHash3.java diff --git a/java/fury-core/src/main/java/io/fury/util/Platform.java b/java/fury-core/src/main/java/org/apache/fury/util/Platform.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/Platform.java rename to java/fury-core/src/main/java/org/apache/fury/util/Platform.java diff --git a/java/fury-core/src/main/java/io/fury/util/Preconditions.java b/java/fury-core/src/main/java/org/apache/fury/util/Preconditions.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/Preconditions.java rename to java/fury-core/src/main/java/org/apache/fury/util/Preconditions.java diff --git a/java/fury-core/src/main/java/io/fury/util/ReflectionUtils.java b/java/fury-core/src/main/java/org/apache/fury/util/ReflectionUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/ReflectionUtils.java rename to java/fury-core/src/main/java/org/apache/fury/util/ReflectionUtils.java diff --git a/java/fury-core/src/main/java/io/fury/util/StringUtils.java b/java/fury-core/src/main/java/org/apache/fury/util/StringUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/StringUtils.java rename to java/fury-core/src/main/java/org/apache/fury/util/StringUtils.java diff --git a/java/fury-core/src/main/java/io/fury/util/UnsafeFieldAccessor.java b/java/fury-core/src/main/java/org/apache/fury/util/UnsafeFieldAccessor.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/UnsafeFieldAccessor.java rename to java/fury-core/src/main/java/org/apache/fury/util/UnsafeFieldAccessor.java diff --git a/java/fury-core/src/main/java/io/fury/util/Utils.java b/java/fury-core/src/main/java/org/apache/fury/util/Utils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/Utils.java rename to java/fury-core/src/main/java/org/apache/fury/util/Utils.java diff --git a/java/fury-core/src/main/java/io/fury/util/function/Functions.java b/java/fury-core/src/main/java/org/apache/fury/util/function/Functions.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/function/Functions.java rename to java/fury-core/src/main/java/org/apache/fury/util/function/Functions.java diff --git a/java/fury-core/src/main/java/io/fury/util/function/SerializableBiFunction.java b/java/fury-core/src/main/java/org/apache/fury/util/function/SerializableBiFunction.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/function/SerializableBiFunction.java rename to java/fury-core/src/main/java/org/apache/fury/util/function/SerializableBiFunction.java diff --git a/java/fury-core/src/main/java/io/fury/util/function/SerializableFunction.java b/java/fury-core/src/main/java/org/apache/fury/util/function/SerializableFunction.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/function/SerializableFunction.java rename to java/fury-core/src/main/java/org/apache/fury/util/function/SerializableFunction.java diff --git a/java/fury-core/src/main/java/io/fury/util/function/SerializableSupplier.java b/java/fury-core/src/main/java/org/apache/fury/util/function/SerializableSupplier.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/function/SerializableSupplier.java rename to java/fury-core/src/main/java/org/apache/fury/util/function/SerializableSupplier.java diff --git a/java/fury-core/src/main/java/io/fury/util/function/SerializableTriFunction.java b/java/fury-core/src/main/java/org/apache/fury/util/function/SerializableTriFunction.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/function/SerializableTriFunction.java rename to java/fury-core/src/main/java/org/apache/fury/util/function/SerializableTriFunction.java diff --git a/java/fury-core/src/main/java/io/fury/util/function/ToByteFunction.java b/java/fury-core/src/main/java/org/apache/fury/util/function/ToByteFunction.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/function/ToByteFunction.java rename to java/fury-core/src/main/java/org/apache/fury/util/function/ToByteFunction.java diff --git a/java/fury-core/src/main/java/io/fury/util/function/ToCharFunction.java b/java/fury-core/src/main/java/org/apache/fury/util/function/ToCharFunction.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/function/ToCharFunction.java rename to java/fury-core/src/main/java/org/apache/fury/util/function/ToCharFunction.java diff --git a/java/fury-core/src/main/java/io/fury/util/function/ToFloatFunction.java b/java/fury-core/src/main/java/org/apache/fury/util/function/ToFloatFunction.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/function/ToFloatFunction.java rename to java/fury-core/src/main/java/org/apache/fury/util/function/ToFloatFunction.java diff --git a/java/fury-core/src/main/java/io/fury/util/function/ToShortFunction.java b/java/fury-core/src/main/java/org/apache/fury/util/function/ToShortFunction.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/function/ToShortFunction.java rename to java/fury-core/src/main/java/org/apache/fury/util/function/ToShortFunction.java diff --git a/java/fury-core/src/main/java/io/fury/util/function/TriFunction.java b/java/fury-core/src/main/java/org/apache/fury/util/function/TriFunction.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/function/TriFunction.java rename to java/fury-core/src/main/java/org/apache/fury/util/function/TriFunction.java diff --git a/java/fury-core/src/main/java/io/fury/util/record/RecordComponent.java b/java/fury-core/src/main/java/org/apache/fury/util/record/RecordComponent.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/record/RecordComponent.java rename to java/fury-core/src/main/java/org/apache/fury/util/record/RecordComponent.java diff --git a/java/fury-core/src/main/java/io/fury/util/record/RecordInfo.java b/java/fury-core/src/main/java/org/apache/fury/util/record/RecordInfo.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/record/RecordInfo.java rename to java/fury-core/src/main/java/org/apache/fury/util/record/RecordInfo.java diff --git a/java/fury-core/src/main/java/io/fury/util/record/RecordUtils.java b/java/fury-core/src/main/java/org/apache/fury/util/record/RecordUtils.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/record/RecordUtils.java rename to java/fury-core/src/main/java/org/apache/fury/util/record/RecordUtils.java diff --git a/java/fury-core/src/main/java/io/fury/util/unsafe/_Collections.java b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Collections.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/unsafe/_Collections.java rename to java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Collections.java diff --git a/java/fury-core/src/main/java/io/fury/util/unsafe/_JDKAccess.java b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/unsafe/_JDKAccess.java rename to java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java diff --git a/java/fury-core/src/main/java/io/fury/util/unsafe/_Lookup.java b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Lookup.java similarity index 100% rename from java/fury-core/src/main/java/io/fury/util/unsafe/_Lookup.java rename to java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Lookup.java diff --git a/java/fury-core/src/test/java/io/fury/CrossLanguageTest.java b/java/fury-core/src/test/java/org/apache/fury/CrossLanguageTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/CrossLanguageTest.java rename to java/fury-core/src/test/java/org/apache/fury/CrossLanguageTest.java diff --git a/java/fury-core/src/test/java/io/fury/CyclicTest.java b/java/fury-core/src/test/java/org/apache/fury/CyclicTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/CyclicTest.java rename to java/fury-core/src/test/java/org/apache/fury/CyclicTest.java diff --git a/java/fury-core/src/test/java/io/fury/FuryInitPerf.java b/java/fury-core/src/test/java/org/apache/fury/FuryInitPerf.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/FuryInitPerf.java rename to java/fury-core/src/test/java/org/apache/fury/FuryInitPerf.java diff --git a/java/fury-core/src/test/java/io/fury/FuryTest.java b/java/fury-core/src/test/java/org/apache/fury/FuryTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/FuryTest.java rename to java/fury-core/src/test/java/org/apache/fury/FuryTest.java diff --git a/java/fury-core/src/test/java/io/fury/FuryTestBase.java b/java/fury-core/src/test/java/org/apache/fury/FuryTestBase.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/FuryTestBase.java rename to java/fury-core/src/test/java/org/apache/fury/FuryTestBase.java diff --git a/java/fury-core/src/test/java/io/fury/OutOfBandTest.java b/java/fury-core/src/test/java/org/apache/fury/OutOfBandTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/OutOfBandTest.java rename to java/fury-core/src/test/java/org/apache/fury/OutOfBandTest.java diff --git a/java/fury-core/src/test/java/io/fury/TestUtils.java b/java/fury-core/src/test/java/org/apache/fury/TestUtils.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/TestUtils.java rename to java/fury-core/src/test/java/org/apache/fury/TestUtils.java diff --git a/java/fury-core/src/test/java/io/fury/ThreadSafeFuryTest.java b/java/fury-core/src/test/java/org/apache/fury/ThreadSafeFuryTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/ThreadSafeFuryTest.java rename to java/fury-core/src/test/java/org/apache/fury/ThreadSafeFuryTest.java diff --git a/java/fury-core/src/test/java/io/fury/builder/AccessorHelperTest.java b/java/fury-core/src/test/java/org/apache/fury/builder/AccessorHelperTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/builder/AccessorHelperTest.java rename to java/fury-core/src/test/java/org/apache/fury/builder/AccessorHelperTest.java diff --git a/java/fury-core/src/test/java/io/fury/builder/CodecUtilsTest.java b/java/fury-core/src/test/java/org/apache/fury/builder/CodecUtilsTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/builder/CodecUtilsTest.java rename to java/fury-core/src/test/java/org/apache/fury/builder/CodecUtilsTest.java diff --git a/java/fury-core/src/test/java/io/fury/builder/JITContextTest.java b/java/fury-core/src/test/java/org/apache/fury/builder/JITContextTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/builder/JITContextTest.java rename to java/fury-core/src/test/java/org/apache/fury/builder/JITContextTest.java diff --git a/java/fury-core/src/test/java/io/fury/builder/ObjectCodecBuilderTest.java b/java/fury-core/src/test/java/org/apache/fury/builder/ObjectCodecBuilderTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/builder/ObjectCodecBuilderTest.java rename to java/fury-core/src/test/java/org/apache/fury/builder/ObjectCodecBuilderTest.java diff --git a/java/fury-core/src/test/java/io/fury/builder/pkg/AccessLevelClass.java b/java/fury-core/src/test/java/org/apache/fury/builder/pkg/AccessLevelClass.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/builder/pkg/AccessLevelClass.java rename to java/fury-core/src/test/java/org/apache/fury/builder/pkg/AccessLevelClass.java diff --git a/java/fury-core/src/test/java/io/fury/codegen/CodeGeneratorTest.java b/java/fury-core/src/test/java/org/apache/fury/codegen/CodeGeneratorTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/codegen/CodeGeneratorTest.java rename to java/fury-core/src/test/java/org/apache/fury/codegen/CodeGeneratorTest.java diff --git a/java/fury-core/src/test/java/io/fury/codegen/CodegenContextTest.java b/java/fury-core/src/test/java/org/apache/fury/codegen/CodegenContextTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/codegen/CodegenContextTest.java rename to java/fury-core/src/test/java/org/apache/fury/codegen/CodegenContextTest.java diff --git a/java/fury-core/src/test/java/io/fury/codegen/ExpressionOptimizerTest.java b/java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionOptimizerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/codegen/ExpressionOptimizerTest.java rename to java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionOptimizerTest.java diff --git a/java/fury-core/src/test/java/io/fury/codegen/ExpressionTest.java b/java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/codegen/ExpressionTest.java rename to java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionTest.java diff --git a/java/fury-core/src/test/java/io/fury/codegen/ExpressionVisitorTest.java b/java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionVisitorTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/codegen/ExpressionVisitorTest.java rename to java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionVisitorTest.java diff --git a/java/fury-core/src/test/java/io/fury/codegen/JaninoUtilsTest.java b/java/fury-core/src/test/java/org/apache/fury/codegen/JaninoUtilsTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/codegen/JaninoUtilsTest.java rename to java/fury-core/src/test/java/org/apache/fury/codegen/JaninoUtilsTest.java diff --git a/java/fury-core/src/test/java/io/fury/collection/CollectionsTest.java b/java/fury-core/src/test/java/org/apache/fury/collection/CollectionsTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/collection/CollectionsTest.java rename to java/fury-core/src/test/java/org/apache/fury/collection/CollectionsTest.java diff --git a/java/fury-core/src/test/java/io/fury/collection/FuryObjectMapTest.java b/java/fury-core/src/test/java/org/apache/fury/collection/FuryObjectMapTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/collection/FuryObjectMapTest.java rename to java/fury-core/src/test/java/org/apache/fury/collection/FuryObjectMapTest.java diff --git a/java/fury-core/src/test/java/io/fury/collection/IdentityObjectIntMapTest.java b/java/fury-core/src/test/java/org/apache/fury/collection/IdentityObjectIntMapTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/collection/IdentityObjectIntMapTest.java rename to java/fury-core/src/test/java/org/apache/fury/collection/IdentityObjectIntMapTest.java diff --git a/java/fury-core/src/test/java/io/fury/collection/IntArrayTest.java b/java/fury-core/src/test/java/org/apache/fury/collection/IntArrayTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/collection/IntArrayTest.java rename to java/fury-core/src/test/java/org/apache/fury/collection/IntArrayTest.java diff --git a/java/fury-core/src/test/java/io/fury/collection/LazyMapTest.java b/java/fury-core/src/test/java/org/apache/fury/collection/LazyMapTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/collection/LazyMapTest.java rename to java/fury-core/src/test/java/org/apache/fury/collection/LazyMapTest.java diff --git a/java/fury-core/src/test/java/io/fury/collection/MultiKeyWeakMapTest.java b/java/fury-core/src/test/java/org/apache/fury/collection/MultiKeyWeakMapTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/collection/MultiKeyWeakMapTest.java rename to java/fury-core/src/test/java/org/apache/fury/collection/MultiKeyWeakMapTest.java diff --git a/java/fury-core/src/test/java/io/fury/collection/ObjectArrayTest.java b/java/fury-core/src/test/java/org/apache/fury/collection/ObjectArrayTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/collection/ObjectArrayTest.java rename to java/fury-core/src/test/java/org/apache/fury/collection/ObjectArrayTest.java diff --git a/java/fury-core/src/test/java/io/fury/collection/ObjectIntMapTest.java b/java/fury-core/src/test/java/org/apache/fury/collection/ObjectIntMapTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/collection/ObjectIntMapTest.java rename to java/fury-core/src/test/java/org/apache/fury/collection/ObjectIntMapTest.java diff --git a/java/fury-core/src/test/java/io/fury/collection/Tuple2Test.java b/java/fury-core/src/test/java/org/apache/fury/collection/Tuple2Test.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/collection/Tuple2Test.java rename to java/fury-core/src/test/java/org/apache/fury/collection/Tuple2Test.java diff --git a/java/fury-core/src/test/java/io/fury/collection/Tuple3Test.java b/java/fury-core/src/test/java/org/apache/fury/collection/Tuple3Test.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/collection/Tuple3Test.java rename to java/fury-core/src/test/java/org/apache/fury/collection/Tuple3Test.java diff --git a/java/fury-core/src/test/java/io/fury/io/FuryObjectInputTest.java b/java/fury-core/src/test/java/org/apache/fury/io/FuryObjectInputTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/io/FuryObjectInputTest.java rename to java/fury-core/src/test/java/org/apache/fury/io/FuryObjectInputTest.java diff --git a/java/fury-core/src/test/java/io/fury/io/FuryObjectOutputTest.java b/java/fury-core/src/test/java/org/apache/fury/io/FuryObjectOutputTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/io/FuryObjectOutputTest.java rename to java/fury-core/src/test/java/org/apache/fury/io/FuryObjectOutputTest.java diff --git a/java/fury-core/src/test/java/io/fury/io/MockOutputStreamTest.java b/java/fury-core/src/test/java/org/apache/fury/io/MockOutputStreamTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/io/MockOutputStreamTest.java rename to java/fury-core/src/test/java/org/apache/fury/io/MockOutputStreamTest.java diff --git a/java/fury-core/src/test/java/io/fury/io/MockWritableByteChannelTest.java b/java/fury-core/src/test/java/org/apache/fury/io/MockWritableByteChannelTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/io/MockWritableByteChannelTest.java rename to java/fury-core/src/test/java/org/apache/fury/io/MockWritableByteChannelTest.java diff --git a/java/fury-core/src/test/java/io/fury/memory/BitUtilsTest.java b/java/fury-core/src/test/java/org/apache/fury/memory/BitUtilsTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/memory/BitUtilsTest.java rename to java/fury-core/src/test/java/org/apache/fury/memory/BitUtilsTest.java diff --git a/java/fury-core/src/test/java/io/fury/memory/MemoryBufferTest.java b/java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/memory/MemoryBufferTest.java rename to java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java diff --git a/java/fury-core/src/test/java/io/fury/resolver/AllowListCheckerTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/AllowListCheckerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/resolver/AllowListCheckerTest.java rename to java/fury-core/src/test/java/org/apache/fury/resolver/AllowListCheckerTest.java diff --git a/java/fury-core/src/test/java/io/fury/resolver/BlackListTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/BlackListTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/resolver/BlackListTest.java rename to java/fury-core/src/test/java/org/apache/fury/resolver/BlackListTest.java diff --git a/java/fury-core/src/test/java/io/fury/resolver/ClassResolverTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/ClassResolverTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/resolver/ClassResolverTest.java rename to java/fury-core/src/test/java/org/apache/fury/resolver/ClassResolverTest.java diff --git a/java/fury-core/src/test/java/io/fury/resolver/EnumStringResolverTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/EnumStringResolverTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/resolver/EnumStringResolverTest.java rename to java/fury-core/src/test/java/org/apache/fury/resolver/EnumStringResolverTest.java diff --git a/java/fury-core/src/test/java/io/fury/resolver/FieldResolverTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/FieldResolverTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/resolver/FieldResolverTest.java rename to java/fury-core/src/test/java/org/apache/fury/resolver/FieldResolverTest.java diff --git a/java/fury-core/src/test/java/io/fury/resolver/MapRefResolverTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/MapRefResolverTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/resolver/MapRefResolverTest.java rename to java/fury-core/src/test/java/org/apache/fury/resolver/MapRefResolverTest.java diff --git a/java/fury-core/src/test/java/io/fury/resolver/MetaContextTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/MetaContextTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/resolver/MetaContextTest.java rename to java/fury-core/src/test/java/org/apache/fury/resolver/MetaContextTest.java diff --git a/java/fury-core/src/test/java/io/fury/resolver/NoRefResolverTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/NoRefResolverTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/resolver/NoRefResolverTest.java rename to java/fury-core/src/test/java/org/apache/fury/resolver/NoRefResolverTest.java diff --git a/java/fury-core/src/test/java/io/fury/resolver/SerializationContextTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/SerializationContextTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/resolver/SerializationContextTest.java rename to java/fury-core/src/test/java/org/apache/fury/resolver/SerializationContextTest.java diff --git a/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C1.java b/java/fury-core/src/test/java/org/apache/fury/resolver/longlongpkg/C1.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C1.java rename to java/fury-core/src/test/java/org/apache/fury/resolver/longlongpkg/C1.java diff --git a/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C2.java b/java/fury-core/src/test/java/org/apache/fury/resolver/longlongpkg/C2.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C2.java rename to java/fury-core/src/test/java/org/apache/fury/resolver/longlongpkg/C2.java diff --git a/java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C3.java b/java/fury-core/src/test/java/org/apache/fury/resolver/longlongpkg/C3.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/resolver/longlongpkg/C3.java rename to java/fury-core/src/test/java/org/apache/fury/resolver/longlongpkg/C3.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/ArraySerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ArraySerializersTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/ArraySerializersTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/ArraySerializersTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/BufferSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/BufferSerializersTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/BufferSerializersTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/BufferSerializersTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/ClassUtils.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ClassUtils.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/ClassUtils.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/ClassUtils.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/CodegenCompatibleSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/CodegenCompatibleSerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/CodegenCompatibleSerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/CodegenCompatibleSerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/CodegenSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/CodegenSerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/CodegenSerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/CodegenSerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/CompatibleSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/CompatibleSerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/CompatibleSerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/CompatibleSerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/DuplicateFieldsTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/DuplicateFieldsTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/DuplicateFieldsTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/DuplicateFieldsTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/ExternalizableSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ExternalizableSerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/ExternalizableSerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/ExternalizableSerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/ForwardSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ForwardSerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/ForwardSerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/ForwardSerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/JavaSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/JavaSerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/JavaSerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/JavaSerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/JdkProxySerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/JdkProxySerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/JdkProxySerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/JdkProxySerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/LambdaSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/LambdaSerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/LambdaSerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/LambdaSerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/LocaleSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/LocaleSerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/LocaleSerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/LocaleSerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/MetaSharedCompatibleTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/MetaSharedCompatibleTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/MetaSharedCompatibleTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/MetaSharedCompatibleTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/ObjectSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ObjectSerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/ObjectSerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/ObjectSerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/ObjectStreamSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ObjectStreamSerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/ObjectStreamSerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/ObjectStreamSerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/OptionalSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/OptionalSerializersTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/OptionalSerializersTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/OptionalSerializersTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/PrimitiveSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/PrimitiveSerializersTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/PrimitiveSerializersTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/PrimitiveSerializersTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/ProtocolInteroperabilityTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ProtocolInteroperabilityTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/ProtocolInteroperabilityTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/ProtocolInteroperabilityTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/ReplaceResolveSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ReplaceResolveSerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/ReplaceResolveSerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/ReplaceResolveSerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/SerializerFactoryTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/SerializerFactoryTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/SerializerFactoryTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/SerializerFactoryTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/SerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/SerializersTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/SerializersTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/SerializersTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/StringSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/StringSerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/StringSerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/StringSerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/TimeSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/TimeSerializersTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/TimeSerializersTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/TimeSerializersTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/URLSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/URLSerializerTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/URLSerializerTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/URLSerializerTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/UnexistedClassSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/UnexistedClassSerializersTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/UnexistedClassSerializersTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/UnexistedClassSerializersTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/collection/ChildContainerSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/ChildContainerSerializersTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/collection/ChildContainerSerializersTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/collection/ChildContainerSerializersTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/collection/CollectionSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/CollectionSerializersTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/collection/CollectionSerializersTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/collection/CollectionSerializersTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/collection/GuavaCollectionSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/GuavaCollectionSerializersTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/collection/GuavaCollectionSerializersTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/collection/GuavaCollectionSerializersTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/collection/MapSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/MapSerializersTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/collection/MapSerializersTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/collection/MapSerializersTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/collection/SynchronizedSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/SynchronizedSerializersTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/collection/SynchronizedSerializersTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/collection/SynchronizedSerializersTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/collection/UnmodifiableSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/UnmodifiableSerializersTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/collection/UnmodifiableSerializersTest.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/collection/UnmodifiableSerializersTest.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/test/Factory.java b/java/fury-core/src/test/java/org/apache/fury/serializer/test/Factory.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/test/Factory.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/test/Factory.java diff --git a/java/fury-core/src/test/java/io/fury/serializer/test/Inaccessible.java b/java/fury-core/src/test/java/org/apache/fury/serializer/test/Inaccessible.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/serializer/test/Inaccessible.java rename to java/fury-core/src/test/java/org/apache/fury/serializer/test/Inaccessible.java diff --git a/java/fury-core/src/test/java/io/fury/type/ClassDefTest.java b/java/fury-core/src/test/java/org/apache/fury/type/ClassDefTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/type/ClassDefTest.java rename to java/fury-core/src/test/java/org/apache/fury/type/ClassDefTest.java diff --git a/java/fury-core/src/test/java/io/fury/type/DescriptorGrouperTest.java b/java/fury-core/src/test/java/org/apache/fury/type/DescriptorGrouperTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/type/DescriptorGrouperTest.java rename to java/fury-core/src/test/java/org/apache/fury/type/DescriptorGrouperTest.java diff --git a/java/fury-core/src/test/java/io/fury/type/DescriptorTest.java b/java/fury-core/src/test/java/org/apache/fury/type/DescriptorTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/type/DescriptorTest.java rename to java/fury-core/src/test/java/org/apache/fury/type/DescriptorTest.java diff --git a/java/fury-core/src/test/java/io/fury/type/GenericsTest.java b/java/fury-core/src/test/java/org/apache/fury/type/GenericsTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/type/GenericsTest.java rename to java/fury-core/src/test/java/org/apache/fury/type/GenericsTest.java diff --git a/java/fury-core/src/test/java/io/fury/type/TypeUtilsTest.java b/java/fury-core/src/test/java/org/apache/fury/type/TypeUtilsTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/type/TypeUtilsTest.java rename to java/fury-core/src/test/java/org/apache/fury/type/TypeUtilsTest.java diff --git a/java/fury-core/src/test/java/io/fury/util/ClassLoaderUtilsTest.java b/java/fury-core/src/test/java/org/apache/fury/util/ClassLoaderUtilsTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/util/ClassLoaderUtilsTest.java rename to java/fury-core/src/test/java/org/apache/fury/util/ClassLoaderUtilsTest.java diff --git a/java/fury-core/src/test/java/io/fury/util/DecimalUtilsTest.java b/java/fury-core/src/test/java/org/apache/fury/util/DecimalUtilsTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/util/DecimalUtilsTest.java rename to java/fury-core/src/test/java/org/apache/fury/util/DecimalUtilsTest.java diff --git a/java/fury-core/src/test/java/io/fury/util/FunctionsTest.java b/java/fury-core/src/test/java/org/apache/fury/util/FunctionsTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/util/FunctionsTest.java rename to java/fury-core/src/test/java/org/apache/fury/util/FunctionsTest.java diff --git a/java/fury-core/src/test/java/io/fury/util/MurmurHash3Test.java b/java/fury-core/src/test/java/org/apache/fury/util/MurmurHash3Test.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/util/MurmurHash3Test.java rename to java/fury-core/src/test/java/org/apache/fury/util/MurmurHash3Test.java diff --git a/java/fury-core/src/test/java/io/fury/util/PlatformTest.java b/java/fury-core/src/test/java/org/apache/fury/util/PlatformTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/util/PlatformTest.java rename to java/fury-core/src/test/java/org/apache/fury/util/PlatformTest.java diff --git a/java/fury-core/src/test/java/io/fury/util/ReflectionUtilsTest.java b/java/fury-core/src/test/java/org/apache/fury/util/ReflectionUtilsTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/util/ReflectionUtilsTest.java rename to java/fury-core/src/test/java/org/apache/fury/util/ReflectionUtilsTest.java diff --git a/java/fury-core/src/test/java/io/fury/util/StringUtilsTest.java b/java/fury-core/src/test/java/org/apache/fury/util/StringUtilsTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/util/StringUtilsTest.java rename to java/fury-core/src/test/java/org/apache/fury/util/StringUtilsTest.java diff --git a/java/fury-core/src/test/java/io/fury/util/UnsafeFieldAccessorTest.java b/java/fury-core/src/test/java/org/apache/fury/util/UnsafeFieldAccessorTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/util/UnsafeFieldAccessorTest.java rename to java/fury-core/src/test/java/org/apache/fury/util/UnsafeFieldAccessorTest.java diff --git a/java/fury-core/src/test/java/io/fury/util/unsafe/JDKAccessTest.java b/java/fury-core/src/test/java/org/apache/fury/util/unsafe/JDKAccessTest.java similarity index 100% rename from java/fury-core/src/test/java/io/fury/util/unsafe/JDKAccessTest.java rename to java/fury-core/src/test/java/org/apache/fury/util/unsafe/JDKAccessTest.java diff --git a/java/fury-format/README.md b/java/fury-format/README.md index 049437f08c..7e193edf51 100644 --- a/java/fury-format/README.md +++ b/java/fury-format/README.md @@ -1,5 +1,7 @@ # Fury Row Format + Fury row format is heavily inspired by spark tungsten row format, but with changes: + - Use arrow schema to describe meta. - The implementation support java/C++/python/etc.. - String support latin/utf16/utf8 encoding. @@ -8,4 +10,4 @@ Fury row format is heavily inspired by spark tungsten row format, but with chang - Allow skip padding by generate Row using aot to put offsets in generated code. - Support adding fields without breaking compatibility. -The initial fury java row data structure implementation is modified from spark unsafe row/writer. \ No newline at end of file +The initial fury java row data structure implementation is modified from spark unsafe row/writer. diff --git a/java/fury-format/pom.xml b/java/fury-format/pom.xml index ddabfd6ae4..c764799c50 100644 --- a/java/fury-format/pom.xml +++ b/java/fury-format/pom.xml @@ -23,7 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.furyio + org.apache.fury fury-parent 0.5.0-SNAPSHOT @@ -39,7 +39,7 @@ - https://furyio.org + https://fury.apache.org chaokunyang @@ -70,7 +70,7 @@ - org.furyio + org.apache.fury fury-core ${project.version} @@ -98,7 +98,7 @@ - org.furyio + org.apache.fury fury-test-core ${project.version} test diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/ArrayDataForEach.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayDataForEach.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/ArrayDataForEach.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayDataForEach.java diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/ArrayEncoder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayEncoder.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/ArrayEncoder.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayEncoder.java diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/ArrayEncoderBuilder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayEncoderBuilder.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/ArrayEncoderBuilder.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayEncoderBuilder.java diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/BaseBinaryEncoderBuilder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/BaseBinaryEncoderBuilder.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/BaseBinaryEncoderBuilder.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/BaseBinaryEncoderBuilder.java diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/Encoder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/Encoder.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/Encoder.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/Encoder.java diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/EncoderException.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/EncoderException.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/EncoderException.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/EncoderException.java diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/Encoders.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/Encoders.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/Encoders.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/Encoders.java diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedArrayEncoder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/GeneratedArrayEncoder.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/GeneratedArrayEncoder.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/GeneratedArrayEncoder.java diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedMapEncoder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/GeneratedMapEncoder.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/GeneratedMapEncoder.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/GeneratedMapEncoder.java diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/GeneratedRowEncoder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/GeneratedRowEncoder.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/GeneratedRowEncoder.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/GeneratedRowEncoder.java diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/MapEncoder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/MapEncoder.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/MapEncoder.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/MapEncoder.java diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/MapEncoderBuilder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/MapEncoderBuilder.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/MapEncoderBuilder.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/MapEncoderBuilder.java diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/RowEncoder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/RowEncoder.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/RowEncoder.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/RowEncoder.java diff --git a/java/fury-format/src/main/java/io/fury/format/encoder/RowEncoderBuilder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/RowEncoderBuilder.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/encoder/RowEncoderBuilder.java rename to java/fury-format/src/main/java/org/apache/fury/format/encoder/RowEncoderBuilder.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/ArrayData.java b/java/fury-format/src/main/java/org/apache/fury/format/row/ArrayData.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/ArrayData.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/ArrayData.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/Getters.java b/java/fury-format/src/main/java/org/apache/fury/format/row/Getters.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/Getters.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/Getters.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/MapData.java b/java/fury-format/src/main/java/org/apache/fury/format/row/MapData.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/MapData.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/MapData.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/Row.java b/java/fury-format/src/main/java/org/apache/fury/format/row/Row.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/Row.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/Row.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/Setters.java b/java/fury-format/src/main/java/org/apache/fury/format/row/Setters.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/Setters.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/Setters.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/ValueVisitor.java b/java/fury-format/src/main/java/org/apache/fury/format/row/ValueVisitor.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/ValueVisitor.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/ValueVisitor.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/BinaryArray.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/binary/BinaryArray.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/BinaryMap.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/binary/BinaryMap.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/BinaryRow.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryRow.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/binary/BinaryRow.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryRow.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/BinaryUtils.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryUtils.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/binary/BinaryUtils.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryUtils.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/UnsafeTrait.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/UnsafeTrait.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/binary/UnsafeTrait.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/binary/UnsafeTrait.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryArrayWriter.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryArrayWriter.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryRowWriter.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryRowWriter.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryRowWriter.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryRowWriter.java diff --git a/java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryWriter.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryWriter.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/row/binary/writer/BinaryWriter.java rename to java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryWriter.java diff --git a/java/fury-format/src/main/java/io/fury/format/type/DataTypes.java b/java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/type/DataTypes.java rename to java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java diff --git a/java/fury-format/src/main/java/io/fury/format/type/DefaultTypeVisitor.java b/java/fury-format/src/main/java/org/apache/fury/format/type/DefaultTypeVisitor.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/type/DefaultTypeVisitor.java rename to java/fury-format/src/main/java/org/apache/fury/format/type/DefaultTypeVisitor.java diff --git a/java/fury-format/src/main/java/io/fury/format/type/TypeInference.java b/java/fury-format/src/main/java/org/apache/fury/format/type/TypeInference.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/type/TypeInference.java rename to java/fury-format/src/main/java/org/apache/fury/format/type/TypeInference.java diff --git a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowSerializers.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/vectorized/ArrowSerializers.java rename to java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java diff --git a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowTable.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTable.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/vectorized/ArrowTable.java rename to java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTable.java diff --git a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowTableSerializer.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/vectorized/ArrowTableSerializer.java rename to java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java diff --git a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowUtils.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowUtils.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/vectorized/ArrowUtils.java rename to java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowUtils.java diff --git a/java/fury-format/src/main/java/io/fury/format/vectorized/ArrowWriter.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java similarity index 100% rename from java/fury-format/src/main/java/io/fury/format/vectorized/ArrowWriter.java rename to java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java diff --git a/java/fury-format/src/test/java/io/fury/format/CrossLanguageTest.java b/java/fury-format/src/test/java/org/apache/fury/format/CrossLanguageTest.java similarity index 100% rename from java/fury-format/src/test/java/io/fury/format/CrossLanguageTest.java rename to java/fury-format/src/test/java/org/apache/fury/format/CrossLanguageTest.java diff --git a/java/fury-format/src/test/java/io/fury/format/encoder/ArrayEncoderTest.java b/java/fury-format/src/test/java/org/apache/fury/format/encoder/ArrayEncoderTest.java similarity index 100% rename from java/fury-format/src/test/java/io/fury/format/encoder/ArrayEncoderTest.java rename to java/fury-format/src/test/java/org/apache/fury/format/encoder/ArrayEncoderTest.java diff --git a/java/fury-format/src/test/java/io/fury/format/encoder/CodecBuilderTest.java b/java/fury-format/src/test/java/org/apache/fury/format/encoder/CodecBuilderTest.java similarity index 100% rename from java/fury-format/src/test/java/io/fury/format/encoder/CodecBuilderTest.java rename to java/fury-format/src/test/java/org/apache/fury/format/encoder/CodecBuilderTest.java diff --git a/java/fury-format/src/test/java/io/fury/format/encoder/MapEncoderTest.java b/java/fury-format/src/test/java/org/apache/fury/format/encoder/MapEncoderTest.java similarity index 100% rename from java/fury-format/src/test/java/io/fury/format/encoder/MapEncoderTest.java rename to java/fury-format/src/test/java/org/apache/fury/format/encoder/MapEncoderTest.java diff --git a/java/fury-format/src/test/java/io/fury/format/encoder/RowEncoderTest.java b/java/fury-format/src/test/java/org/apache/fury/format/encoder/RowEncoderTest.java similarity index 100% rename from java/fury-format/src/test/java/io/fury/format/encoder/RowEncoderTest.java rename to java/fury-format/src/test/java/org/apache/fury/format/encoder/RowEncoderTest.java diff --git a/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryArrayTest.java b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryArrayTest.java similarity index 100% rename from java/fury-format/src/test/java/io/fury/format/row/binary/BinaryArrayTest.java rename to java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryArrayTest.java diff --git a/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryMapTest.java b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryMapTest.java similarity index 100% rename from java/fury-format/src/test/java/io/fury/format/row/binary/BinaryMapTest.java rename to java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryMapTest.java diff --git a/java/fury-format/src/test/java/io/fury/format/row/binary/BinaryRowTest.java b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java similarity index 100% rename from java/fury-format/src/test/java/io/fury/format/row/binary/BinaryRowTest.java rename to java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java diff --git a/java/fury-format/src/test/java/io/fury/format/type/DataTypesTest.java b/java/fury-format/src/test/java/org/apache/fury/format/type/DataTypesTest.java similarity index 100% rename from java/fury-format/src/test/java/io/fury/format/type/DataTypesTest.java rename to java/fury-format/src/test/java/org/apache/fury/format/type/DataTypesTest.java diff --git a/java/fury-format/src/test/java/io/fury/format/type/TypeInferenceTest.java b/java/fury-format/src/test/java/org/apache/fury/format/type/TypeInferenceTest.java similarity index 100% rename from java/fury-format/src/test/java/io/fury/format/type/TypeInferenceTest.java rename to java/fury-format/src/test/java/org/apache/fury/format/type/TypeInferenceTest.java diff --git a/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowSerializersTest.java b/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowSerializersTest.java similarity index 100% rename from java/fury-format/src/test/java/io/fury/format/vectorized/ArrowSerializersTest.java rename to java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowSerializersTest.java diff --git a/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowUtilsTest.java b/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowUtilsTest.java similarity index 100% rename from java/fury-format/src/test/java/io/fury/format/vectorized/ArrowUtilsTest.java rename to java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowUtilsTest.java diff --git a/java/fury-format/src/test/java/io/fury/format/vectorized/ArrowWriterTest.java b/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowWriterTest.java similarity index 100% rename from java/fury-format/src/test/java/io/fury/format/vectorized/ArrowWriterTest.java rename to java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowWriterTest.java diff --git a/java/fury-test-core/pom.xml b/java/fury-test-core/pom.xml index 9fbab14f31..934402b152 100644 --- a/java/fury-test-core/pom.xml +++ b/java/fury-test-core/pom.xml @@ -24,7 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> fury-parent - org.furyio + org.apache.fury 0.5.0-SNAPSHOT 4.0.0 diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/AccessBeans.java b/java/fury-test-core/src/main/java/org/apache/fury/test/bean/AccessBeans.java similarity index 100% rename from java/fury-test-core/src/main/java/io/fury/test/bean/AccessBeans.java rename to java/fury-test-core/src/main/java/org/apache/fury/test/bean/AccessBeans.java diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/ArraysData.java b/java/fury-test-core/src/main/java/org/apache/fury/test/bean/ArraysData.java similarity index 100% rename from java/fury-test-core/src/main/java/io/fury/test/bean/ArraysData.java rename to java/fury-test-core/src/main/java/org/apache/fury/test/bean/ArraysData.java diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/BeanA.java b/java/fury-test-core/src/main/java/org/apache/fury/test/bean/BeanA.java similarity index 100% rename from java/fury-test-core/src/main/java/io/fury/test/bean/BeanA.java rename to java/fury-test-core/src/main/java/org/apache/fury/test/bean/BeanA.java diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/BeanB.java b/java/fury-test-core/src/main/java/org/apache/fury/test/bean/BeanB.java similarity index 100% rename from java/fury-test-core/src/main/java/io/fury/test/bean/BeanB.java rename to java/fury-test-core/src/main/java/org/apache/fury/test/bean/BeanB.java diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/CollectionFields.java b/java/fury-test-core/src/main/java/org/apache/fury/test/bean/CollectionFields.java similarity index 100% rename from java/fury-test-core/src/main/java/io/fury/test/bean/CollectionFields.java rename to java/fury-test-core/src/main/java/org/apache/fury/test/bean/CollectionFields.java diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/Cyclic.java b/java/fury-test-core/src/main/java/org/apache/fury/test/bean/Cyclic.java similarity index 100% rename from java/fury-test-core/src/main/java/io/fury/test/bean/Cyclic.java rename to java/fury-test-core/src/main/java/org/apache/fury/test/bean/Cyclic.java diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/FinalCyclic.java b/java/fury-test-core/src/main/java/org/apache/fury/test/bean/FinalCyclic.java similarity index 100% rename from java/fury-test-core/src/main/java/io/fury/test/bean/FinalCyclic.java rename to java/fury-test-core/src/main/java/org/apache/fury/test/bean/FinalCyclic.java diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/Foo.java b/java/fury-test-core/src/main/java/org/apache/fury/test/bean/Foo.java similarity index 100% rename from java/fury-test-core/src/main/java/io/fury/test/bean/Foo.java rename to java/fury-test-core/src/main/java/org/apache/fury/test/bean/Foo.java diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/MapFields.java b/java/fury-test-core/src/main/java/org/apache/fury/test/bean/MapFields.java similarity index 100% rename from java/fury-test-core/src/main/java/io/fury/test/bean/MapFields.java rename to java/fury-test-core/src/main/java/org/apache/fury/test/bean/MapFields.java diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/Struct.java b/java/fury-test-core/src/main/java/org/apache/fury/test/bean/Struct.java similarity index 100% rename from java/fury-test-core/src/main/java/io/fury/test/bean/Struct.java rename to java/fury-test-core/src/main/java/org/apache/fury/test/bean/Struct.java diff --git a/java/fury-test-core/src/main/java/io/fury/test/bean/TestUtils.java b/java/fury-test-core/src/main/java/org/apache/fury/test/bean/TestUtils.java similarity index 100% rename from java/fury-test-core/src/main/java/io/fury/test/bean/TestUtils.java rename to java/fury-test-core/src/main/java/org/apache/fury/test/bean/TestUtils.java diff --git a/java/fury-test-core/src/test/java/io/fury/test/bean/StructTest.java b/java/fury-test-core/src/test/java/org/apache/fury/test/bean/StructTest.java similarity index 100% rename from java/fury-test-core/src/test/java/io/fury/test/bean/StructTest.java rename to java/fury-test-core/src/test/java/org/apache/fury/test/bean/StructTest.java diff --git a/java/fury-testsuite/README.md b/java/fury-testsuite/README.md index 812af5d439..53911f9a8a 100644 --- a/java/fury-testsuite/README.md +++ b/java/fury-testsuite/README.md @@ -1,5 +1,5 @@ -# fury-testsuite +# Fury Test Suite + Fury write many tests to ensure the correctness of serialization, but there may be still some corner case which are not covered. Such cases can be covered in a test suite module, and uses of fury can contribute to this module to ensure their correctness further. - diff --git a/java/fury-testsuite/pom.xml b/java/fury-testsuite/pom.xml index 3cba5588cd..3de507be0c 100644 --- a/java/fury-testsuite/pom.xml +++ b/java/fury-testsuite/pom.xml @@ -24,7 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> fury-parent - org.furyio + org.apache.fury 0.5.0-SNAPSHOT 4.0.0 @@ -50,19 +50,19 @@ test - org.furyio + org.apache.fury fury-core ${project.version} test - org.furyio + org.apache.fury fury-format ${project.version} test - org.furyio + org.apache.fury fury-test-core ${project.version} test diff --git a/java/fury-testsuite/src/test/java/io/fury/benchmark/DeserializationBenchmark.java b/java/fury-testsuite/src/test/java/org/apache/fury/benchmark/DeserializationBenchmark.java similarity index 100% rename from java/fury-testsuite/src/test/java/io/fury/benchmark/DeserializationBenchmark.java rename to java/fury-testsuite/src/test/java/org/apache/fury/benchmark/DeserializationBenchmark.java diff --git a/java/fury-testsuite/src/test/java/io/fury/benchmark/SerializationBenchmark.java b/java/fury-testsuite/src/test/java/org/apache/fury/benchmark/SerializationBenchmark.java similarity index 100% rename from java/fury-testsuite/src/test/java/io/fury/benchmark/SerializationBenchmark.java rename to java/fury-testsuite/src/test/java/org/apache/fury/benchmark/SerializationBenchmark.java diff --git a/java/fury-testsuite/src/test/java/io/fury/test/BeanMock.java b/java/fury-testsuite/src/test/java/org/apache/fury/test/BeanMock.java similarity index 100% rename from java/fury-testsuite/src/test/java/io/fury/test/BeanMock.java rename to java/fury-testsuite/src/test/java/org/apache/fury/test/BeanMock.java diff --git a/java/fury-testsuite/src/test/java/io/fury/test/DTOTest.java b/java/fury-testsuite/src/test/java/org/apache/fury/test/DTOTest.java similarity index 100% rename from java/fury-testsuite/src/test/java/io/fury/test/DTOTest.java rename to java/fury-testsuite/src/test/java/org/apache/fury/test/DTOTest.java diff --git a/java/fury-testsuite/src/test/java/io/fury/test/ReadResolveCircularTest.java b/java/fury-testsuite/src/test/java/org/apache/fury/test/ReadResolveCircularTest.java similarity index 100% rename from java/fury-testsuite/src/test/java/io/fury/test/ReadResolveCircularTest.java rename to java/fury-testsuite/src/test/java/org/apache/fury/test/ReadResolveCircularTest.java diff --git a/java/pom.xml b/java/pom.xml index 9e46d07782..526831dc98 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -24,7 +24,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.furyio + org.apache.fury fury-parent pom 0.5.0-SNAPSHOT @@ -44,7 +44,7 @@ - https://furyio.org + https://fury.apache.org chaokunyang diff --git a/scala/build.sbt b/scala/build.sbt index 10d3ee7159..0c9ed7358f 100644 --- a/scala/build.sbt +++ b/scala/build.sbt @@ -5,6 +5,6 @@ resolvers += Resolver.mavenLocal val furyVersion = "0.5.0-SNAPSHOT" libraryDependencies ++= Seq( - "org.furyio" % "fury-core" % furyVersion, + "org.apache.fury" % "fury-core" % furyVersion, "org.scalatest" %% "scalatest" % "3.2.17", ) From eb1c8a6decaf1eef601e54d108018c5967e41f91 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 26 Dec 2023 19:22:05 +0800 Subject: [PATCH 3/8] more Signed-off-by: tison --- docs/guide/graalvm_guide.md | 2 +- integration_tests/perftests/README.md | 4 +- .../state/FlatBuffersState.java | 2 +- licenserc.toml | 42 +++++++++---------- scala/README.md | 3 +- scala/project/build.properties | 2 +- .../serializer/scala/ScalaDispatcher.java | 0 .../scala/CollectionSerializer.scala | 0 .../fury/serializer/scala/MapSerializer.scala | 0 .../serializer/CollectionSerializerTest.scala | 0 .../apache}/fury/serializer/ScalaTest.scala | 0 .../SingleObjectSerializerTest.scala | 0 .../apache}/fury/serializer/TupleTest.scala | 0 13 files changed, 28 insertions(+), 27 deletions(-) rename scala/src/main/java/{io => org/apache}/fury/serializer/scala/ScalaDispatcher.java (100%) rename scala/src/main/scala/{io => org/apache}/fury/serializer/scala/CollectionSerializer.scala (100%) rename scala/src/main/scala/{io => org/apache}/fury/serializer/scala/MapSerializer.scala (100%) rename scala/src/test/scala/{io => org/apache}/fury/serializer/CollectionSerializerTest.scala (100%) rename scala/src/test/scala/{io => org/apache}/fury/serializer/ScalaTest.scala (100%) rename scala/src/test/scala/{io => org/apache}/fury/serializer/SingleObjectSerializerTest.scala (100%) rename scala/src/test/scala/{io => org/apache}/fury/serializer/TupleTest.scala (100%) diff --git a/docs/guide/graalvm_guide.md b/docs/guide/graalvm_guide.md index 7db641c5cb..7f4848d0f1 100644 --- a/docs/guide/graalvm_guide.md +++ b/docs/guide/graalvm_guide.md @@ -130,7 +130,7 @@ When Fury compression is enabled: - Struct: Fury is `24x speed, 31% size` compared to JDK. - Pojo: Fury is `12x speed, 48% size` compared to JDK. -See [[Benchmark.java](../../integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Benchmark.java)] for benchmark code. +See [[Benchmark.java](../../integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Benchmark.java)] for benchmark code. ### Struct Benchmark #### Class Fields diff --git a/integration_tests/perftests/README.md b/integration_tests/perftests/README.md index d97689de81..7bac51d279 100644 --- a/integration_tests/perftests/README.md +++ b/integration_tests/perftests/README.md @@ -3,8 +3,8 @@ ensure java maven shade work and so on. # Protobuffers/Flatbuffers benchmark Generate code manually: ```bash -flatc -o src/main/java -j src/main/java/io/fury/integration_tests/state/bench.fbs -protoc -I=src/main/java/io/fury/integration_tests/state --java_out=src/main/java/ bench.proto +flatc -o src/main/java -j src/main/java/org/apache/fury/integration_tests/state/bench.fbs +protoc -I=src/main/java/org/apache/fury/integration_tests/state --java_out=src/main/java/ bench.proto ``` proto code can be generated by maven plugin. Flatbuffers generated is short, just add generated files to repo directly. diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/FlatBuffersState.java b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/FlatBuffersState.java index 9913ffc624..f714726dfd 100644 --- a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/FlatBuffersState.java +++ b/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/FlatBuffersState.java @@ -50,7 +50,7 @@ import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; -// flatc -o src/main/java -j src/main/java/io/fury/integration_tests/state/bench.fbs +// flatc -o src/main/java -j src/main/java/org/apache/fury/integration_tests/state/bench.fbs public class FlatBuffersState { public static byte[] serializeBar(Bar bar) { diff --git a/licenserc.toml b/licenserc.toml index 41d23d6ea9..eb4eb5d915 100644 --- a/licenserc.toml +++ b/licenserc.toml @@ -21,30 +21,30 @@ excludes = [ "*.txt", # Generated - "integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/**", + "integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/**", # Derived "ci/format.sh", - "java/fury-benchmark/src/main/java/io/fury/benchmark/Identity2IdMap.java", - "java/fury-benchmark/src/main/java/io/fury/benchmark/data/Data.java", - "java/fury-benchmark/src/main/java/io/fury/benchmark/data/Image.java", - "java/fury-benchmark/src/main/java/io/fury/benchmark/data/Media.java", - "java/fury-benchmark/src/main/java/io/fury/benchmark/data/MediaContent.java", - "java/fury-benchmark/src/main/java/io/fury/benchmark/data/Sample.java", - "java/fury-benchmark/src/main/java/io/fury/benchmark/state/BufferType.java", - "java/fury-benchmark/src/main/java/io/fury/benchmark/state/KryoState.java", - "java/fury-core/src/main/java/io/fury/codegen/Code.java", - "java/fury-core/src/main/java/io/fury/collection/FuryObjectMap.java", - "java/fury-core/src/main/java/io/fury/collection/IdentityMap.java", - "java/fury-core/src/main/java/io/fury/collection/IdentityObjectIntMap.java", - "java/fury-core/src/main/java/io/fury/collection/LongMap.java", - "java/fury-core/src/main/java/io/fury/collection/ObjectIntMap.java", - "java/fury-core/src/main/java/io/fury/io/ClassLoaderObjectInputStream.java", - "java/fury-core/src/main/java/io/fury/memory/MemoryBuffer.java", - "java/fury-core/src/main/java/io/fury/type/Generics.java", - "java/fury-core/src/main/java/io/fury/util/Platform.java", - "java/fury-core/src/test/java/io/fury/type/GenericsTest.java", - "java/fury-format/src/main/java/io/fury/format/vectorized/ArrowWriter.java", + "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java", + "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Data.java", + "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Image.java", + "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Media.java", + "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/MediaContent.java", + "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Sample.java", + "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/BufferType.java", + "java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/KryoState.java", + "java/fury-core/src/main/java/org/apache/fury/codegen/Code.java", + "java/fury-core/src/main/java/org/apache/fury/collection/FuryObjectMap.java", + "java/fury-core/src/main/java/org/apache/fury/collection/IdentityMap.java", + "java/fury-core/src/main/java/org/apache/fury/collection/IdentityObjectIntMap.java", + "java/fury-core/src/main/java/org/apache/fury/collection/LongMap.java", + "java/fury-core/src/main/java/org/apache/fury/collection/ObjectIntMap.java", + "java/fury-core/src/main/java/org/apache/fury/io/ClassLoaderObjectInputStream.java", + "java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java", + "java/fury-core/src/main/java/org/apache/fury/type/Generics.java", + "java/fury-core/src/main/java/org/apache/fury/util/Platform.java", + "java/fury-core/src/test/java/org/apache/fury/type/GenericsTest.java", + "java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java", "javascript/packages/hps/src/v8-fast-api-calls.h", "javascript/packages/fury/lib/murmurHash3.ts", "src/fury/thirdparty/MurmurHash3.*", diff --git a/scala/README.md b/scala/README.md index a123438083..bd324bc010 100644 --- a/scala/README.md +++ b/scala/README.md @@ -1,4 +1,5 @@ # Fury Scala + Fury supports all scala object serialization: - `case` class serialization supported - `pojo/bean` class serialization supported @@ -6,4 +7,4 @@ Fury supports all scala object serialization: - `collection` serialization supported - other types such as `tuple/either` and basic types are all supported too. -For user document, see [scala_guide](../docs/guide/scala_guide.md). +For user document, see [scala_guide](/docs/guide/scala_guide.md). diff --git a/scala/project/build.properties b/scala/project/build.properties index fa6729ac86..05676d489d 100644 --- a/scala/project/build.properties +++ b/scala/project/build.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -sbt.version=1.9.7 \ No newline at end of file +sbt.version=1.9.7 diff --git a/scala/src/main/java/io/fury/serializer/scala/ScalaDispatcher.java b/scala/src/main/java/org/apache/fury/serializer/scala/ScalaDispatcher.java similarity index 100% rename from scala/src/main/java/io/fury/serializer/scala/ScalaDispatcher.java rename to scala/src/main/java/org/apache/fury/serializer/scala/ScalaDispatcher.java diff --git a/scala/src/main/scala/io/fury/serializer/scala/CollectionSerializer.scala b/scala/src/main/scala/org/apache/fury/serializer/scala/CollectionSerializer.scala similarity index 100% rename from scala/src/main/scala/io/fury/serializer/scala/CollectionSerializer.scala rename to scala/src/main/scala/org/apache/fury/serializer/scala/CollectionSerializer.scala diff --git a/scala/src/main/scala/io/fury/serializer/scala/MapSerializer.scala b/scala/src/main/scala/org/apache/fury/serializer/scala/MapSerializer.scala similarity index 100% rename from scala/src/main/scala/io/fury/serializer/scala/MapSerializer.scala rename to scala/src/main/scala/org/apache/fury/serializer/scala/MapSerializer.scala diff --git a/scala/src/test/scala/io/fury/serializer/CollectionSerializerTest.scala b/scala/src/test/scala/org/apache/fury/serializer/CollectionSerializerTest.scala similarity index 100% rename from scala/src/test/scala/io/fury/serializer/CollectionSerializerTest.scala rename to scala/src/test/scala/org/apache/fury/serializer/CollectionSerializerTest.scala diff --git a/scala/src/test/scala/io/fury/serializer/ScalaTest.scala b/scala/src/test/scala/org/apache/fury/serializer/ScalaTest.scala similarity index 100% rename from scala/src/test/scala/io/fury/serializer/ScalaTest.scala rename to scala/src/test/scala/org/apache/fury/serializer/ScalaTest.scala diff --git a/scala/src/test/scala/io/fury/serializer/SingleObjectSerializerTest.scala b/scala/src/test/scala/org/apache/fury/serializer/SingleObjectSerializerTest.scala similarity index 100% rename from scala/src/test/scala/io/fury/serializer/SingleObjectSerializerTest.scala rename to scala/src/test/scala/org/apache/fury/serializer/SingleObjectSerializerTest.scala diff --git a/scala/src/test/scala/io/fury/serializer/TupleTest.scala b/scala/src/test/scala/org/apache/fury/serializer/TupleTest.scala similarity index 100% rename from scala/src/test/scala/io/fury/serializer/TupleTest.scala rename to scala/src/test/scala/org/apache/fury/serializer/TupleTest.scala From d734a0cfad5561162b36a804215c153d5cfa5b53 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 26 Dec 2023 19:26:56 +0800 Subject: [PATCH 4/8] fixup Signed-off-by: tison --- .../org/apache/fury/serializer/ExternalizableSerializer.java | 4 ++-- .../main/java/org/apache/fury/serializer/JavaSerializer.java | 4 ++-- .../src/main/java/org/apache/fury/format/type/DataTypes.java | 2 +- .../org/apache/fury/format/vectorized/ArrowSerializers.java | 4 ++-- .../apache/fury/format/vectorized/ArrowTableSerializer.java | 2 +- .../java/org/apache/fury/format/vectorized/ArrowUtils.java | 4 ++-- .../test/java/org/apache/fury/format/CrossLanguageTest.java | 2 +- .../apache/fury/format/vectorized/ArrowSerializersTest.java | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java index 51279c3ecc..466571603a 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java @@ -20,8 +20,8 @@ package org.apache.fury.serializer; import org.apache.fury.Fury; -import org.apache.fury.org.apache.furyObjectInput; -import org.apache.fury.org.apache.furyObjectOutput; +import org.apache.fury.io.FuryObjectInput; +import org.apache.fury.io.FuryObjectOutput; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.util.Platform; import org.apache.fury.util.ReflectionUtils; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java index dfdc52dd92..50c4af0619 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java @@ -21,8 +21,8 @@ import org.apache.fury.Fury; import org.apache.fury.io.ClassLoaderObjectInputStream; -import org.apache.fury.org.apache.furyObjectInput; -import org.apache.fury.org.apache.furyObjectOutput; +import org.apache.fury.io.FuryObjectInput; +import org.apache.fury.io.FuryObjectOutput; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.resolver.ClassResolver; import org.apache.fury.util.LoggerFactory; diff --git a/java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java b/java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java index ba1a6b080d..b0e7c4bbb5 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java @@ -22,7 +22,7 @@ import static org.apache.fury.util.Preconditions.checkArgument; import org.apache.fury.exception.FuryException; -import org.apache.fury.org.apache.furyOutputStream; +import org.apache.fury.io.FuryOutputStream; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.type.Type; import org.apache.fury.util.DecimalUtils; diff --git a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java index d697994787..dd083ca011 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java @@ -20,8 +20,8 @@ package org.apache.fury.format.vectorized; import org.apache.fury.Fury; -import org.apache.fury.org.apache.furyReadableByteChannel; -import org.apache.fury.org.apache.furyWritableByteChannel; +import org.apache.fury.io.FuryReadableByteChannel; +import org.apache.fury.io.FuryWritableByteChannel; import org.apache.fury.io.MockWritableByteChannel; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; diff --git a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java index 2479f383a9..bddf8ad678 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java @@ -20,7 +20,7 @@ package org.apache.fury.format.vectorized; import org.apache.fury.Fury; -import org.apache.fury.org.apache.furyReadableByteChannel; +import org.apache.fury.io.FuryReadableByteChannel; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.serializer.Serializers; import org.apache.fury.type.Type; diff --git a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowUtils.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowUtils.java index 37b935e80a..71c9120b70 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowUtils.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowUtils.java @@ -19,8 +19,8 @@ package org.apache.fury.format.vectorized; -import org.apache.fury.org.apache.furyInputStream; -import org.apache.fury.org.apache.furyOutputStream; +import org.apache.fury.io.FuryInputStream; +import org.apache.fury.io.FuryOutputStream; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.util.DecimalUtils; import java.io.IOException; diff --git a/java/fury-format/src/test/java/org/apache/fury/format/CrossLanguageTest.java b/java/fury-format/src/test/java/org/apache/fury/format/CrossLanguageTest.java index 06b8c3daac..6aafd0739f 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/CrossLanguageTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/CrossLanguageTest.java @@ -35,7 +35,7 @@ import org.apache.fury.format.vectorized.ArrowTable; import org.apache.fury.format.vectorized.ArrowUtils; import org.apache.fury.format.vectorized.ArrowWriter; -import org.apache.fury.org.apache.furyOutputStream; +import org.apache.fury.io.FuryOutputStream; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; import org.apache.fury.serializer.BufferObject; diff --git a/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowSerializersTest.java b/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowSerializersTest.java index 780ba58cf4..30f02493e1 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowSerializersTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowSerializersTest.java @@ -23,7 +23,7 @@ import org.apache.fury.Fury; import org.apache.fury.config.Language; -import org.apache.fury.org.apache.furyWritableByteChannel; +import org.apache.fury.io.FuryWritableByteChannel; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; import org.apache.fury.resolver.ClassResolver; From 782f43b812bda1fb3148576ff9df2698587fab29 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 26 Dec 2023 19:33:00 +0800 Subject: [PATCH 5/8] more Signed-off-by: tison --- integration_tests/graalvm_tests/pom.xml | 3 +-- .../main/java/{io => org/apache}/fury/graalvm/Benchmark.java | 0 .../src/main/java/{io => org/apache}/fury/graalvm/Example.java | 0 .../src/main/java/{io => org/apache}/fury/graalvm/Foo.java | 0 .../src/main/java/{io => org/apache}/fury/graalvm/Main.java | 0 .../src/main/java/{io => org/apache}/fury/graalvm/Struct.java | 0 .../{io => org/apache}/fury/graalvm/ThreadSafeExample.java | 0 .../main/java/{io => org/apache}/fury/graalvm/record/Foo.java | 0 .../{io => org/apache}/fury/graalvm/record/RecordExample.java | 0 .../{io => org/apache}/fury/graalvm/record/RecordExample2.java | 0 .../{io => org/apache}/fury/integration_tests/FuryTest.java | 0 .../apache}/fury/integration_tests/JDKCompatibilityTest.java | 0 .../integration_tests/ImmutableCollectionSerializersTest.java | 0 .../apache}/fury/integration_tests/RecordSerializersTest.java | 0 .../{io => org/apache}/fury/integration_tests/Records.java | 0 .../{io => org/apache}/fury/integration_tests/TestUtils.java | 0 .../fury/integration_tests/UserTypeDeserializeSuite.java | 0 .../apache}/fury/integration_tests/UserTypeSerializeSuite.java | 0 .../apache}/fury/integration_tests/state/Example.java | 0 .../apache}/fury/integration_tests/state/FlatBuffersState.java | 0 .../fury/integration_tests/state/ProtoBuffersState.java | 0 .../{io => org/apache}/fury/integration_tests/state/bench.fbs | 0 .../apache}/fury/integration_tests/state/generated/FBSBar.java | 0 .../apache}/fury/integration_tests/state/generated/FBSFoo.java | 0 .../fury/integration_tests/state/generated/FBSImage.java | 0 .../fury/integration_tests/state/generated/FBSMedia.java | 0 .../integration_tests/state/generated/FBSMediaContent.java | 0 .../fury/integration_tests/state/generated/FBSPlayer.java | 0 .../fury/integration_tests/state/generated/FBSSample.java | 0 .../fury/integration_tests/state/generated/FBSSize.java | 0 .../fury/integration_tests/state/FlatBuffersStateTest.java | 0 .../fury/integration_tests/state/ProtoBuffersStateTest.java | 0 32 files changed, 1 insertion(+), 2 deletions(-) rename integration_tests/graalvm_tests/src/main/java/{io => org/apache}/fury/graalvm/Benchmark.java (100%) rename integration_tests/graalvm_tests/src/main/java/{io => org/apache}/fury/graalvm/Example.java (100%) rename integration_tests/graalvm_tests/src/main/java/{io => org/apache}/fury/graalvm/Foo.java (100%) rename integration_tests/graalvm_tests/src/main/java/{io => org/apache}/fury/graalvm/Main.java (100%) rename integration_tests/graalvm_tests/src/main/java/{io => org/apache}/fury/graalvm/Struct.java (100%) rename integration_tests/graalvm_tests/src/main/java/{io => org/apache}/fury/graalvm/ThreadSafeExample.java (100%) rename integration_tests/graalvm_tests/src/main/java/{io => org/apache}/fury/graalvm/record/Foo.java (100%) rename integration_tests/graalvm_tests/src/main/java/{io => org/apache}/fury/graalvm/record/RecordExample.java (100%) rename integration_tests/graalvm_tests/src/main/java/{io => org/apache}/fury/graalvm/record/RecordExample2.java (100%) rename integration_tests/jdk_compatibility_tests/src/test/java/{io => org/apache}/fury/integration_tests/FuryTest.java (100%) rename integration_tests/jdk_compatibility_tests/src/test/java/{io => org/apache}/fury/integration_tests/JDKCompatibilityTest.java (100%) rename integration_tests/latest_jdk_tests/src/test/java/{io => org/apache}/fury/integration_tests/ImmutableCollectionSerializersTest.java (100%) rename integration_tests/latest_jdk_tests/src/test/java/{io => org/apache}/fury/integration_tests/RecordSerializersTest.java (100%) rename integration_tests/latest_jdk_tests/src/test/java/{io => org/apache}/fury/integration_tests/Records.java (100%) rename integration_tests/latest_jdk_tests/src/test/java/{io => org/apache}/fury/integration_tests/TestUtils.java (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/UserTypeDeserializeSuite.java (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/UserTypeSerializeSuite.java (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/state/Example.java (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/state/FlatBuffersState.java (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/state/ProtoBuffersState.java (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/state/bench.fbs (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/state/generated/FBSBar.java (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/state/generated/FBSFoo.java (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/state/generated/FBSImage.java (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/state/generated/FBSMedia.java (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/state/generated/FBSMediaContent.java (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/state/generated/FBSPlayer.java (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/state/generated/FBSSample.java (100%) rename integration_tests/perftests/src/main/java/{io => org/apache}/fury/integration_tests/state/generated/FBSSize.java (100%) rename integration_tests/perftests/src/test/java/{io => org/apache}/fury/integration_tests/state/FlatBuffersStateTest.java (100%) rename integration_tests/perftests/src/test/java/{io => org/apache}/fury/integration_tests/state/ProtoBuffersStateTest.java (100%) diff --git a/integration_tests/graalvm_tests/pom.xml b/integration_tests/graalvm_tests/pom.xml index 9c6b5a3ee5..5584e6990a 100644 --- a/integration_tests/graalvm_tests/pom.xml +++ b/integration_tests/graalvm_tests/pom.xml @@ -198,5 +198,4 @@ - - \ No newline at end of file + diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Benchmark.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Benchmark.java similarity index 100% rename from integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Benchmark.java rename to integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Benchmark.java diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Example.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Example.java similarity index 100% rename from integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Example.java rename to integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Example.java diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Foo.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Foo.java similarity index 100% rename from integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Foo.java rename to integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Foo.java diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Main.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Main.java similarity index 100% rename from integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Main.java rename to integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Main.java diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Struct.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Struct.java similarity index 100% rename from integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/Struct.java rename to integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Struct.java diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/ThreadSafeExample.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/ThreadSafeExample.java similarity index 100% rename from integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/ThreadSafeExample.java rename to integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/ThreadSafeExample.java diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/Foo.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/Foo.java similarity index 100% rename from integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/Foo.java rename to integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/Foo.java diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/RecordExample.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample.java similarity index 100% rename from integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/RecordExample.java rename to integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample.java diff --git a/integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/RecordExample2.java b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample2.java similarity index 100% rename from integration_tests/graalvm_tests/src/main/java/io/fury/graalvm/record/RecordExample2.java rename to integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample2.java diff --git a/integration_tests/jdk_compatibility_tests/src/test/java/io/fury/integration_tests/FuryTest.java b/integration_tests/jdk_compatibility_tests/src/test/java/org/apache/fury/integration_tests/FuryTest.java similarity index 100% rename from integration_tests/jdk_compatibility_tests/src/test/java/io/fury/integration_tests/FuryTest.java rename to integration_tests/jdk_compatibility_tests/src/test/java/org/apache/fury/integration_tests/FuryTest.java diff --git a/integration_tests/jdk_compatibility_tests/src/test/java/io/fury/integration_tests/JDKCompatibilityTest.java b/integration_tests/jdk_compatibility_tests/src/test/java/org/apache/fury/integration_tests/JDKCompatibilityTest.java similarity index 100% rename from integration_tests/jdk_compatibility_tests/src/test/java/io/fury/integration_tests/JDKCompatibilityTest.java rename to integration_tests/jdk_compatibility_tests/src/test/java/org/apache/fury/integration_tests/JDKCompatibilityTest.java diff --git a/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/ImmutableCollectionSerializersTest.java b/integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/ImmutableCollectionSerializersTest.java similarity index 100% rename from integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/ImmutableCollectionSerializersTest.java rename to integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/ImmutableCollectionSerializersTest.java 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/org/apache/fury/integration_tests/RecordSerializersTest.java similarity index 100% rename from integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/RecordSerializersTest.java rename to integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/RecordSerializersTest.java diff --git a/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/Records.java b/integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/Records.java similarity index 100% rename from integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/Records.java rename to integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/Records.java diff --git a/integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/TestUtils.java b/integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/TestUtils.java similarity index 100% rename from integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/TestUtils.java rename to integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/TestUtils.java diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/UserTypeDeserializeSuite.java b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/UserTypeDeserializeSuite.java similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/UserTypeDeserializeSuite.java rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/UserTypeDeserializeSuite.java diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/UserTypeSerializeSuite.java b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/UserTypeSerializeSuite.java similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/UserTypeSerializeSuite.java rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/UserTypeSerializeSuite.java diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/Example.java b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/Example.java similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/state/Example.java rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/Example.java diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/FlatBuffersState.java b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/FlatBuffersState.java similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/state/FlatBuffersState.java rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/FlatBuffersState.java diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/ProtoBuffersState.java b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/ProtoBuffersState.java similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/state/ProtoBuffersState.java rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/ProtoBuffersState.java diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/bench.fbs b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/bench.fbs similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/state/bench.fbs rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/bench.fbs diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSBar.java b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSBar.java similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSBar.java rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSBar.java diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSFoo.java b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSFoo.java similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSFoo.java rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSFoo.java diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSImage.java b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSImage.java similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSImage.java rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSImage.java diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSMedia.java b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSMedia.java similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSMedia.java rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSMedia.java diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSMediaContent.java b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSMediaContent.java similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSMediaContent.java rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSMediaContent.java diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSPlayer.java b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSPlayer.java similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSPlayer.java rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSPlayer.java diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSSample.java b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSSample.java similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSSample.java rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSSample.java diff --git a/integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSSize.java b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSSize.java similarity index 100% rename from integration_tests/perftests/src/main/java/io/fury/integration_tests/state/generated/FBSSize.java rename to integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/generated/FBSSize.java diff --git a/integration_tests/perftests/src/test/java/io/fury/integration_tests/state/FlatBuffersStateTest.java b/integration_tests/perftests/src/test/java/org/apache/fury/integration_tests/state/FlatBuffersStateTest.java similarity index 100% rename from integration_tests/perftests/src/test/java/io/fury/integration_tests/state/FlatBuffersStateTest.java rename to integration_tests/perftests/src/test/java/org/apache/fury/integration_tests/state/FlatBuffersStateTest.java diff --git a/integration_tests/perftests/src/test/java/io/fury/integration_tests/state/ProtoBuffersStateTest.java b/integration_tests/perftests/src/test/java/org/apache/fury/integration_tests/state/ProtoBuffersStateTest.java similarity index 100% rename from integration_tests/perftests/src/test/java/io/fury/integration_tests/state/ProtoBuffersStateTest.java rename to integration_tests/perftests/src/test/java/org/apache/fury/integration_tests/state/ProtoBuffersStateTest.java From 4ab72a3f8f499d78f082b097016ef076b6c95510 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 26 Dec 2023 19:36:39 +0800 Subject: [PATCH 6/8] more Signed-off-by: tison --- .../fury-core/native-image.properties | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename java/fury-core/src/main/resources/META-INF/native-image/{org.furyio => org.apache.fury}/fury-core/native-image.properties (100%) diff --git a/java/fury-core/src/main/resources/META-INF/native-image/org.furyio/fury-core/native-image.properties b/java/fury-core/src/main/resources/META-INF/native-image/org.apache.fury/fury-core/native-image.properties similarity index 100% rename from java/fury-core/src/main/resources/META-INF/native-image/org.furyio/fury-core/native-image.properties rename to java/fury-core/src/main/resources/META-INF/native-image/org.apache.fury/fury-core/native-image.properties From e69efcf54ef685bbf3a9a94b1aebdc0b3f7c9b7a Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 26 Dec 2023 19:37:30 +0800 Subject: [PATCH 7/8] more Signed-off-by: tison --- .../graalvm_tests/native-image.properties | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename integration_tests/graalvm_tests/src/main/resources/META-INF/native-image/{org.furyio => org.apache.fury}/graalvm_tests/native-image.properties (100%) diff --git a/integration_tests/graalvm_tests/src/main/resources/META-INF/native-image/org.furyio/graalvm_tests/native-image.properties b/integration_tests/graalvm_tests/src/main/resources/META-INF/native-image/org.apache.fury/graalvm_tests/native-image.properties similarity index 100% rename from integration_tests/graalvm_tests/src/main/resources/META-INF/native-image/org.furyio/graalvm_tests/native-image.properties rename to integration_tests/graalvm_tests/src/main/resources/META-INF/native-image/org.apache.fury/graalvm_tests/native-image.properties From 044d434fd752dae811fd94d3b84c6101f1ddae86 Mon Sep 17 00:00:00 2001 From: tison Date: Tue, 26 Dec 2023 19:38:51 +0800 Subject: [PATCH 8/8] spotless Signed-off-by: tison --- .../org/apache/fury/benchmark/ArraySuite.java | 2 +- .../fury/benchmark/CollectionSuite.java | 2 +- .../fury/benchmark/CompressStringSuite.java | 2 +- .../apache/fury/benchmark/Identity2IdMap.java | 2 +- .../benchmark/IntsSerializationSuite.java | 2 +- .../LongStringSerializationSuite.java | 2 +- .../benchmark/LongsSerializationSuite.java | 2 +- .../org/apache/fury/benchmark/MapSuite.java | 6 +- .../apache/fury/benchmark/MemorySuite.java | 4 +- .../org/apache/fury/benchmark/RowSuite.java | 6 +- .../benchmark/StringSerializationSuite.java | 2 +- .../benchmark/UserTypeDeserializeSuite.java | 2 +- .../benchmark/UserTypeSerializeSuite.java | 4 +- .../apache/fury/benchmark/ZeroCopySuite.java | 12 +-- .../apache/fury/benchmark/data/Struct.java | 4 +- .../apache/fury/benchmark/state/FstState.java | 4 +- .../fury/benchmark/state/FuryState.java | 4 +- .../fury/benchmark/state/HessionState.java | 6 +- .../apache/fury/benchmark/state/JDKState.java | 10 +- .../fury/benchmark/state/JsonbState.java | 16 ++-- .../fury/benchmark/state/KryoState.java | 2 +- .../fury/benchmark/state/ProtostuffState.java | 8 +- .../src/main/java/org/apache/fury/Fury.java | 24 ++--- .../java/org/apache/fury/ThreadLocalFury.java | 6 +- .../java/org/apache/fury/ThreadSafeFury.java | 4 +- .../apache/fury/builder/AccessorHelper.java | 12 +-- .../fury/builder/BaseObjectCodecBuilder.java | 22 ++--- .../org/apache/fury/builder/CodecBuilder.java | 16 ++-- .../org/apache/fury/builder/CodecUtils.java | 5 +- .../fury/builder/CompatibleCodecBuilder.java | 20 ++-- .../org/apache/fury/builder/Generated.java | 8 +- .../org/apache/fury/builder/JITContext.java | 12 +-- .../fury/builder/MetaSharedCodecBuilder.java | 4 +- .../fury/builder/ObjectCodecBuilder.java | 16 ++-- .../fury/builder/ObjectCodecOptimizer.java | 8 +- .../apache/fury/codegen/CodeGenerator.java | 22 ++--- .../apache/fury/codegen/CodegenContext.java | 14 +-- .../org/apache/fury/codegen/CompileUnit.java | 2 +- .../org/apache/fury/codegen/Expression.java | 16 ++-- .../fury/codegen/ExpressionOptimizer.java | 6 +- .../apache/fury/codegen/ExpressionUtils.java | 10 +- .../fury/codegen/ExpressionVisitor.java | 12 +-- .../org/apache/fury/codegen/JaninoUtils.java | 8 +- .../apache/fury/collection/FuryObjectMap.java | 2 +- .../org/apache/fury/collection/LazyMap.java | 2 +- .../fury/collection/MultiKeyWeakMap.java | 2 +- .../java/org/apache/fury/config/Config.java | 8 +- .../org/apache/fury/config/FuryBuilder.java | 12 +-- .../org/apache/fury/io/FuryInputStream.java | 4 +- .../org/apache/fury/io/FuryObjectInput.java | 6 +- .../org/apache/fury/io/FuryObjectOutput.java | 8 +- .../org/apache/fury/io/FuryOutputStream.java | 2 +- .../fury/io/FuryReadableByteChannel.java | 2 +- .../fury/io/FuryWritableByteChannel.java | 2 +- .../org/apache/fury/memory/MemoryBuffer.java | 6 +- .../org/apache/fury/memory/MemoryUtils.java | 4 +- .../fury/pool/ClassLoaderFuryPooled.java | 4 +- .../fury/pool/FuryPooledObjectFactory.java | 4 +- .../org/apache/fury/pool/ThreadPoolFury.java | 8 +- .../fury/resolver/AllowListChecker.java | 10 +- .../apache/fury/resolver/ClassResolver.java | 96 +++++++++---------- .../apache/fury/resolver/EnumStringBytes.java | 4 +- .../fury/resolver/EnumStringResolver.java | 2 +- .../apache/fury/resolver/FieldResolver.java | 26 ++--- .../apache/fury/resolver/MapRefResolver.java | 10 +- .../org/apache/fury/resolver/MetaContext.java | 4 +- .../fury/resolver/SerializationContext.java | 2 +- .../fury/serializer/ArraySerializers.java | 6 +- .../apache/fury/serializer/BufferObject.java | 2 +- .../fury/serializer/BufferSerializers.java | 4 +- .../fury/serializer/CodegenSerializer.java | 7 +- .../fury/serializer/CompatibleSerializer.java | 12 +-- .../serializer/ExternalizableSerializer.java | 6 +- .../fury/serializer/ForwardSerializer.java | 12 +-- .../fury/serializer/JavaSerializer.java | 16 ++-- .../fury/serializer/JdkProxySerializer.java | 4 +- .../fury/serializer/LambdaSerializer.java | 8 +- .../fury/serializer/LocaleSerializer.java | 6 +- .../fury/serializer/MetaSharedSerializer.java | 20 ++-- .../fury/serializer/ObjectSerializer.java | 14 +-- .../serializer/ObjectStreamSerializer.java | 32 +++---- .../fury/serializer/OptionalSerializers.java | 4 +- .../serializer/ReplaceResolveSerializer.java | 16 ++-- .../apache/fury/serializer/Serializer.java | 2 +- .../apache/fury/serializer/Serializers.java | 24 ++--- .../fury/serializer/StringSerializer.java | 18 ++-- .../fury/serializer/StructSerializer.java | 16 ++-- .../fury/serializer/TimeSerializers.java | 8 +- .../apache/fury/serializer/URLSerializer.java | 4 +- .../serializer/UnexistedClassSerializers.java | 6 +- .../AbstractCollectionSerializer.java | 4 +- .../collection/AbstractMapSerializer.java | 4 +- .../serializer/collection/ArrayAsList.java | 2 +- .../collection/ChildContainerSerializers.java | 22 ++--- .../collection/CollectionSerializer.java | 2 +- .../collection/CollectionSerializers.java | 24 ++--- .../collection/FuryArrayAsListSerializer.java | 2 +- .../GuavaCollectionSerializers.java | 10 +- .../ImmutableCollectionSerializers.java | 8 +- .../serializer/collection/MapSerializer.java | 2 +- .../serializer/collection/MapSerializers.java | 22 ++--- .../collection/SynchronizedSerializers.java | 14 +-- .../collection/UnmodifiableSerializers.java | 16 ++-- .../scala/SingletonCollectionSerializer.java | 4 +- .../scala/SingletonMapSerializer.java | 4 +- .../scala/SingletonObjectSerializer.java | 2 +- .../java/org/apache/fury/type/ClassDef.java | 24 ++--- .../java/org/apache/fury/type/Descriptor.java | 16 ++-- .../apache/fury/type/DescriptorGrouper.java | 2 +- .../apache/fury/type/FinalObjectTypeStub.java | 6 +- .../org/apache/fury/type/GenericType.java | 4 +- .../java/org/apache/fury/type/ScalaTypes.java | 4 +- .../java/org/apache/fury/type/TypeUtils.java | 8 +- .../org/apache/fury/util/FieldAccessor.java | 12 +-- .../org/apache/fury/util/LoaderBinding.java | 4 +- .../java/org/apache/fury/util/Platform.java | 2 +- .../org/apache/fury/util/ReflectionUtils.java | 10 +- .../apache/fury/util/function/Functions.java | 8 +- .../fury/util/function/TriFunction.java | 2 +- .../apache/fury/util/record/RecordUtils.java | 4 +- .../apache/fury/util/unsafe/_Collections.java | 2 +- .../apache/fury/util/unsafe/_JDKAccess.java | 18 ++-- .../org/apache/fury/CrossLanguageTest.java | 14 +-- .../test/java/org/apache/fury/CyclicTest.java | 4 +- .../java/org/apache/fury/FuryInitPerf.java | 6 +- .../test/java/org/apache/fury/FuryTest.java | 32 +++---- .../java/org/apache/fury/FuryTestBase.java | 16 ++-- .../java/org/apache/fury/OutOfBandTest.java | 4 +- .../test/java/org/apache/fury/TestUtils.java | 4 +- .../org/apache/fury/ThreadSafeFuryTest.java | 14 +-- .../fury/builder/AccessorHelperTest.java | 10 +- .../apache/fury/builder/JITContextTest.java | 2 +- .../fury/builder/ObjectCodecBuilderTest.java | 16 ++-- .../fury/codegen/CodeGeneratorTest.java | 12 +-- .../fury/codegen/CodegenContextTest.java | 2 +- .../fury/codegen/ExpressionOptimizerTest.java | 4 +- .../fury/codegen/ExpressionVisitorTest.java | 6 +- .../apache/fury/codegen/JaninoUtilsTest.java | 8 +- .../apache/fury/collection/LazyMapTest.java | 8 +- .../fury/collection/MultiKeyWeakMapTest.java | 2 +- .../apache/fury/io/FuryObjectInputTest.java | 2 +- .../apache/fury/io/FuryObjectOutputTest.java | 2 +- .../apache/fury/memory/MemoryBufferTest.java | 2 +- .../apache/fury/resolver/BlackListTest.java | 2 +- .../fury/resolver/ClassResolverTest.java | 37 +++---- .../fury/resolver/FieldResolverTest.java | 4 +- .../fury/resolver/MapRefResolverTest.java | 2 +- .../apache/fury/resolver/MetaContextTest.java | 8 +- .../fury/serializer/ArraySerializersTest.java | 10 +- .../serializer/BufferSerializersTest.java | 2 +- .../apache/fury/serializer/ClassUtils.java | 12 +-- .../CodegenCompatibleSerializerTest.java | 8 +- .../serializer/CodegenSerializerTest.java | 12 +-- .../serializer/CompatibleSerializerTest.java | 16 ++-- .../fury/serializer/DuplicateFieldsTest.java | 4 +- .../ExternalizableSerializerTest.java | 2 +- .../serializer/ForwardSerializerTest.java | 6 +- .../fury/serializer/JavaSerializerTest.java | 8 +- .../serializer/JdkProxySerializerTest.java | 6 +- .../fury/serializer/LambdaSerializerTest.java | 4 +- .../fury/serializer/LocaleSerializerTest.java | 2 +- .../serializer/MetaSharedCompatibleTest.java | 10 +- .../fury/serializer/ObjectSerializerTest.java | 2 +- .../ObjectStreamSerializerTest.java | 10 +- .../serializer/OptionalSerializersTest.java | 6 +- .../ProtocolInteroperabilityTest.java | 20 ++-- .../ReplaceResolveSerializerTest.java | 8 +- .../serializer/SerializerFactoryTest.java | 2 +- .../fury/serializer/SerializersTest.java | 8 +- .../fury/serializer/StringSerializerTest.java | 14 +-- .../fury/serializer/TimeSerializersTest.java | 8 +- .../fury/serializer/URLSerializerTest.java | 4 +- .../UnexistedClassSerializersTest.java | 2 +- .../ChildContainerSerializersTest.java | 8 +- .../collection/CollectionSerializersTest.java | 14 +-- .../collection/MapSerializersTest.java | 14 +-- .../SynchronizedSerializersTest.java | 18 ++-- .../UnmodifiableSerializersTest.java | 20 ++-- .../fury/serializer/test/Inaccessible.java | 6 +- .../org/apache/fury/type/ClassDefTest.java | 8 +- .../org/apache/fury/type/DescriptorTest.java | 4 +- .../org/apache/fury/type/GenericsTest.java | 6 +- .../org/apache/fury/type/TypeUtilsTest.java | 6 +- .../fury/util/ClassLoaderUtilsTest.java | 2 +- .../org/apache/fury/util/FunctionsTest.java | 8 +- .../apache/fury/util/ReflectionUtilsTest.java | 2 +- .../fury/util/unsafe/JDKAccessTest.java | 2 +- .../fury/format/encoder/ArrayDataForEach.java | 4 +- .../fury/format/encoder/ArrayEncoder.java | 2 +- .../format/encoder/ArrayEncoderBuilder.java | 2 +- .../encoder/BaseBinaryEncoderBuilder.java | 18 ++-- .../apache/fury/format/encoder/Encoders.java | 14 +-- .../fury/format/encoder/MapEncoder.java | 2 +- .../format/encoder/MapEncoderBuilder.java | 4 +- .../fury/format/encoder/RowEncoder.java | 2 +- .../format/encoder/RowEncoderBuilder.java | 8 +- .../org/apache/fury/format/row/Getters.java | 2 +- .../apache/fury/format/row/ValueVisitor.java | 2 +- .../fury/format/row/binary/BinaryArray.java | 4 +- .../fury/format/row/binary/BinaryMap.java | 4 +- .../fury/format/row/binary/BinaryRow.java | 12 +-- .../fury/format/row/binary/UnsafeTrait.java | 10 +- .../row/binary/writer/BinaryArrayWriter.java | 6 +- .../row/binary/writer/BinaryRowWriter.java | 6 +- .../row/binary/writer/BinaryWriter.java | 14 +-- .../apache/fury/format/type/DataTypes.java | 12 +-- .../fury/format/type/TypeInference.java | 10 +- .../format/vectorized/ArrowSerializers.java | 20 ++-- .../fury/format/vectorized/ArrowTable.java | 2 +- .../vectorized/ArrowTableSerializer.java | 12 +-- .../fury/format/vectorized/ArrowUtils.java | 8 +- .../fury/format/vectorized/ArrowWriter.java | 10 +- .../apache/fury/format/CrossLanguageTest.java | 30 +++--- .../fury/format/encoder/ArrayEncoderTest.java | 2 +- .../fury/format/encoder/CodecBuilderTest.java | 2 +- .../fury/format/encoder/MapEncoderTest.java | 2 +- .../fury/format/encoder/RowEncoderTest.java | 10 +- .../format/row/binary/BinaryArrayTest.java | 2 +- .../fury/format/row/binary/BinaryMapTest.java | 8 +- .../fury/format/row/binary/BinaryRowTest.java | 10 +- .../fury/format/type/DataTypesTest.java | 2 +- .../fury/format/type/TypeInferenceTest.java | 4 +- .../vectorized/ArrowSerializersTest.java | 14 +-- .../format/vectorized/ArrowUtilsTest.java | 4 +- .../format/vectorized/ArrowWriterTest.java | 4 +- .../benchmark/DeserializationBenchmark.java | 12 +-- .../benchmark/SerializationBenchmark.java | 6 +- .../java/org/apache/fury/test/DTOTest.java | 4 +- .../fury/test/ReadResolveCircularTest.java | 2 +- .../src/test/java/org/test/Org.java | 4 +- 230 files changed, 969 insertions(+), 966 deletions(-) diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/ArraySuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/ArraySuite.java index 69b18e2f0a..cbd0c5b9e8 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/ArraySuite.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/ArraySuite.java @@ -19,11 +19,11 @@ package org.apache.fury.benchmark; -import org.apache.fury.memory.MemoryBuffer; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Random; +import org.apache.fury.memory.MemoryBuffer; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Level; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/CollectionSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/CollectionSuite.java index 54b2e622f8..c6b40f3740 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/CollectionSuite.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/CollectionSuite.java @@ -19,9 +19,9 @@ package org.apache.fury.benchmark; -import org.apache.fury.Fury; import java.util.ArrayList; import java.util.List; +import org.apache.fury.Fury; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; import org.slf4j.Logger; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java index 6e9eb0bd0c..5cd60d3356 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/CompressStringSuite.java @@ -19,11 +19,11 @@ package org.apache.fury.benchmark; +import java.nio.ByteBuffer; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.serializer.StringSerializer; import org.apache.fury.util.Platform; import org.apache.fury.util.StringUtils; -import java.nio.ByteBuffer; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java index 30991f3ea4..00cffc5d7e 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/Identity2IdMap.java @@ -16,9 +16,9 @@ package org.apache.fury.benchmark; -import org.apache.fury.util.Platform; import java.util.ArrayList; import java.util.List; +import org.apache.fury.util.Platform; // Drived from // https://github.com/RuedigerMoeller/fast-serialization/blob/e8da5591daa09452791dcd992ea4f83b20937be7/src/main/java/org/nustaq/serialization/util/FSTIdentity2IdMap.java. diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/IntsSerializationSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/IntsSerializationSuite.java index 4c6f065f6a..6f811f9053 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/IntsSerializationSuite.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/IntsSerializationSuite.java @@ -19,13 +19,13 @@ package org.apache.fury.benchmark; +import java.io.ByteArrayOutputStream; import org.apache.fury.benchmark.state.FstState; import org.apache.fury.benchmark.state.FuryState; import org.apache.fury.benchmark.state.HessionState; import org.apache.fury.benchmark.state.JDKState; import org.apache.fury.benchmark.state.KryoState; import org.apache.fury.benchmark.state.ProtostuffState; -import java.io.ByteArrayOutputStream; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.CompilerControl; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongStringSerializationSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongStringSerializationSuite.java index 6962cfa3a4..9f1561d063 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongStringSerializationSuite.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongStringSerializationSuite.java @@ -19,13 +19,13 @@ package org.apache.fury.benchmark; +import java.io.ByteArrayOutputStream; import org.apache.fury.benchmark.state.FstState; import org.apache.fury.benchmark.state.FuryState; import org.apache.fury.benchmark.state.HessionState; import org.apache.fury.benchmark.state.JDKState; import org.apache.fury.benchmark.state.KryoState; import org.apache.fury.benchmark.state.ProtostuffState; -import java.io.ByteArrayOutputStream; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.CompilerControl; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongsSerializationSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongsSerializationSuite.java index d67b798400..4951d0db8b 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongsSerializationSuite.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/LongsSerializationSuite.java @@ -19,13 +19,13 @@ package org.apache.fury.benchmark; +import java.io.ByteArrayOutputStream; import org.apache.fury.benchmark.state.FstState; import org.apache.fury.benchmark.state.FuryState; import org.apache.fury.benchmark.state.HessionState; import org.apache.fury.benchmark.state.JDKState; import org.apache.fury.benchmark.state.KryoState; import org.apache.fury.benchmark.state.ProtostuffState; -import java.io.ByteArrayOutputStream; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.CompilerControl; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/MapSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/MapSuite.java index fa0dfdc5b1..cb29ba09c0 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/MapSuite.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/MapSuite.java @@ -19,14 +19,14 @@ package org.apache.fury.benchmark; -import org.apache.fury.collection.IdentityMap; -import org.apache.fury.collection.IdentityObjectIntMap; -import org.apache.fury.collection.ObjectMap; import io.timeandspace.smoothie.SwissTable; import java.io.IOException; import java.util.HashMap; import java.util.IdentityHashMap; import java.util.stream.IntStream; +import org.apache.fury.collection.IdentityMap; +import org.apache.fury.collection.IdentityObjectIntMap; +import org.apache.fury.collection.ObjectMap; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/MemorySuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/MemorySuite.java index 9813892ffb..2f03e1dcfa 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/MemorySuite.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/MemorySuite.java @@ -19,12 +19,12 @@ package org.apache.fury.benchmark; +import java.nio.ByteBuffer; +import java.util.Random; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; import org.apache.fury.util.Platform; import org.apache.fury.util.StringUtils; -import java.nio.ByteBuffer; -import java.util.Random; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.CompilerControl; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/RowSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/RowSuite.java index 0259144e1f..dd3b3065f6 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/RowSuite.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/RowSuite.java @@ -19,9 +19,6 @@ package org.apache.fury.benchmark; -import org.apache.fury.format.encoder.Encoder; -import org.apache.fury.format.encoder.Encoders; -import org.apache.fury.util.LoggerFactory; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.Serializable; @@ -37,6 +34,9 @@ import org.apache.avro.io.EncoderFactory; import org.apache.avro.reflect.ReflectDatumReader; import org.apache.avro.reflect.ReflectDatumWriter; +import org.apache.fury.format.encoder.Encoder; +import org.apache.fury.format.encoder.Encoders; +import org.apache.fury.util.LoggerFactory; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; import org.slf4j.Logger; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/StringSerializationSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/StringSerializationSuite.java index 3232aa4063..2f4b582f92 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/StringSerializationSuite.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/StringSerializationSuite.java @@ -19,13 +19,13 @@ package org.apache.fury.benchmark; +import java.io.ByteArrayOutputStream; import org.apache.fury.benchmark.state.FstState; import org.apache.fury.benchmark.state.FuryState; import org.apache.fury.benchmark.state.HessionState; import org.apache.fury.benchmark.state.JDKState; import org.apache.fury.benchmark.state.KryoState; import org.apache.fury.benchmark.state.ProtostuffState; -import java.io.ByteArrayOutputStream; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.CompilerControl; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/UserTypeDeserializeSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/UserTypeDeserializeSuite.java index 0b570fa1ef..8a70abbbd8 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/UserTypeDeserializeSuite.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/UserTypeDeserializeSuite.java @@ -19,6 +19,7 @@ package org.apache.fury.benchmark; +import java.io.IOException; import org.apache.fury.benchmark.state.FstState; import org.apache.fury.benchmark.state.FuryState; import org.apache.fury.benchmark.state.HessionState; @@ -26,7 +27,6 @@ import org.apache.fury.benchmark.state.JsonbState; import org.apache.fury.benchmark.state.KryoState; import org.apache.fury.benchmark.state.ProtostuffState; -import java.io.IOException; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/UserTypeSerializeSuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/UserTypeSerializeSuite.java index 3aeb18afec..a66c8aadc8 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/UserTypeSerializeSuite.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/UserTypeSerializeSuite.java @@ -19,6 +19,8 @@ package org.apache.fury.benchmark; +import java.io.ByteArrayOutputStream; +import java.io.IOException; import org.apache.fury.benchmark.state.FstState; import org.apache.fury.benchmark.state.FuryState; import org.apache.fury.benchmark.state.HessionState; @@ -26,8 +28,6 @@ import org.apache.fury.benchmark.state.JsonbState; import org.apache.fury.benchmark.state.KryoState; import org.apache.fury.benchmark.state.ProtostuffState; -import java.io.ByteArrayOutputStream; -import java.io.IOException; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/ZeroCopySuite.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/ZeroCopySuite.java index d6c3844948..d4dda95997 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/ZeroCopySuite.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/ZeroCopySuite.java @@ -30,6 +30,12 @@ import com.esotericsoftware.kryo.io.Output; import com.esotericsoftware.kryo.io.UnsafeMemoryInput; import com.esotericsoftware.kryo.io.UnsafeMemoryOutput; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.IntStream; import org.apache.fury.Fury; import org.apache.fury.benchmark.data.ComparableByteArray; import org.apache.fury.benchmark.data.SerializableByteBuffer; @@ -41,12 +47,6 @@ import org.apache.fury.test.bean.ArraysData; import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.IntStream; import org.nustaq.serialization.FSTConfiguration; import org.openjdk.jmh.Main; import org.openjdk.jmh.annotations.Benchmark; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Struct.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Struct.java index e97bd05c5d..8a0309e2de 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Struct.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/data/Struct.java @@ -19,14 +19,14 @@ package org.apache.fury.benchmark.data; -import org.apache.fury.util.ClassLoaderUtils; -import org.apache.fury.util.Preconditions; import java.io.Serializable; import java.io.StringReader; import java.lang.reflect.Field; import java.net.URL; import java.util.Objects; import java.util.Random; +import org.apache.fury.util.ClassLoaderUtils; +import org.apache.fury.util.Preconditions; import org.codehaus.janino.SimpleCompiler; public class Struct implements Serializable { diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/FstState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/FstState.java index 9c7af14fcf..5c4f7a4435 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/FstState.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/FstState.java @@ -19,6 +19,8 @@ package org.apache.fury.benchmark.state; +import java.nio.ByteBuffer; +import java.util.ArrayList; import org.apache.fury.benchmark.IntsSerializationSuite; import org.apache.fury.benchmark.LongStringSerializationSuite; import org.apache.fury.benchmark.LongsSerializationSuite; @@ -29,8 +31,6 @@ import org.apache.fury.benchmark.data.MediaContent; import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; -import java.nio.ByteBuffer; -import java.util.ArrayList; import org.nustaq.serialization.FSTConfiguration; import org.openjdk.jmh.annotations.CompilerControl; import org.openjdk.jmh.annotations.Fork; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/FuryState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/FuryState.java index 624a69b2cb..125e1df5da 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/FuryState.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/FuryState.java @@ -19,6 +19,8 @@ package org.apache.fury.benchmark.state; +import java.nio.ByteBuffer; +import java.util.ArrayList; import org.apache.fury.Fury; import org.apache.fury.benchmark.IntsSerializationSuite; import org.apache.fury.benchmark.LongStringSerializationSuite; @@ -39,8 +41,6 @@ import org.apache.fury.resolver.MetaContext; import org.apache.fury.util.LoggerFactory; import org.apache.fury.util.Preconditions; -import java.nio.ByteBuffer; -import java.util.ArrayList; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.CompilerControl; import org.openjdk.jmh.annotations.Fork; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/HessionState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/HessionState.java index 53fe390229..b648c763cd 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/HessionState.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/HessionState.java @@ -21,6 +21,9 @@ import com.caucho.hessian.io.Hessian2Input; import com.caucho.hessian.io.Hessian2Output; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; import org.apache.fury.benchmark.IntsSerializationSuite; import org.apache.fury.benchmark.LongStringSerializationSuite; import org.apache.fury.benchmark.LongsSerializationSuite; @@ -31,9 +34,6 @@ import org.apache.fury.benchmark.data.Struct; import org.apache.fury.util.LoggerFactory; import org.apache.fury.util.Preconditions; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.CompilerControl; import org.openjdk.jmh.annotations.Fork; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/JDKState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/JDKState.java index 0dbe28de2e..45c98f0d04 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/JDKState.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/JDKState.java @@ -19,6 +19,11 @@ package org.apache.fury.benchmark.state; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import org.apache.fury.benchmark.IntsSerializationSuite; import org.apache.fury.benchmark.LongStringSerializationSuite; import org.apache.fury.benchmark.LongsSerializationSuite; @@ -29,11 +34,6 @@ import org.apache.fury.benchmark.data.Struct; import org.apache.fury.io.ClassLoaderObjectInputStream; import org.apache.fury.util.Preconditions; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java index 5deae704a1..5565aa6a6c 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/JsonbState.java @@ -25,14 +25,6 @@ import com.alibaba.fastjson2.JSONReader; import com.alibaba.fastjson2.JSONWriter; import com.alibaba.fastjson2.reader.ObjectReaderProvider; -import org.apache.fury.Fury; -import org.apache.fury.benchmark.data.CustomJDKSerialization; -import org.apache.fury.benchmark.data.MediaContent; -import org.apache.fury.benchmark.data.Sample; -import org.apache.fury.benchmark.data.Struct; -import org.apache.fury.util.LoggerFactory; -import org.apache.fury.util.Platform; -import org.apache.fury.util.Preconditions; import java.io.Serializable; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; @@ -42,6 +34,14 @@ import java.util.Arrays; import java.util.List; import java.util.function.Function; +import org.apache.fury.Fury; +import org.apache.fury.benchmark.data.CustomJDKSerialization; +import org.apache.fury.benchmark.data.MediaContent; +import org.apache.fury.benchmark.data.Sample; +import org.apache.fury.benchmark.data.Struct; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; import org.openjdk.jmh.annotations.CompilerControl; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Level; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/KryoState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/KryoState.java index 5954fb2102..c1e3e24db3 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/KryoState.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/KryoState.java @@ -25,6 +25,7 @@ import com.esotericsoftware.kryo.io.UnsafeMemoryInput; import com.esotericsoftware.kryo.io.UnsafeMemoryOutput; import com.esotericsoftware.kryo.serializers.CompatibleFieldSerializer; +import java.util.ArrayList; import org.apache.fury.benchmark.IntsSerializationSuite; import org.apache.fury.benchmark.LongStringSerializationSuite; import org.apache.fury.benchmark.LongsSerializationSuite; @@ -34,7 +35,6 @@ import org.apache.fury.benchmark.data.Media; import org.apache.fury.benchmark.data.MediaContent; import org.apache.fury.util.Preconditions; -import java.util.ArrayList; import org.openjdk.jmh.annotations.CompilerControl; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Level; diff --git a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/ProtostuffState.java b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/ProtostuffState.java index cd0f0b3e10..6c0cd31ed5 100644 --- a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/ProtostuffState.java +++ b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/state/ProtostuffState.java @@ -19,6 +19,10 @@ package org.apache.fury.benchmark.state; +import io.protostuff.LinkedBuffer; +import io.protostuff.ProtostuffIOUtil; +import io.protostuff.Schema; +import io.protostuff.runtime.RuntimeSchema; import org.apache.fury.benchmark.IntsSerializationSuite; import org.apache.fury.benchmark.LongStringSerializationSuite; import org.apache.fury.benchmark.LongsSerializationSuite; @@ -28,10 +32,6 @@ import org.apache.fury.benchmark.data.Sample; import org.apache.fury.benchmark.data.Struct; import org.apache.fury.util.Preconditions; -import io.protostuff.LinkedBuffer; -import io.protostuff.ProtostuffIOUtil; -import io.protostuff.Schema; -import io.protostuff.runtime.RuntimeSchema; import org.openjdk.jmh.annotations.CompilerControl; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Level; diff --git a/java/fury-core/src/main/java/org/apache/fury/Fury.java b/java/fury-core/src/main/java/org/apache/fury/Fury.java index a3242b2203..60ca0da643 100644 --- a/java/fury-core/src/main/java/org/apache/fury/Fury.java +++ b/java/fury-core/src/main/java/org/apache/fury/Fury.java @@ -19,6 +19,18 @@ package org.apache.fury; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.ByteOrder; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Function; +import javax.annotation.concurrent.NotThreadSafe; import org.apache.fury.builder.JITContext; import org.apache.fury.config.CompatibleMode; import org.apache.fury.config.Config; @@ -49,18 +61,6 @@ import org.apache.fury.util.LoggerFactory; import org.apache.fury.util.Preconditions; import org.apache.fury.util.StringUtils; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.ByteOrder; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.function.Consumer; -import java.util.function.Function; -import javax.annotation.concurrent.NotThreadSafe; import org.slf4j.Logger; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/ThreadLocalFury.java b/java/fury-core/src/main/java/org/apache/fury/ThreadLocalFury.java index 246373dca6..daf248f701 100644 --- a/java/fury-core/src/main/java/org/apache/fury/ThreadLocalFury.java +++ b/java/fury-core/src/main/java/org/apache/fury/ThreadLocalFury.java @@ -19,14 +19,14 @@ package org.apache.fury; +import java.nio.ByteBuffer; +import java.util.function.Function; +import javax.annotation.concurrent.ThreadSafe; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; import org.apache.fury.resolver.ClassResolver; import org.apache.fury.util.LoaderBinding; import org.apache.fury.util.LoaderBinding.StagingType; -import java.nio.ByteBuffer; -import java.util.function.Function; -import javax.annotation.concurrent.ThreadSafe; /** * A thread safe serialization entrance for {@link Fury} by binding a {@link Fury} for every thread. diff --git a/java/fury-core/src/main/java/org/apache/fury/ThreadSafeFury.java b/java/fury-core/src/main/java/org/apache/fury/ThreadSafeFury.java index 2e2d7acca5..fd4e0ddad2 100644 --- a/java/fury-core/src/main/java/org/apache/fury/ThreadSafeFury.java +++ b/java/fury-core/src/main/java/org/apache/fury/ThreadSafeFury.java @@ -19,10 +19,10 @@ package org.apache.fury; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.util.LoaderBinding; import java.nio.ByteBuffer; import java.util.function.Function; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.LoaderBinding; /** * Thread safe serializer interface. {@link Fury} is not thread-safe, the implementation of this diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/AccessorHelper.java b/java/fury-core/src/main/java/org/apache/fury/builder/AccessorHelper.java index 2fab126658..b55b07dd67 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/AccessorHelper.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/AccessorHelper.java @@ -21,6 +21,12 @@ import static org.apache.fury.codegen.CodeGenerator.sourcePkgLevelAccessible; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Collection; +import java.util.Map; +import java.util.WeakHashMap; import org.apache.fury.codegen.CodeGenerator; import org.apache.fury.codegen.CodegenContext; import org.apache.fury.codegen.CompileUnit; @@ -32,12 +38,6 @@ import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.StringUtils; import org.apache.fury.util.record.RecordUtils; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.Collection; -import java.util.Map; -import java.util.WeakHashMap; import org.slf4j.Logger; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java index 51925adff2..dc4765250d 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/BaseObjectCodecBuilder.java @@ -51,6 +51,17 @@ import com.google.common.collect.ImmutableSet; import com.google.common.reflect.TypeToken; +import java.lang.reflect.Modifier; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.StringJoiner; +import java.util.function.Function; +import java.util.function.Supplier; import org.apache.fury.Fury; import org.apache.fury.codegen.CodeGenerator; import org.apache.fury.codegen.CodegenContext; @@ -89,17 +100,6 @@ import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.StringUtils; -import java.lang.reflect.Modifier; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.StringJoiner; -import java.util.function.Function; -import java.util.function.Supplier; /** * Generate sequential read/write code for java serialization to speed up performance. It also diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/CodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/CodecBuilder.java index 7d3790c6ed..94e65f742e 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/CodecBuilder.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/CodecBuilder.java @@ -35,6 +35,14 @@ import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; +import java.lang.invoke.MethodHandle; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Supplier; import org.apache.fury.Fury; import org.apache.fury.codegen.CodegenContext; import org.apache.fury.codegen.Expression; @@ -59,14 +67,6 @@ import org.apache.fury.util.function.Functions; import org.apache.fury.util.record.RecordComponent; import org.apache.fury.util.record.RecordUtils; -import java.lang.invoke.MethodHandle; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Supplier; import sun.misc.Unsafe; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/CodecUtils.java b/java/fury-core/src/main/java/org/apache/fury/builder/CodecUtils.java index 9eceb4415e..6d74a0122b 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/CodecUtils.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/CodecUtils.java @@ -20,6 +20,7 @@ package org.apache.fury.builder; import com.google.common.reflect.TypeToken; +import java.util.Collections; import org.apache.fury.Fury; import org.apache.fury.codegen.CodeGenerator; import org.apache.fury.codegen.CompileUnit; @@ -27,7 +28,6 @@ import org.apache.fury.serializer.Serializer; import org.apache.fury.type.ClassDef; import org.apache.fury.util.Preconditions; -import java.util.Collections; /** * Codec util to create and load jit serializer class. @@ -36,7 +36,8 @@ */ public class CodecUtils { - // TODO(chaokunyang) how to uninstall org.apache.fury.codegen/builder classes for graalvm build time + // TODO(chaokunyang) how to uninstall org.apache.fury.codegen/builder classes for graalvm build + // time // maybe use a temporal URLClassLoader public static Class> loadOrGenObjectCodecClass( Class cls, Fury fury) { diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java index 33bab26d8f..3c0dfd102e 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/CompatibleCodecBuilder.java @@ -34,6 +34,16 @@ import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import org.apache.fury.Fury; import org.apache.fury.builder.Generated.GeneratedCompatibleSerializer; import org.apache.fury.codegen.CodegenContext; @@ -70,16 +80,6 @@ import org.apache.fury.util.Preconditions; import org.apache.fury.util.function.SerializableSupplier; import org.apache.fury.util.record.RecordUtils; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * A jit-version of {@link CompatibleSerializer}. diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/Generated.java b/java/fury-core/src/main/java/org/apache/fury/builder/Generated.java index c129dc5d3e..92ae59ca2a 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/Generated.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/Generated.java @@ -19,16 +19,16 @@ package org.apache.fury.builder; +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.serializer.CompatibleSerializerBase; import org.apache.fury.serializer.Serializer; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; -import java.lang.reflect.Field; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; /** * Since janino doesn't support generics, we use {@link Object} to represent object type rather diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/JITContext.java b/java/fury-core/src/main/java/org/apache/fury/builder/JITContext.java index d5fb54a850..fecda795da 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/JITContext.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/JITContext.java @@ -23,12 +23,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; -import org.apache.fury.Fury; -import org.apache.fury.annotation.Internal; -import org.apache.fury.codegen.CodeGenerator; -import org.apache.fury.config.Config; -import org.apache.fury.util.Platform; -import org.apache.fury.util.Preconditions; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -36,6 +30,12 @@ import java.util.concurrent.Callable; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Function; +import org.apache.fury.Fury; +import org.apache.fury.annotation.Internal; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.config.Config; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; /** * A context for managing jit serialization code generation in async multithreaded environment. diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/MetaSharedCodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/MetaSharedCodecBuilder.java index b25ab360db..8c68f78e03 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/MetaSharedCodecBuilder.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/MetaSharedCodecBuilder.java @@ -22,6 +22,8 @@ import static org.apache.fury.builder.Generated.GeneratedMetaSharedSerializer.SERIALIZER_FIELD_NAME; import com.google.common.reflect.TypeToken; +import java.util.Collection; +import java.util.SortedMap; import org.apache.fury.Fury; import org.apache.fury.builder.Generated.GeneratedMetaSharedSerializer; import org.apache.fury.codegen.CodeGenerator; @@ -43,8 +45,6 @@ import org.apache.fury.util.Utils; import org.apache.fury.util.record.RecordComponent; import org.apache.fury.util.record.RecordUtils; -import java.util.Collection; -import java.util.SortedMap; /** * A meta-shared compatible deserializer builder based on {@link ClassDef}. This builder will diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java b/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java index a6fa4648ef..76e28c9d8d 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecBuilder.java @@ -35,6 +35,14 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.reflect.TypeToken; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.SortedMap; +import java.util.TreeMap; import org.apache.fury.Fury; import org.apache.fury.codegen.Code; import org.apache.fury.codegen.CodegenContext; @@ -56,14 +64,6 @@ import org.apache.fury.util.Preconditions; import org.apache.fury.util.function.SerializableSupplier; import org.apache.fury.util.record.RecordUtils; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.SortedMap; -import java.util.TreeMap; /** * Generate sequential read/write code for java serialization to speed up performance. It also diff --git a/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecOptimizer.java b/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecOptimizer.java index f8114c0e34..5b47567364 100644 --- a/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecOptimizer.java +++ b/java/fury-core/src/main/java/org/apache/fury/builder/ObjectCodecOptimizer.java @@ -19,6 +19,10 @@ package org.apache.fury.builder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; import org.apache.fury.annotation.Internal; import org.apache.fury.codegen.CodegenContext; import org.apache.fury.codegen.Expression; @@ -27,10 +31,6 @@ import org.apache.fury.type.Descriptor; import org.apache.fury.type.DescriptorGrouper; import org.apache.fury.util.function.SerializableSupplier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Set; /** * We took stats for some fields with reference enabled, and split methods based on those metrics. diff --git a/java/fury-core/src/main/java/org/apache/fury/codegen/CodeGenerator.java b/java/fury-core/src/main/java/org/apache/fury/codegen/CodeGenerator.java index 0091b2e813..fda66d853d 100644 --- a/java/fury-core/src/main/java/org/apache/fury/codegen/CodeGenerator.java +++ b/java/fury-core/src/main/java/org/apache/fury/codegen/CodeGenerator.java @@ -23,17 +23,6 @@ import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import org.apache.fury.builder.AccessorHelper; -import org.apache.fury.builder.Generated; -import org.apache.fury.collection.Collections; -import org.apache.fury.collection.MultiKeyWeakMap; -import org.apache.fury.util.ClassLoaderUtils; -import org.apache.fury.util.ClassLoaderUtils.ByteArrayClassLoader; -import org.apache.fury.util.GraalvmSupport; -import org.apache.fury.util.LoggerFactory; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.ReflectionUtils; -import org.apache.fury.util.StringUtils; import java.lang.ref.SoftReference; import java.util.ArrayList; import java.util.Arrays; @@ -46,6 +35,17 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import org.apache.fury.builder.AccessorHelper; +import org.apache.fury.builder.Generated; +import org.apache.fury.collection.Collections; +import org.apache.fury.collection.MultiKeyWeakMap; +import org.apache.fury.util.ClassLoaderUtils; +import org.apache.fury.util.ClassLoaderUtils.ByteArrayClassLoader; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; import org.slf4j.Logger; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/codegen/CodegenContext.java b/java/fury-core/src/main/java/org/apache/fury/codegen/CodegenContext.java index 37a3487e77..2af5fbed6d 100644 --- a/java/fury-core/src/main/java/org/apache/fury/codegen/CodegenContext.java +++ b/java/fury-core/src/main/java/org/apache/fury/codegen/CodegenContext.java @@ -27,13 +27,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.reflect.TypeToken; -import org.apache.fury.codegen.Expression.BaseInvoke; -import org.apache.fury.codegen.Expression.Reference; -import org.apache.fury.collection.Collections; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.ReflectionUtils; -import org.apache.fury.util.StringUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -44,6 +37,13 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import org.apache.fury.codegen.Expression.BaseInvoke; +import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.collection.Collections; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; /** * CodegenContext can be an any scope in a class, such as class, method, local and so on. diff --git a/java/fury-core/src/main/java/org/apache/fury/codegen/CompileUnit.java b/java/fury-core/src/main/java/org/apache/fury/codegen/CompileUnit.java index 40dddcf888..b32063d184 100644 --- a/java/fury-core/src/main/java/org/apache/fury/codegen/CompileUnit.java +++ b/java/fury-core/src/main/java/org/apache/fury/codegen/CompileUnit.java @@ -19,10 +19,10 @@ package org.apache.fury.codegen; +import java.util.function.Supplier; import org.apache.fury.util.LoggerFactory; import org.apache.fury.util.Preconditions; import org.apache.fury.util.StringUtils; -import java.util.function.Supplier; import org.slf4j.Logger; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/codegen/Expression.java b/java/fury-core/src/main/java/org/apache/fury/codegen/Expression.java index 2357aba863..b04b8c3bb8 100644 --- a/java/fury-core/src/main/java/org/apache/fury/codegen/Expression.java +++ b/java/fury-core/src/main/java/org/apache/fury/codegen/Expression.java @@ -48,6 +48,14 @@ import static org.apache.fury.util.Preconditions.checkArgument; import com.google.common.reflect.TypeToken; +import java.lang.reflect.Array; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.apache.fury.type.TypeUtils; import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; @@ -58,14 +66,6 @@ import org.apache.fury.util.function.SerializableFunction; import org.apache.fury.util.function.SerializableSupplier; import org.apache.fury.util.function.SerializableTriFunction; -import java.lang.reflect.Array; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; /** * An expression represents a piece of code evaluation logic which can be generated to valid java diff --git a/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionOptimizer.java b/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionOptimizer.java index 3f449c681f..1dbde2586e 100644 --- a/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionOptimizer.java +++ b/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionOptimizer.java @@ -22,9 +22,6 @@ import static org.apache.fury.type.TypeUtils.PRIMITIVE_VOID_TYPE; import static org.apache.fury.type.TypeUtils.getRawType; -import org.apache.fury.codegen.Expression.Reference; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.function.SerializableSupplier; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedHashMap; @@ -32,6 +29,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.function.SerializableSupplier; /** * Optimizer to generate expression logic in a new method and return an {@link diff --git a/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionUtils.java b/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionUtils.java index 31f182eccb..9fe9e34fee 100644 --- a/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionUtils.java +++ b/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionUtils.java @@ -29,16 +29,16 @@ import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import org.apache.fury.codegen.Expression.Cast; -import org.apache.fury.codegen.Expression.Null; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.StringUtils; -import org.apache.fury.util.function.Functions; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.apache.fury.codegen.Expression.Cast; +import org.apache.fury.codegen.Expression.Null; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.StringUtils; +import org.apache.fury.util.function.Functions; /** * Expression utils to create expression and code in a more convenient way. diff --git a/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionVisitor.java b/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionVisitor.java index 0ba0a703b5..7371013b3f 100644 --- a/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionVisitor.java +++ b/java/fury-core/src/main/java/org/apache/fury/codegen/ExpressionVisitor.java @@ -20,12 +20,6 @@ package org.apache.fury.codegen; import com.google.common.reflect.TypeToken; -import org.apache.fury.codegen.Expression.ListExpression; -import org.apache.fury.codegen.Expression.Reference; -import org.apache.fury.type.TypeUtils; -import org.apache.fury.util.Platform; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.ReflectionUtils; import java.io.Serializable; import java.lang.invoke.SerializedLambda; import java.lang.reflect.Field; @@ -38,6 +32,12 @@ import java.util.Objects; import java.util.function.Consumer; import java.util.function.Function; +import org.apache.fury.codegen.Expression.ListExpression; +import org.apache.fury.codegen.Expression.Reference; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; /** * Traverse expression tree with actions. The provided action will be executed at every expression diff --git a/java/fury-core/src/main/java/org/apache/fury/codegen/JaninoUtils.java b/java/fury-core/src/main/java/org/apache/fury/codegen/JaninoUtils.java index fa23fc05b9..40196cd237 100644 --- a/java/fury-core/src/main/java/org/apache/fury/codegen/JaninoUtils.java +++ b/java/fury-core/src/main/java/org/apache/fury/codegen/JaninoUtils.java @@ -19,10 +19,6 @@ package org.apache.fury.codegen; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.util.LoggerFactory; -import org.apache.fury.util.ReflectionUtils; -import org.apache.fury.util.StringUtils; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -38,6 +34,10 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.StringUtils; import org.codehaus.commons.compiler.util.reflect.ByteArrayClassLoader; import org.codehaus.commons.compiler.util.resource.MapResourceCreator; import org.codehaus.commons.compiler.util.resource.MapResourceFinder; diff --git a/java/fury-core/src/main/java/org/apache/fury/collection/FuryObjectMap.java b/java/fury-core/src/main/java/org/apache/fury/collection/FuryObjectMap.java index 215c7dba40..bf0e65d9cc 100644 --- a/java/fury-core/src/main/java/org/apache/fury/collection/FuryObjectMap.java +++ b/java/fury-core/src/main/java/org/apache/fury/collection/FuryObjectMap.java @@ -19,11 +19,11 @@ package org.apache.fury.collection; -import org.apache.fury.util.Preconditions; import java.util.Iterator; import java.util.Map; import java.util.Objects; import java.util.function.BiConsumer; +import org.apache.fury.util.Preconditions; // Derived from // https://github.com/EsotericSoftware/kryo/blob/135df69526615bb3f6b34846e58ba3fec3b631c3/src/com/esotericsoftware/kryo/util/ObjectMap.java. diff --git a/java/fury-core/src/main/java/org/apache/fury/collection/LazyMap.java b/java/fury-core/src/main/java/org/apache/fury/collection/LazyMap.java index f2f259ddbe..e4bcbb5b58 100644 --- a/java/fury-core/src/main/java/org/apache/fury/collection/LazyMap.java +++ b/java/fury-core/src/main/java/org/apache/fury/collection/LazyMap.java @@ -20,12 +20,12 @@ package org.apache.fury.collection; import com.google.common.collect.ForwardingMap; -import org.apache.fury.util.Preconditions; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.fury.util.Preconditions; /** * A map which populate lazily until the first map query happens to reduce map#put cost. diff --git a/java/fury-core/src/main/java/org/apache/fury/collection/MultiKeyWeakMap.java b/java/fury-core/src/main/java/org/apache/fury/collection/MultiKeyWeakMap.java index f08396f119..ef8a42b849 100644 --- a/java/fury-core/src/main/java/org/apache/fury/collection/MultiKeyWeakMap.java +++ b/java/fury-core/src/main/java/org/apache/fury/collection/MultiKeyWeakMap.java @@ -21,7 +21,6 @@ import com.google.common.base.FinalizableReferenceQueue; import com.google.common.base.FinalizableWeakReference; -import org.apache.fury.util.GraalvmSupport; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -31,6 +30,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.apache.fury.util.GraalvmSupport; /** * Hash table based implementation with weak keys. An entry in a MultiKeyWeakMap will automatically diff --git a/java/fury-core/src/main/java/org/apache/fury/config/Config.java b/java/fury-core/src/main/java/org/apache/fury/config/Config.java index 1216127024..1f4c35e999 100644 --- a/java/fury-core/src/main/java/org/apache/fury/config/Config.java +++ b/java/fury-core/src/main/java/org/apache/fury/config/Config.java @@ -19,15 +19,15 @@ package org.apache.fury.config; -import org.apache.fury.Fury; -import org.apache.fury.serializer.Serializer; -import org.apache.fury.serializer.TimeSerializers; -import org.apache.fury.util.Preconditions; import java.io.Serializable; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.fury.Fury; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.TimeSerializers; +import org.apache.fury.util.Preconditions; /** * Config for fury, all {@link Fury} related config can be found here. diff --git a/java/fury-core/src/main/java/org/apache/fury/config/FuryBuilder.java b/java/fury-core/src/main/java/org/apache/fury/config/FuryBuilder.java index a5282cde76..ef66c3ace5 100644 --- a/java/fury-core/src/main/java/org/apache/fury/config/FuryBuilder.java +++ b/java/fury-core/src/main/java/org/apache/fury/config/FuryBuilder.java @@ -19,6 +19,8 @@ package org.apache.fury.config; +import java.util.Objects; +import java.util.concurrent.TimeUnit; import org.apache.fury.Fury; import org.apache.fury.ThreadLocalFury; import org.apache.fury.ThreadSafeFury; @@ -32,8 +34,6 @@ import org.apache.fury.util.GraalvmSupport; import org.apache.fury.util.LoggerFactory; import org.apache.fury.util.Platform; -import java.util.Objects; -import java.util.concurrent.TimeUnit; import org.slf4j.Logger; /** @@ -161,8 +161,8 @@ public FuryBuilder withStringCompressed(boolean stringCompressed) { * the class meta data, if classloader can be updated, there may be class meta collision if * different classloaders have classes with same name. * - *

If you want to change classloader, please use {@link org.apache.fury.util.LoaderBinding} or {@link - * ThreadSafeFury} to setup mapping between classloaders and fury instances. + *

If you want to change classloader, please use {@link org.apache.fury.util.LoaderBinding} or + * {@link ThreadSafeFury} to setup mapping between classloaders and fury instances. */ public FuryBuilder withClassLoader(ClassLoader classLoader) { this.classLoader = classLoader; @@ -212,8 +212,8 @@ public FuryBuilder registerGuavaTypes(boolean register) { * attack if the classes `constructor`/`equals`/`hashCode` method contain malicious code. Do not * disable class registration if you can't ensure your environment are *indeed secure*. We are not * responsible for security risks if you disable this option. If you disable this option, you can - * configure {@link org.apache.fury.resolver.ClassChecker} by {@link ClassResolver#setClassChecker} to - * control which classes are allowed being serialized. + * configure {@link org.apache.fury.resolver.ClassChecker} by {@link + * ClassResolver#setClassChecker} to control which classes are allowed being serialized. */ public FuryBuilder requireClassRegistration(boolean requireClassRegistration) { this.requireClassRegistration = requireClassRegistration; diff --git a/java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java index d1a4875d7d..6ede7464a7 100644 --- a/java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java +++ b/java/fury-core/src/main/java/org/apache/fury/io/FuryInputStream.java @@ -19,10 +19,10 @@ package org.apache.fury.io; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.util.Preconditions; import java.io.IOException; import java.io.InputStream; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.Preconditions; /** * InputStream based on {@link MemoryBuffer}. diff --git a/java/fury-core/src/main/java/org/apache/fury/io/FuryObjectInput.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryObjectInput.java index c9a0421491..62369a5943 100644 --- a/java/fury-core/src/main/java/org/apache/fury/io/FuryObjectInput.java +++ b/java/fury-core/src/main/java/org/apache/fury/io/FuryObjectInput.java @@ -19,13 +19,13 @@ package org.apache.fury.io; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInput; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.serializer.StringSerializer; import org.apache.fury.util.Preconditions; -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInput; /** * ObjectInput based on {@link Fury} and {@link MemoryBuffer}. diff --git a/java/fury-core/src/main/java/org/apache/fury/io/FuryObjectOutput.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryObjectOutput.java index 90a8c4537a..b6dd840f1e 100644 --- a/java/fury-core/src/main/java/org/apache/fury/io/FuryObjectOutput.java +++ b/java/fury-core/src/main/java/org/apache/fury/io/FuryObjectOutput.java @@ -19,14 +19,14 @@ package org.apache.fury.io; -import org.apache.fury.Fury; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.serializer.StringSerializer; -import org.apache.fury.util.Preconditions; import java.io.DataOutputStream; import java.io.IOException; import java.io.ObjectOutput; import java.io.OutputStream; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.StringSerializer; +import org.apache.fury.util.Preconditions; /** * ObjectOutput based on {@link Fury} and {@link MemoryBuffer}. diff --git a/java/fury-core/src/main/java/org/apache/fury/io/FuryOutputStream.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryOutputStream.java index b54ab2d305..6a1fbf006b 100644 --- a/java/fury-core/src/main/java/org/apache/fury/io/FuryOutputStream.java +++ b/java/fury-core/src/main/java/org/apache/fury/io/FuryOutputStream.java @@ -19,9 +19,9 @@ package org.apache.fury.io; -import org.apache.fury.memory.MemoryBuffer; import java.io.OutputStream; import java.nio.ByteBuffer; +import org.apache.fury.memory.MemoryBuffer; /** * OutputStream based on {@link MemoryBuffer}. diff --git a/java/fury-core/src/main/java/org/apache/fury/io/FuryReadableByteChannel.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryReadableByteChannel.java index 65147abda1..f923d6f0f4 100644 --- a/java/fury-core/src/main/java/org/apache/fury/io/FuryReadableByteChannel.java +++ b/java/fury-core/src/main/java/org/apache/fury/io/FuryReadableByteChannel.java @@ -19,9 +19,9 @@ package org.apache.fury.io; -import org.apache.fury.memory.MemoryBuffer; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; +import org.apache.fury.memory.MemoryBuffer; /** * {@link ReadableByteChannel} based on fury {@link MemoryBuffer}. diff --git a/java/fury-core/src/main/java/org/apache/fury/io/FuryWritableByteChannel.java b/java/fury-core/src/main/java/org/apache/fury/io/FuryWritableByteChannel.java index 01a0236439..26246d8a39 100644 --- a/java/fury-core/src/main/java/org/apache/fury/io/FuryWritableByteChannel.java +++ b/java/fury-core/src/main/java/org/apache/fury/io/FuryWritableByteChannel.java @@ -19,9 +19,9 @@ package org.apache.fury.io; -import org.apache.fury.memory.MemoryBuffer; import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; +import org.apache.fury.memory.MemoryBuffer; /** * {@link WritableByteChannel} based on fury {@link MemoryBuffer}. diff --git a/java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java b/java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java index 726e17b527..a48f6a5385 100644 --- a/java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java +++ b/java/fury-core/src/main/java/org/apache/fury/memory/MemoryBuffer.java @@ -20,15 +20,15 @@ import static org.apache.fury.util.Preconditions.checkArgument; -import org.apache.fury.annotation.CodegenInvoke; -import org.apache.fury.util.Platform; -import org.apache.fury.util.Preconditions; import java.nio.BufferOverflowException; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.ReadOnlyBufferException; import java.util.Arrays; +import org.apache.fury.annotation.CodegenInvoke; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; /** * A class for operations on memory managed by Fury. The buffer may be backed by heap memory (byte diff --git a/java/fury-core/src/main/java/org/apache/fury/memory/MemoryUtils.java b/java/fury-core/src/main/java/org/apache/fury/memory/MemoryUtils.java index 0e298edd9c..1f165e9a00 100644 --- a/java/fury-core/src/main/java/org/apache/fury/memory/MemoryUtils.java +++ b/java/fury-core/src/main/java/org/apache/fury/memory/MemoryUtils.java @@ -19,11 +19,11 @@ package org.apache.fury.memory; -import org.apache.fury.util.Platform; -import org.apache.fury.util.Preconditions; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; /** * Memory utils for fury. diff --git a/java/fury-core/src/main/java/org/apache/fury/pool/ClassLoaderFuryPooled.java b/java/fury-core/src/main/java/org/apache/fury/pool/ClassLoaderFuryPooled.java index bdbb9b09f6..9483ac7cb9 100644 --- a/java/fury-core/src/main/java/org/apache/fury/pool/ClassLoaderFuryPooled.java +++ b/java/fury-core/src/main/java/org/apache/fury/pool/ClassLoaderFuryPooled.java @@ -19,8 +19,6 @@ package org.apache.fury.pool; -import org.apache.fury.Fury; -import org.apache.fury.util.LoggerFactory; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicInteger; @@ -28,6 +26,8 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Function; +import org.apache.fury.Fury; +import org.apache.fury.util.LoggerFactory; import org.slf4j.Logger; /** A thread-safe object pool of {@link Fury}. */ diff --git a/java/fury-core/src/main/java/org/apache/fury/pool/FuryPooledObjectFactory.java b/java/fury-core/src/main/java/org/apache/fury/pool/FuryPooledObjectFactory.java index 015dc1e7a1..095a76ec05 100644 --- a/java/fury-core/src/main/java/org/apache/fury/pool/FuryPooledObjectFactory.java +++ b/java/fury-core/src/main/java/org/apache/fury/pool/FuryPooledObjectFactory.java @@ -21,11 +21,11 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; import org.apache.fury.Fury; import org.apache.fury.util.LoaderBinding; import org.apache.fury.util.LoggerFactory; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; import org.slf4j.Logger; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/pool/ThreadPoolFury.java b/java/fury-core/src/main/java/org/apache/fury/pool/ThreadPoolFury.java index 9a96085b23..4c49c2d8c1 100644 --- a/java/fury-core/src/main/java/org/apache/fury/pool/ThreadPoolFury.java +++ b/java/fury-core/src/main/java/org/apache/fury/pool/ThreadPoolFury.java @@ -19,15 +19,15 @@ package org.apache.fury.pool; +import java.nio.ByteBuffer; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; +import javax.annotation.concurrent.ThreadSafe; import org.apache.fury.Fury; import org.apache.fury.ThreadSafeFury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; import org.apache.fury.util.LoaderBinding; -import java.nio.ByteBuffer; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; -import javax.annotation.concurrent.ThreadSafe; @ThreadSafe public class ThreadPoolFury implements ThreadSafeFury { diff --git a/java/fury-core/src/main/java/org/apache/fury/resolver/AllowListChecker.java b/java/fury-core/src/main/java/org/apache/fury/resolver/AllowListChecker.java index 68ee540c04..c3146a30ae 100644 --- a/java/fury-core/src/main/java/org/apache/fury/resolver/AllowListChecker.java +++ b/java/fury-core/src/main/java/org/apache/fury/resolver/AllowListChecker.java @@ -19,11 +19,6 @@ package org.apache.fury.resolver; -import org.apache.fury.Fury; -import org.apache.fury.exception.InsecureException; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.serializer.Serializer; -import org.apache.fury.util.LoggerFactory; import java.util.Collection; import java.util.HashSet; import java.util.Set; @@ -31,6 +26,11 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import javax.annotation.concurrent.ThreadSafe; +import org.apache.fury.Fury; +import org.apache.fury.exception.InsecureException; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.util.LoggerFactory; import org.slf4j.Logger; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java b/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java index c407fc292c..b61242e636 100644 --- a/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java +++ b/java/fury-core/src/main/java/org/apache/fury/resolver/ClassResolver.java @@ -30,6 +30,54 @@ import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; +import java.io.Externalizable; +import java.io.IOException; +import java.io.Serializable; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.nio.ByteBuffer; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.sql.Timestamp; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.OptionalInt; +import java.util.Set; +import java.util.SortedMap; +import java.util.TimeZone; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Supplier; +import java.util.stream.Collectors; import org.apache.fury.Fury; import org.apache.fury.annotation.CodegenInvoke; import org.apache.fury.annotation.Internal; @@ -96,54 +144,6 @@ import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.StringUtils; import org.apache.fury.util.function.Functions; -import java.io.Externalizable; -import java.io.IOException; -import java.io.Serializable; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.lang.reflect.Type; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.nio.ByteBuffer; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.sql.Timestamp; -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.OptionalInt; -import java.util.Set; -import java.util.SortedMap; -import java.util.TimeZone; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Supplier; -import java.util.stream.Collectors; import org.slf4j.Logger; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringBytes.java b/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringBytes.java index 53862042b1..c62e827d7d 100644 --- a/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringBytes.java +++ b/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringBytes.java @@ -19,11 +19,11 @@ package org.apache.fury.resolver; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; import org.apache.fury.annotation.Internal; import org.apache.fury.util.MurmurHash3; import org.apache.fury.util.Preconditions; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; @Internal public final class EnumStringBytes { diff --git a/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringResolver.java b/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringResolver.java index ee409dea98..df02f7cb30 100644 --- a/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringResolver.java +++ b/java/fury-core/src/main/java/org/apache/fury/resolver/EnumStringResolver.java @@ -19,10 +19,10 @@ package org.apache.fury.resolver; +import java.nio.charset.StandardCharsets; import org.apache.fury.collection.LongMap; import org.apache.fury.collection.ObjectMap; import org.apache.fury.memory.MemoryBuffer; -import java.nio.charset.StandardCharsets; /** * A resolver for limited string value writing. Currently, we only support classname dynamic diff --git a/java/fury-core/src/main/java/org/apache/fury/resolver/FieldResolver.java b/java/fury-core/src/main/java/org/apache/fury/resolver/FieldResolver.java index fd132d687b..88dcb162f6 100644 --- a/java/fury-core/src/main/java/org/apache/fury/resolver/FieldResolver.java +++ b/java/fury-core/src/main/java/org/apache/fury/resolver/FieldResolver.java @@ -28,19 +28,6 @@ import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import org.apache.fury.Fury; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.exception.ClassNotCompatibleException; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.serializer.PrimitiveSerializers; -import org.apache.fury.serializer.collection.CollectionSerializer; -import org.apache.fury.serializer.collection.MapSerializer; -import org.apache.fury.type.Descriptor; -import org.apache.fury.type.TypeUtils; -import org.apache.fury.util.FieldAccessor; -import org.apache.fury.util.MurmurHash3; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.ReflectionUtils; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.nio.charset.StandardCharsets; @@ -57,6 +44,19 @@ import java.util.SortedSet; import java.util.TreeSet; import java.util.stream.Collectors; +import org.apache.fury.Fury; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.exception.ClassNotCompatibleException; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.PrimitiveSerializers; +import org.apache.fury.serializer.collection.CollectionSerializer; +import org.apache.fury.serializer.collection.MapSerializer; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.FieldAccessor; +import org.apache.fury.util.MurmurHash3; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; /** * A class field resolver for class compatibility. diff --git a/java/fury-core/src/main/java/org/apache/fury/resolver/MapRefResolver.java b/java/fury-core/src/main/java/org/apache/fury/resolver/MapRefResolver.java index ba7aaf458d..c2a0d9ed2e 100644 --- a/java/fury-core/src/main/java/org/apache/fury/resolver/MapRefResolver.java +++ b/java/fury-core/src/main/java/org/apache/fury/resolver/MapRefResolver.java @@ -19,6 +19,11 @@ package org.apache.fury.resolver; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import org.apache.fury.Fury; import org.apache.fury.collection.IdentityObjectIntMap; import org.apache.fury.collection.IntArray; @@ -26,11 +31,6 @@ import org.apache.fury.collection.ObjectArray; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.util.Preconditions; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; /** * Resolving reference by tracking reference by an IdentityMap. diff --git a/java/fury-core/src/main/java/org/apache/fury/resolver/MetaContext.java b/java/fury-core/src/main/java/org/apache/fury/resolver/MetaContext.java index 98a3a27a35..692d760efd 100644 --- a/java/fury-core/src/main/java/org/apache/fury/resolver/MetaContext.java +++ b/java/fury-core/src/main/java/org/apache/fury/resolver/MetaContext.java @@ -19,11 +19,11 @@ package org.apache.fury.resolver; +import java.util.ArrayList; +import java.util.List; import org.apache.fury.collection.IdentityObjectIntMap; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.type.ClassDef; -import java.util.ArrayList; -import java.util.List; /** * Context for sharing class meta across multiple serialization. Class name, field name and field diff --git a/java/fury-core/src/main/java/org/apache/fury/resolver/SerializationContext.java b/java/fury-core/src/main/java/org/apache/fury/resolver/SerializationContext.java index 97483da345..ed5aead62a 100644 --- a/java/fury-core/src/main/java/org/apache/fury/resolver/SerializationContext.java +++ b/java/fury-core/src/main/java/org/apache/fury/resolver/SerializationContext.java @@ -19,8 +19,8 @@ package org.apache.fury.resolver; -import org.apache.fury.config.FuryBuilder; import java.util.IdentityHashMap; +import org.apache.fury.config.FuryBuilder; /** * A context is used to add some context-related information, so that the serializers can set up diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/ArraySerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ArraySerializers.java index 96cb8ed337..854c779071 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/ArraySerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/ArraySerializers.java @@ -19,6 +19,9 @@ package org.apache.fury.serializer; +import java.lang.reflect.Array; +import java.lang.reflect.Modifier; +import java.util.IdentityHashMap; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.resolver.ClassInfo; @@ -32,9 +35,6 @@ import org.apache.fury.type.TypeUtils; import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; -import java.lang.reflect.Array; -import java.lang.reflect.Modifier; -import java.util.IdentityHashMap; /** * Serializers for array types. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/BufferObject.java b/java/fury-core/src/main/java/org/apache/fury/serializer/BufferObject.java index fe97400578..bb61df3d7f 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/BufferObject.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/BufferObject.java @@ -19,9 +19,9 @@ package org.apache.fury.serializer; -import org.apache.fury.memory.MemoryBuffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import org.apache.fury.memory.MemoryBuffer; /** * Fury serialized representation of an object. Note: This class is used for zero-copy out-of-band diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/BufferSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/BufferSerializers.java index 7f8f26f067..4e1ce39f97 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/BufferSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/BufferSerializers.java @@ -19,11 +19,11 @@ package org.apache.fury.serializer; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.type.Type; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; /** * Serializers for buffer related classes. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/CodegenSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/CodegenSerializer.java index 3e93f6f2ff..1539f8d859 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/CodegenSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/CodegenSerializer.java @@ -21,11 +21,11 @@ import static org.apache.fury.util.Preconditions.checkArgument; +import java.lang.reflect.Modifier; import org.apache.fury.Fury; import org.apache.fury.builder.CodecUtils; import org.apache.fury.builder.Generated; import org.apache.fury.memory.MemoryBuffer; -import java.lang.reflect.Modifier; /** * Util for JIT Serialization. @@ -65,8 +65,9 @@ public static Class> loadCompatibleCodegenSerializer(Fury fury /** * A bean serializer which initializes lazily on first call read/write method. * - *

This class is used by {@link org.apache.fury.builder.BaseObjectCodecBuilder} to avoid potential - * recursive bean serializer creation when there is a circular reference in class children fields. + *

This class is used by {@link org.apache.fury.builder.BaseObjectCodecBuilder} to avoid + * potential recursive bean serializer creation when there is a circular reference in class + * children fields. */ public static final class LazyInitBeanSerializer extends Serializer { private Serializer serializer; diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/CompatibleSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/CompatibleSerializer.java index 3c2df51ba4..94fa8c1614 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/CompatibleSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/CompatibleSerializer.java @@ -19,6 +19,12 @@ package org.apache.fury.serializer; +import java.lang.invoke.MethodHandle; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.resolver.ClassInfo; @@ -33,12 +39,6 @@ import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.record.RecordInfo; import org.apache.fury.util.record.RecordUtils; -import java.lang.invoke.MethodHandle; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * This Serializer provides both forward and backward compatibility: fields can be added or removed diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java index 466571603a..543e67fc9b 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/ExternalizableSerializer.java @@ -19,15 +19,15 @@ package org.apache.fury.serializer; +import java.io.Externalizable; +import java.io.IOException; +import java.lang.invoke.MethodHandle; import org.apache.fury.Fury; import org.apache.fury.io.FuryObjectInput; import org.apache.fury.io.FuryObjectOutput; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.util.Platform; import org.apache.fury.util.ReflectionUtils; -import java.io.Externalizable; -import java.io.IOException; -import java.lang.invoke.MethodHandle; /** * Serializer for class implements {@link Externalizable}. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/ForwardSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ForwardSerializer.java index 074deaf4e1..0e1e33bff6 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/ForwardSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/ForwardSerializer.java @@ -19,6 +19,12 @@ package org.apache.fury.serializer; +import java.nio.ByteBuffer; +import java.util.Collections; +import java.util.IdentityHashMap; +import java.util.Set; +import java.util.function.Consumer; +import javax.annotation.concurrent.ThreadSafe; import org.apache.fury.Fury; import org.apache.fury.config.Language; import org.apache.fury.memory.MemoryBuffer; @@ -26,12 +32,6 @@ import org.apache.fury.util.LoaderBinding; import org.apache.fury.util.LoaderBinding.StagingType; import org.apache.fury.util.Platform; -import java.nio.ByteBuffer; -import java.util.Collections; -import java.util.IdentityHashMap; -import java.util.Set; -import java.util.function.Consumer; -import javax.annotation.concurrent.ThreadSafe; /** * A thread-safe serializer used to forward serialization to different serializer implementation. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java index 50c4af0619..745fc2ecb4 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/JavaSerializer.java @@ -19,14 +19,6 @@ package org.apache.fury.serializer; -import org.apache.fury.Fury; -import org.apache.fury.io.ClassLoaderObjectInputStream; -import org.apache.fury.io.FuryObjectInput; -import org.apache.fury.io.FuryObjectOutput; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.resolver.ClassResolver; -import org.apache.fury.util.LoggerFactory; -import org.apache.fury.util.Platform; import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInputStream; @@ -36,6 +28,14 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.nio.ByteBuffer; +import org.apache.fury.Fury; +import org.apache.fury.io.ClassLoaderObjectInputStream; +import org.apache.fury.io.FuryObjectInput; +import org.apache.fury.io.FuryObjectOutput; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; import org.slf4j.Logger; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/JdkProxySerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/JdkProxySerializer.java index f857cd0e31..9f86a51051 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/JdkProxySerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/JdkProxySerializer.java @@ -19,12 +19,12 @@ package org.apache.fury.serializer; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Proxy; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Proxy; /** * Serializer for jdk {@link Proxy}. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/LambdaSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/LambdaSerializer.java index a4f96ac5c8..0507f72307 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/LambdaSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/LambdaSerializer.java @@ -19,15 +19,15 @@ package org.apache.fury.serializer; -import org.apache.fury.Fury; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.ReflectionUtils; import java.io.ObjectStreamClass; import java.io.Serializable; import java.lang.invoke.SerializedLambda; import java.lang.reflect.Method; import java.util.Objects; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; /** * Serializer for java serializable lambda. Use fury to serialize java lambda instead of JDK diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/LocaleSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/LocaleSerializer.java index 8146152db7..589f043712 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/LocaleSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/LocaleSerializer.java @@ -19,12 +19,12 @@ package org.apache.fury.serializer; -import org.apache.fury.Fury; -import org.apache.fury.collection.Tuple3; -import org.apache.fury.memory.MemoryBuffer; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import org.apache.fury.Fury; +import org.apache.fury.collection.Tuple3; +import org.apache.fury.memory.MemoryBuffer; /** * Local serializer for {@link Locale}. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java index bfe40d6095..da69940269 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/MetaSharedSerializer.java @@ -19,6 +19,16 @@ package org.apache.fury.serializer; +import java.lang.invoke.MethodHandle; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.stream.Collectors; import org.apache.fury.Fury; import org.apache.fury.builder.MetaSharedCodecBuilder; import org.apache.fury.collection.Tuple2; @@ -39,16 +49,6 @@ import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.record.RecordInfo; import org.apache.fury.util.record.RecordUtils; -import java.lang.invoke.MethodHandle; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; -import java.util.stream.Collectors; /** * A meta-shared compatible deserializer builder based on {@link ClassDef}. This serializer will diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectSerializer.java index 6f110a44fe..d6716a5516 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectSerializer.java @@ -22,6 +22,13 @@ import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; +import java.lang.invoke.MethodHandle; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; import org.apache.fury.Fury; import org.apache.fury.collection.Tuple2; import org.apache.fury.collection.Tuple3; @@ -41,13 +48,6 @@ import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.record.RecordInfo; import org.apache.fury.util.record.RecordUtils; -import java.lang.invoke.MethodHandle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; /** * A schema-consistent serializer used only for java serialization. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java index b7e4789b3e..ff26c47607 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/ObjectStreamSerializer.java @@ -19,22 +19,6 @@ package org.apache.fury.serializer; -import org.apache.fury.Fury; -import org.apache.fury.builder.CodecUtils; -import org.apache.fury.builder.Generated; -import org.apache.fury.collection.ObjectArray; -import org.apache.fury.collection.ObjectIntMap; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.resolver.ClassInfo; -import org.apache.fury.resolver.ClassResolver; -import org.apache.fury.resolver.FieldResolver; -import org.apache.fury.resolver.FieldResolver.ClassField; -import org.apache.fury.util.LoggerFactory; -import org.apache.fury.util.Platform; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.ReflectionUtils; -import org.apache.fury.util.Utils; -import org.apache.fury.util.unsafe._JDKAccess; import java.io.Externalizable; import java.io.IOException; import java.io.InvalidObjectException; @@ -61,6 +45,22 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiConsumer; import java.util.function.Consumer; +import org.apache.fury.Fury; +import org.apache.fury.builder.CodecUtils; +import org.apache.fury.builder.Generated; +import org.apache.fury.collection.ObjectArray; +import org.apache.fury.collection.ObjectIntMap; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassInfo; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.FieldResolver; +import org.apache.fury.resolver.FieldResolver.ClassField; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.Utils; +import org.apache.fury.util.unsafe._JDKAccess; import org.slf4j.Logger; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/OptionalSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/OptionalSerializers.java index c6833aa332..cc8195f436 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/OptionalSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/OptionalSerializers.java @@ -19,12 +19,12 @@ package org.apache.fury.serializer; -import org.apache.fury.Fury; -import org.apache.fury.memory.MemoryBuffer; import java.util.Optional; import java.util.OptionalDouble; import java.util.OptionalInt; import java.util.OptionalLong; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; /** * Serializers for {@link Optional}, {@link OptionalInt}, {@link OptionalLong} and {@link diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/ReplaceResolveSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/ReplaceResolveSerializer.java index 7db66180a1..3fc415796d 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/ReplaceResolveSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/ReplaceResolveSerializer.java @@ -19,6 +19,14 @@ package org.apache.fury.serializer; +import java.io.Externalizable; +import java.io.ObjectStreamClass; +import java.io.Serializable; +import java.lang.invoke.MethodHandles; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; +import java.util.function.Function; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.resolver.ClassInfo; @@ -29,14 +37,6 @@ import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.unsafe._JDKAccess; -import java.io.Externalizable; -import java.io.ObjectStreamClass; -import java.io.Serializable; -import java.lang.invoke.MethodHandles; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; -import java.util.function.Function; import org.slf4j.Logger; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/Serializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/Serializer.java index 953e31ffd1..401644f1bb 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/Serializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/Serializer.java @@ -19,11 +19,11 @@ package org.apache.fury.serializer; +import javax.annotation.concurrent.NotThreadSafe; import org.apache.fury.Fury; import org.apache.fury.config.Language; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.type.TypeUtils; -import javax.annotation.concurrent.NotThreadSafe; /** * Serialize/deserializer objects into binary. Note that this class is designed as an abstract class diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java index b9e5a8b65b..35547883f0 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/Serializers.java @@ -23,18 +23,6 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import org.apache.fury.Fury; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.resolver.ClassResolver; -import org.apache.fury.type.Type; -import org.apache.fury.type.TypeUtils; -import org.apache.fury.util.GraalvmSupport; -import org.apache.fury.util.Platform; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.ReflectionUtils; -import org.apache.fury.util.Utils; -import org.apache.fury.util.unsafe._JDKAccess; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -54,6 +42,18 @@ import java.util.function.Function; import java.util.function.ToIntFunction; import java.util.regex.Pattern; +import org.apache.fury.Fury; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.type.Type; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.Utils; +import org.apache.fury.util.unsafe._JDKAccess; /** * Serialization utils and common serializers. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java index 2c905c4893..2a369d2f38 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/StringSerializer.java @@ -22,6 +22,15 @@ import static org.apache.fury.type.TypeUtils.PRIMITIVE_CHAR_ARRAY_TYPE; import static org.apache.fury.type.TypeUtils.STRING_TYPE; +import java.lang.invoke.CallSite; +import java.lang.invoke.LambdaMetafactory; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Field; +import java.nio.charset.StandardCharsets; +import java.util.function.BiFunction; +import java.util.function.Function; import org.apache.fury.Fury; import org.apache.fury.codegen.Expression; import org.apache.fury.codegen.Expression.Invoke; @@ -34,15 +43,6 @@ import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.unsafe._JDKAccess; -import java.lang.invoke.CallSite; -import java.lang.invoke.LambdaMetafactory; -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.invoke.MethodType; -import java.lang.reflect.Field; -import java.nio.charset.StandardCharsets; -import java.util.function.BiFunction; -import java.util.function.Function; /** * String serializer based on {@link sun.misc.Unsafe} and {@link MethodHandle} for speed. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java index 3a81ef5230..97a8a0b81d 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/StructSerializer.java @@ -20,6 +20,14 @@ package org.apache.fury.serializer; import com.google.common.reflect.TypeToken; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; +import java.util.Comparator; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; import org.apache.fury.Fury; import org.apache.fury.config.Language; import org.apache.fury.exception.ClassNotCompatibleException; @@ -34,14 +42,6 @@ import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.Utils; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.util.Arrays; -import java.util.Comparator; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; import org.slf4j.Logger; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/TimeSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/TimeSerializers.java index 631a528d3e..dfd8becefc 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/TimeSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/TimeSerializers.java @@ -19,10 +19,6 @@ package org.apache.fury.serializer; -import org.apache.fury.Fury; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.type.Type; -import org.apache.fury.util.DateTimeUtils; import java.sql.Time; import java.sql.Timestamp; import java.time.Duration; @@ -43,6 +39,10 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.TimeZone; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.Type; +import org.apache.fury.util.DateTimeUtils; /** * Serializers for all time related types. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/URLSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/URLSerializer.java index 9d8d0c4379..65cedf2912 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/URLSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/URLSerializer.java @@ -19,11 +19,11 @@ package org.apache.fury.serializer; +import java.net.MalformedURLException; +import java.net.URL; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.util.Platform; -import java.net.MalformedURLException; -import java.net.URL; /** * Serializer for {@link URL}. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/UnexistedClassSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/UnexistedClassSerializers.java index 38cba04cd4..73215c0a8e 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/UnexistedClassSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/UnexistedClassSerializers.java @@ -19,6 +19,9 @@ package org.apache.fury.serializer; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import org.apache.fury.Fury; import org.apache.fury.collection.IdentityObjectIntMap; import org.apache.fury.collection.LazyMap; @@ -39,9 +42,6 @@ import org.apache.fury.type.DescriptorGrouper; import org.apache.fury.type.Generics; import org.apache.fury.util.Preconditions; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; @SuppressWarnings({"rawtypes", "unchecked"}) public final class UnexistedClassSerializers { diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractCollectionSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractCollectionSerializer.java index 6fe241be07..0fdd3d6a07 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractCollectionSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractCollectionSerializer.java @@ -19,6 +19,8 @@ package org.apache.fury.serializer.collection; +import java.lang.invoke.MethodHandle; +import java.util.Collection; import org.apache.fury.Fury; import org.apache.fury.annotation.CodegenInvoke; import org.apache.fury.memory.MemoryBuffer; @@ -31,8 +33,6 @@ import org.apache.fury.type.GenericType; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; -import java.lang.invoke.MethodHandle; -import java.util.Collection; /** * Serializer for all collection like object. All collection serializer should extend this class. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractMapSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractMapSerializer.java index 479f6f8f3d..c62d2912cf 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractMapSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractMapSerializer.java @@ -22,6 +22,8 @@ import static org.apache.fury.type.TypeUtils.MAP_TYPE; import com.google.common.reflect.TypeToken; +import java.lang.invoke.MethodHandle; +import java.util.Map; import org.apache.fury.Fury; import org.apache.fury.collection.IdentityMap; import org.apache.fury.collection.Tuple2; @@ -34,8 +36,6 @@ import org.apache.fury.type.Generics; import org.apache.fury.type.TypeUtils; import org.apache.fury.util.ReflectionUtils; -import java.lang.invoke.MethodHandle; -import java.util.Map; /** * Serializer for all map-like objects. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ArrayAsList.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ArrayAsList.java index 996d8aaff6..ba91589a14 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ArrayAsList.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ArrayAsList.java @@ -19,11 +19,11 @@ package org.apache.fury.serializer.collection; -import org.apache.fury.annotation.Internal; import java.util.AbstractList; import java.util.Iterator; import java.util.Objects; import java.util.RandomAccess; +import org.apache.fury.annotation.Internal; /** * A List which wrap a Java array like `java.util.Arrays.ArrayList`, but allow to replace wrapped diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ChildContainerSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ChildContainerSerializers.java index ffb96c7c61..64d2b40d7b 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ChildContainerSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ChildContainerSerializers.java @@ -20,17 +20,6 @@ package org.apache.fury.serializer.collection; import com.google.common.collect.ImmutableSet; -import org.apache.fury.Fury; -import org.apache.fury.config.CompatibleMode; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.resolver.ClassResolver; -import org.apache.fury.resolver.FieldResolver; -import org.apache.fury.serializer.CompatibleSerializer; -import org.apache.fury.serializer.JavaSerializer; -import org.apache.fury.serializer.ObjectSerializer; -import org.apache.fury.serializer.Serializer; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.ReflectionUtils; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collection; @@ -44,6 +33,17 @@ import java.util.Set; import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; +import org.apache.fury.Fury; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.resolver.FieldResolver; +import org.apache.fury.serializer.CompatibleSerializer; +import org.apache.fury.serializer.JavaSerializer; +import org.apache.fury.serializer.ObjectSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; /** * Serializers for subclasses of common JDK container types. Subclasses of {@link ArrayList}/{@link diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializer.java index 26c2c895b2..f395f4cda2 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializer.java @@ -19,9 +19,9 @@ package org.apache.fury.serializer.collection; +import java.util.Collection; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; -import java.util.Collection; /** * Base serializer for all java collections. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java index 01c9250d93..5785f7e1fe 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionSerializers.java @@ -19,18 +19,6 @@ package org.apache.fury.serializer.collection; -import org.apache.fury.Fury; -import org.apache.fury.config.Language; -import org.apache.fury.exception.FuryException; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.resolver.ClassResolver; -import org.apache.fury.serializer.ReplaceResolveSerializer; -import org.apache.fury.serializer.Serializer; -import org.apache.fury.serializer.Serializers; -import org.apache.fury.type.Type; -import org.apache.fury.util.Platform; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.ReflectionUtils; import java.lang.invoke.MethodHandle; import java.lang.reflect.Field; import java.util.ArrayDeque; @@ -51,6 +39,18 @@ import java.util.TreeSet; import java.util.Vector; import java.util.concurrent.ConcurrentSkipListSet; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.exception.FuryException; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.serializer.ReplaceResolveSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.Serializers; +import org.apache.fury.type.Type; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; /** * Serializers for classes implements {@link Collection}. All collection serializers should extend diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/FuryArrayAsListSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/FuryArrayAsListSerializer.java index f8773fc35e..ed1d982fad 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/FuryArrayAsListSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/FuryArrayAsListSerializer.java @@ -19,11 +19,11 @@ package org.apache.fury.serializer.collection; +import java.util.Collection; import org.apache.fury.Fury; import org.apache.fury.annotation.Internal; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.type.Type; -import java.util.Collection; /** * Serializer for {@link ArrayAsList}. Helper for serialization of other classes. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/GuavaCollectionSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/GuavaCollectionSerializers.java index bc2e85bc3e..d699609834 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/GuavaCollectionSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/GuavaCollectionSerializers.java @@ -25,11 +25,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.ImmutableSortedSet; -import org.apache.fury.Fury; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.type.Type; -import org.apache.fury.util.Platform; -import org.apache.fury.util.unsafe._JDKAccess; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -40,6 +35,11 @@ import java.util.List; import java.util.Map; import java.util.function.Function; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.Type; +import org.apache.fury.util.Platform; +import org.apache.fury.util.unsafe._JDKAccess; /** * Serializers for common guava types. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ImmutableCollectionSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ImmutableCollectionSerializers.java index 2ab9ff08b6..a5f2a2d098 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ImmutableCollectionSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/ImmutableCollectionSerializers.java @@ -19,10 +19,6 @@ package org.apache.fury.serializer.collection; -import org.apache.fury.Fury; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.util.Platform; -import org.apache.fury.util.unsafe._JDKAccess; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodType; import java.util.ArrayList; @@ -33,6 +29,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.fury.Fury; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.Platform; +import org.apache.fury.util.unsafe._JDKAccess; /** * Serializers for jdk9+ java.util.ImmutableCollections. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializer.java index 40d1a668ef..3a805a4a0c 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializer.java @@ -19,9 +19,9 @@ package org.apache.fury.serializer.collection; +import java.util.Map; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; -import java.util.Map; /** * Base serializer for all java maps. diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java index 9b9c4394dc..b7e09571a5 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/MapSerializers.java @@ -19,6 +19,17 @@ package org.apache.fury.serializer.collection; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentSkipListMap; import org.apache.fury.Fury; import org.apache.fury.collection.LazyMap; import org.apache.fury.config.Language; @@ -32,17 +43,6 @@ import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentSkipListMap; /** * Serializers for classes implements {@link Collection}. All map serializers must extends {@link diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java index 64aee533ed..c4a0daf202 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/SynchronizedSerializers.java @@ -19,13 +19,6 @@ package org.apache.fury.serializer.collection; -import org.apache.fury.Fury; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.serializer.Serializer; -import org.apache.fury.util.LoggerFactory; -import org.apache.fury.util.Platform; -import org.apache.fury.util.Utils; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -41,6 +34,13 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.function.Function; +import org.apache.fury.Fury; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Utils; import org.slf4j.Logger; /** Serializer for synchronized Collections and Maps created via Collections. */ diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java index 38d2dddf63..d651421f96 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/UnmodifiableSerializers.java @@ -19,14 +19,6 @@ package org.apache.fury.serializer.collection; -import org.apache.fury.Fury; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.serializer.Serializer; -import org.apache.fury.util.LoggerFactory; -import org.apache.fury.util.Platform; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.Utils; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -41,6 +33,14 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.function.Function; +import org.apache.fury.Fury; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.Utils; import org.slf4j.Logger; /** Serializer for unmodifiable Collections and Maps created via Collections. */ diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonCollectionSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonCollectionSerializer.java index 165735c4b8..8610393ae6 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonCollectionSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonCollectionSerializer.java @@ -19,14 +19,14 @@ package org.apache.fury.serializer.scala; +import java.lang.reflect.Field; +import java.util.Collection; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.serializer.collection.AbstractCollectionSerializer; import org.apache.fury.util.GraalvmSupport; import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; -import java.lang.reflect.Field; -import java.util.Collection; /** * Singleton serializer for scala collection. We need this serializer for fury jit serialization, diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonMapSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonMapSerializer.java index a9fb527c7d..18d6d586df 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonMapSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonMapSerializer.java @@ -19,14 +19,14 @@ package org.apache.fury.serializer.scala; +import java.lang.reflect.Field; +import java.util.Map; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.serializer.collection.AbstractMapSerializer; import org.apache.fury.util.GraalvmSupport; import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; -import java.lang.reflect.Field; -import java.util.Map; /** * Singleton serializer for scala map. We need this serializer for fury jit serialization, otherwise diff --git a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonObjectSerializer.java b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonObjectSerializer.java index 19e888941f..cb5b617054 100644 --- a/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonObjectSerializer.java +++ b/java/fury-core/src/main/java/org/apache/fury/serializer/scala/SingletonObjectSerializer.java @@ -19,13 +19,13 @@ package org.apache.fury.serializer.scala; +import java.lang.reflect.Field; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.serializer.Serializer; import org.apache.fury.util.GraalvmSupport; import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; -import java.lang.reflect.Field; /** * Serializer for scala diff --git a/java/fury-core/src/main/java/org/apache/fury/type/ClassDef.java b/java/fury-core/src/main/java/org/apache/fury/type/ClassDef.java index 8c56a9da16..1bb12975eb 100644 --- a/java/fury-core/src/main/java/org/apache/fury/type/ClassDef.java +++ b/java/fury-core/src/main/java/org/apache/fury/type/ClassDef.java @@ -25,6 +25,18 @@ import static org.apache.fury.type.TypeUtils.mapOf; import com.google.common.reflect.TypeToken; +import java.io.ObjectStreamClass; +import java.io.Serializable; +import java.lang.reflect.Field; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.function.Function; import org.apache.fury.Fury; import org.apache.fury.builder.MetaSharedCodecBuilder; import org.apache.fury.collection.IdentityObjectIntMap; @@ -39,18 +51,6 @@ import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; -import java.io.ObjectStreamClass; -import java.io.Serializable; -import java.lang.reflect.Field; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Function; import org.slf4j.Logger; /** diff --git a/java/fury-core/src/main/java/org/apache/fury/type/Descriptor.java b/java/fury-core/src/main/java/org/apache/fury/type/Descriptor.java index 7b71bf41b7..f5e78f5ef6 100644 --- a/java/fury-core/src/main/java/org/apache/fury/type/Descriptor.java +++ b/java/fury-core/src/main/java/org/apache/fury/type/Descriptor.java @@ -24,14 +24,6 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.reflect.TypeToken; -import org.apache.fury.annotation.Ignore; -import org.apache.fury.annotation.Internal; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.util.Platform; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.StringUtils; -import org.apache.fury.util.record.RecordComponent; -import org.apache.fury.util.record.RecordUtils; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -51,6 +43,14 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.fury.annotation.Ignore; +import org.apache.fury.annotation.Internal; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.Platform; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.StringUtils; +import org.apache.fury.util.record.RecordComponent; +import org.apache.fury.util.record.RecordUtils; /** * Build descriptors for a class. diff --git a/java/fury-core/src/main/java/org/apache/fury/type/DescriptorGrouper.java b/java/fury-core/src/main/java/org/apache/fury/type/DescriptorGrouper.java index 3c3dfeb5bf..f5560a00d9 100644 --- a/java/fury-core/src/main/java/org/apache/fury/type/DescriptorGrouper.java +++ b/java/fury-core/src/main/java/org/apache/fury/type/DescriptorGrouper.java @@ -21,7 +21,6 @@ import static org.apache.fury.type.TypeUtils.getSizeOfPrimitiveType; -import org.apache.fury.util.record.RecordUtils; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; @@ -30,6 +29,7 @@ import java.util.List; import java.util.TreeSet; import java.util.function.Function; +import org.apache.fury.util.record.RecordUtils; /** * A utility class to group class fields into groups. diff --git a/java/fury-core/src/main/java/org/apache/fury/type/FinalObjectTypeStub.java b/java/fury-core/src/main/java/org/apache/fury/type/FinalObjectTypeStub.java index 0aa17956b4..705d8e5b7e 100644 --- a/java/fury-core/src/main/java/org/apache/fury/type/FinalObjectTypeStub.java +++ b/java/fury-core/src/main/java/org/apache/fury/type/FinalObjectTypeStub.java @@ -24,9 +24,9 @@ /** * Stub class for object type which is final. * - *

{@link Object} class will be used if isn't final. No {@link org.apache.fury.resolver.ClassInfo} should - * be created for this class since it has no fields, and doesn't have consistent class structure as - * real class. + *

{@link Object} class will be used if isn't final. No {@link + * org.apache.fury.resolver.ClassInfo} should be created for this class since it has no fields, and + * doesn't have consistent class structure as real class. * * @author chaokunyang */ diff --git a/java/fury-core/src/main/java/org/apache/fury/type/GenericType.java b/java/fury-core/src/main/java/org/apache/fury/type/GenericType.java index 0370d9b4f3..cfdd551fd4 100644 --- a/java/fury-core/src/main/java/org/apache/fury/type/GenericType.java +++ b/java/fury-core/src/main/java/org/apache/fury/type/GenericType.java @@ -22,8 +22,6 @@ import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import org.apache.fury.resolver.ClassResolver; -import org.apache.fury.serializer.Serializer; import java.lang.reflect.GenericArrayType; import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; @@ -33,6 +31,8 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.serializer.Serializer; /** * GenericType for building java generics as a tree and binding with fury serializers. diff --git a/java/fury-core/src/main/java/org/apache/fury/type/ScalaTypes.java b/java/fury-core/src/main/java/org/apache/fury/type/ScalaTypes.java index a661188b21..096a5720aa 100644 --- a/java/fury-core/src/main/java/org/apache/fury/type/ScalaTypes.java +++ b/java/fury-core/src/main/java/org/apache/fury/type/ScalaTypes.java @@ -20,10 +20,10 @@ package org.apache.fury.type; import com.google.common.reflect.TypeToken; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.util.ReflectionUtils; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.ReflectionUtils; /** * Scala types utils using reflection without dependency on scala library. diff --git a/java/fury-core/src/main/java/org/apache/fury/type/TypeUtils.java b/java/fury-core/src/main/java/org/apache/fury/type/TypeUtils.java index 2e6fbda2a1..b51e458699 100644 --- a/java/fury-core/src/main/java/org/apache/fury/type/TypeUtils.java +++ b/java/fury-core/src/main/java/org/apache/fury/type/TypeUtils.java @@ -22,10 +22,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; -import org.apache.fury.collection.IdentityMap; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.ReflectionUtils; import java.lang.reflect.Array; import java.lang.reflect.GenericArrayType; import java.lang.reflect.Modifier; @@ -52,6 +48,10 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; +import org.apache.fury.collection.IdentityMap; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; /** * Type utils for common type inference and extraction. diff --git a/java/fury-core/src/main/java/org/apache/fury/util/FieldAccessor.java b/java/fury-core/src/main/java/org/apache/fury/util/FieldAccessor.java index e9ad88d9ca..d075022442 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/FieldAccessor.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/FieldAccessor.java @@ -19,12 +19,6 @@ package org.apache.fury.util; -import org.apache.fury.type.TypeUtils; -import org.apache.fury.util.function.Functions; -import org.apache.fury.util.function.ToByteFunction; -import org.apache.fury.util.function.ToCharFunction; -import org.apache.fury.util.function.ToFloatFunction; -import org.apache.fury.util.function.ToShortFunction; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.function.Function; @@ -32,6 +26,12 @@ import java.util.function.ToDoubleFunction; import java.util.function.ToIntFunction; import java.util.function.ToLongFunction; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.function.Functions; +import org.apache.fury.util.function.ToByteFunction; +import org.apache.fury.util.function.ToCharFunction; +import org.apache.fury.util.function.ToFloatFunction; +import org.apache.fury.util.function.ToShortFunction; /** * Field accessor for primitive types and object types. diff --git a/java/fury-core/src/main/java/org/apache/fury/util/LoaderBinding.java b/java/fury-core/src/main/java/org/apache/fury/util/LoaderBinding.java index 024e8697c6..44137a5ef9 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/LoaderBinding.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/LoaderBinding.java @@ -19,13 +19,13 @@ package org.apache.fury.util; -import org.apache.fury.Fury; -import org.apache.fury.annotation.Internal; import java.lang.ref.SoftReference; import java.util.HashMap; import java.util.WeakHashMap; import java.util.function.Consumer; import java.util.function.Function; +import org.apache.fury.Fury; +import org.apache.fury.annotation.Internal; /** * An util to bind {@link Fury} with {@link ClassLoader}. If {@link ClassLoader} are changed, the diff --git a/java/fury-core/src/main/java/org/apache/fury/util/Platform.java b/java/fury-core/src/main/java/org/apache/fury/util/Platform.java index 91b0efb738..feb3af2ae8 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/Platform.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/Platform.java @@ -17,12 +17,12 @@ package org.apache.fury.util; -import org.apache.fury.util.unsafe._JDKAccess; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import org.apache.fury.util.unsafe._JDKAccess; import sun.misc.Unsafe; // Derived from diff --git a/java/fury-core/src/main/java/org/apache/fury/util/ReflectionUtils.java b/java/fury-core/src/main/java/org/apache/fury/util/ReflectionUtils.java index 25dfe08f8d..607833cc21 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/ReflectionUtils.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/ReflectionUtils.java @@ -23,11 +23,6 @@ import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; -import org.apache.fury.annotation.CodegenInvoke; -import org.apache.fury.annotation.Internal; -import org.apache.fury.collection.Tuple3; -import org.apache.fury.util.function.Functions; -import org.apache.fury.util.unsafe._JDKAccess; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -50,6 +45,11 @@ import java.util.concurrent.ConcurrentMap; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.fury.annotation.CodegenInvoke; +import org.apache.fury.annotation.Internal; +import org.apache.fury.collection.Tuple3; +import org.apache.fury.util.function.Functions; +import org.apache.fury.util.unsafe._JDKAccess; /** * Reflection util. diff --git a/java/fury-core/src/main/java/org/apache/fury/util/function/Functions.java b/java/fury-core/src/main/java/org/apache/fury/util/function/Functions.java index dc23d72442..0cc3256980 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/function/Functions.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/function/Functions.java @@ -19,10 +19,6 @@ package org.apache.fury.util.function; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.ReflectionUtils; -import org.apache.fury.util.unsafe._JDKAccess; import java.io.Serializable; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -31,6 +27,10 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; +import org.apache.fury.util.unsafe._JDKAccess; /** * Utility for lambda functions. diff --git a/java/fury-core/src/main/java/org/apache/fury/util/function/TriFunction.java b/java/fury-core/src/main/java/org/apache/fury/util/function/TriFunction.java index 81587b28ca..5b2fb04693 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/function/TriFunction.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/function/TriFunction.java @@ -19,8 +19,8 @@ package org.apache.fury.util.function; -import org.apache.fury.util.Preconditions; import java.util.function.Function; +import org.apache.fury.util.Preconditions; /** * Triple function. diff --git a/java/fury-core/src/main/java/org/apache/fury/util/record/RecordUtils.java b/java/fury-core/src/main/java/org/apache/fury/util/record/RecordUtils.java index ac98461754..f98f0bb3df 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/record/RecordUtils.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/record/RecordUtils.java @@ -19,8 +19,6 @@ package org.apache.fury.util.record; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.util.unsafe._JDKAccess; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -33,6 +31,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.util.unsafe._JDKAccess; /** * Utils for java.lang.Record. diff --git a/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Collections.java b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Collections.java index f589d16a26..9e933bf9b1 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Collections.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_Collections.java @@ -19,8 +19,8 @@ package org.apache.fury.util.unsafe; -import org.apache.fury.util.Platform; import java.util.ArrayList; +import org.apache.fury.util.Platform; /** * Unsafe collection utils. diff --git a/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java index 470f7d6ce1..78c2a94ca7 100644 --- a/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java +++ b/java/fury-core/src/main/java/org/apache/fury/util/unsafe/_JDKAccess.java @@ -19,15 +19,6 @@ package org.apache.fury.util.unsafe; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.type.TypeUtils; -import org.apache.fury.util.GraalvmSupport; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.Utils; -import org.apache.fury.util.function.ToByteFunction; -import org.apache.fury.util.function.ToCharFunction; -import org.apache.fury.util.function.ToFloatFunction; -import org.apache.fury.util.function.ToShortFunction; import java.lang.invoke.CallSite; import java.lang.invoke.LambdaMetafactory; import java.lang.invoke.MethodHandle; @@ -45,6 +36,15 @@ import java.util.function.ToDoubleFunction; import java.util.function.ToIntFunction; import java.util.function.ToLongFunction; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.GraalvmSupport; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.Utils; +import org.apache.fury.util.function.ToByteFunction; +import org.apache.fury.util.function.ToCharFunction; +import org.apache.fury.util.function.ToFloatFunction; +import org.apache.fury.util.function.ToShortFunction; import sun.misc.Unsafe; /** diff --git a/java/fury-core/src/test/java/org/apache/fury/CrossLanguageTest.java b/java/fury-core/src/test/java/org/apache/fury/CrossLanguageTest.java index deb8b9b6b4..4f7220510d 100644 --- a/java/fury-core/src/test/java/org/apache/fury/CrossLanguageTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/CrossLanguageTest.java @@ -22,13 +22,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.hash.Hashing; -import org.apache.fury.config.Language; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.serializer.BufferObject; -import org.apache.fury.serializer.Serializer; -import org.apache.fury.util.LoggerFactory; -import org.apache.fury.util.MurmurHash3; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -56,6 +49,13 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import lombok.Data; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.BufferObject; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.util.LoggerFactory; +import org.apache.fury.util.MurmurHash3; import org.slf4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/CyclicTest.java b/java/fury-core/src/test/java/org/apache/fury/CyclicTest.java index f367a07a64..ac3a4049e3 100644 --- a/java/fury-core/src/test/java/org/apache/fury/CyclicTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/CyclicTest.java @@ -21,13 +21,13 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import java.util.ArrayList; +import java.util.List; import org.apache.fury.config.CompatibleMode; import org.apache.fury.config.FuryBuilder; import org.apache.fury.config.Language; import org.apache.fury.test.bean.Cyclic; import org.apache.fury.test.bean.FinalCyclic; -import java.util.ArrayList; -import java.util.List; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/FuryInitPerf.java b/java/fury-core/src/test/java/org/apache/fury/FuryInitPerf.java index da5b12621a..2e3ecfb97b 100644 --- a/java/fury-core/src/test/java/org/apache/fury/FuryInitPerf.java +++ b/java/fury-core/src/test/java/org/apache/fury/FuryInitPerf.java @@ -20,6 +20,9 @@ package org.apache.fury; import com.google.common.reflect.TypeToken; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import org.apache.fury.config.CompatibleMode; import org.apache.fury.config.Language; import org.apache.fury.resolver.MetaContext; @@ -28,9 +31,6 @@ import org.apache.fury.test.bean.Foo; import org.apache.fury.type.TypeUtils; import org.apache.fury.util.LoggerFactory; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; import org.slf4j.Logger; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/FuryTest.java b/java/fury-core/src/test/java/org/apache/fury/FuryTest.java index 0105ce031b..59cdb716fb 100644 --- a/java/fury-core/src/test/java/org/apache/fury/FuryTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/FuryTest.java @@ -27,22 +27,6 @@ import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.apache.fury.annotation.Ignore; -import org.apache.fury.builder.Generated; -import org.apache.fury.config.FuryBuilder; -import org.apache.fury.config.Language; -import org.apache.fury.exception.InsecureException; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.serializer.ArraySerializersTest; -import org.apache.fury.serializer.ObjectSerializer; -import org.apache.fury.serializer.Serializer; -import org.apache.fury.serializer.SerializersTest; -import org.apache.fury.test.bean.BeanA; -import org.apache.fury.test.bean.Struct; -import org.apache.fury.type.Descriptor; -import org.apache.fury.util.DateTimeUtils; -import org.apache.fury.util.Platform; import java.io.*; import java.lang.invoke.MethodHandles; import java.math.BigDecimal; @@ -68,6 +52,22 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.fury.annotation.Ignore; +import org.apache.fury.builder.Generated; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.config.Language; +import org.apache.fury.exception.InsecureException; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.ArraySerializersTest; +import org.apache.fury.serializer.ObjectSerializer; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.serializer.SerializersTest; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.Struct; +import org.apache.fury.type.Descriptor; +import org.apache.fury.util.DateTimeUtils; +import org.apache.fury.util.Platform; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/FuryTestBase.java b/java/fury-core/src/test/java/org/apache/fury/FuryTestBase.java index 481e302cfb..99dc07b8a6 100644 --- a/java/fury-core/src/test/java/org/apache/fury/FuryTestBase.java +++ b/java/fury-core/src/test/java/org/apache/fury/FuryTestBase.java @@ -19,14 +19,6 @@ package org.apache.fury; -import org.apache.fury.config.CompatibleMode; -import org.apache.fury.config.Language; -import org.apache.fury.io.ClassLoaderObjectInputStream; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.resolver.MetaContext; -import org.apache.fury.serializer.BufferObject; -import org.apache.fury.util.Platform; -import org.apache.fury.util.ReflectionUtils; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -39,6 +31,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; +import org.apache.fury.io.ClassLoaderObjectInputStream; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.MetaContext; +import org.apache.fury.serializer.BufferObject; +import org.apache.fury.util.Platform; +import org.apache.fury.util.ReflectionUtils; import org.testng.Assert; import org.testng.annotations.DataProvider; diff --git a/java/fury-core/src/test/java/org/apache/fury/OutOfBandTest.java b/java/fury-core/src/test/java/org/apache/fury/OutOfBandTest.java index 9a2eb730ff..4de43ba1c9 100644 --- a/java/fury-core/src/test/java/org/apache/fury/OutOfBandTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/OutOfBandTest.java @@ -21,11 +21,11 @@ import static org.testng.Assert.assertEquals; -import org.apache.fury.config.FuryBuilder; -import org.apache.fury.config.Language; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.config.Language; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/TestUtils.java b/java/fury-core/src/test/java/org/apache/fury/TestUtils.java index 0877509b90..ca97c16097 100644 --- a/java/fury-core/src/test/java/org/apache/fury/TestUtils.java +++ b/java/fury-core/src/test/java/org/apache/fury/TestUtils.java @@ -21,13 +21,13 @@ import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableMap; -import org.apache.fury.util.FieldAccessor; -import org.apache.fury.util.ReflectionUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; import java.util.ArrayList; import java.util.function.Supplier; +import org.apache.fury.util.FieldAccessor; +import org.apache.fury.util.ReflectionUtils; /** * Test utils. diff --git a/java/fury-core/src/test/java/org/apache/fury/ThreadSafeFuryTest.java b/java/fury-core/src/test/java/org/apache/fury/ThreadSafeFuryTest.java index 236bde2f5f..bd28ba9466 100644 --- a/java/fury-core/src/test/java/org/apache/fury/ThreadSafeFuryTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/ThreadSafeFuryTest.java @@ -23,13 +23,6 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import org.apache.fury.config.Language; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.resolver.MetaContext; -import org.apache.fury.serializer.Serializer; -import org.apache.fury.test.bean.BeanA; -import org.apache.fury.test.bean.Struct; -import org.apache.fury.util.LoaderBinding.StagingType; import java.util.WeakHashMap; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; @@ -37,6 +30,13 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.resolver.MetaContext; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.Struct; +import org.apache.fury.util.LoaderBinding.StagingType; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/builder/AccessorHelperTest.java b/java/fury-core/src/test/java/org/apache/fury/builder/AccessorHelperTest.java index 6e733331ec..dc224ef636 100644 --- a/java/fury-core/src/test/java/org/apache/fury/builder/AccessorHelperTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/builder/AccessorHelperTest.java @@ -24,11 +24,6 @@ import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import org.apache.fury.TestUtils; -import org.apache.fury.builder.pkg.AccessLevelClass; -import org.apache.fury.test.bean.Foo; -import org.apache.fury.test.bean.Struct; -import org.apache.fury.type.Descriptor; import java.lang.ref.WeakReference; import java.lang.reflect.Method; import java.util.concurrent.ExecutorService; @@ -36,6 +31,11 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import lombok.Data; +import org.apache.fury.TestUtils; +import org.apache.fury.builder.pkg.AccessLevelClass; +import org.apache.fury.test.bean.Foo; +import org.apache.fury.test.bean.Struct; +import org.apache.fury.type.Descriptor; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/builder/JITContextTest.java b/java/fury-core/src/test/java/org/apache/fury/builder/JITContextTest.java index 1f1717a617..1f3943cf07 100644 --- a/java/fury-core/src/test/java/org/apache/fury/builder/JITContextTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/builder/JITContextTest.java @@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import java.util.List; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.config.CompatibleMode; @@ -32,7 +33,6 @@ import org.apache.fury.test.bean.BeanA; import org.apache.fury.test.bean.BeanB; import org.apache.fury.util.LoggerFactory; -import java.util.List; import org.slf4j.Logger; import org.testng.Assert; import org.testng.annotations.DataProvider; diff --git a/java/fury-core/src/test/java/org/apache/fury/builder/ObjectCodecBuilderTest.java b/java/fury-core/src/test/java/org/apache/fury/builder/ObjectCodecBuilderTest.java index b03eb9cb0d..165b4dd1ea 100644 --- a/java/fury-core/src/test/java/org/apache/fury/builder/ObjectCodecBuilderTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/builder/ObjectCodecBuilderTest.java @@ -25,6 +25,14 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import lombok.Data; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.codegen.CodeGenerator; @@ -37,14 +45,6 @@ import org.apache.fury.test.bean.BeanB; import org.apache.fury.test.bean.Foo; import org.apache.fury.test.bean.Struct; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import lombok.Data; import org.codehaus.commons.compiler.util.reflect.ByteArrayClassLoader; import org.testng.Assert; import org.testng.annotations.DataProvider; diff --git a/java/fury-core/src/test/java/org/apache/fury/codegen/CodeGeneratorTest.java b/java/fury-core/src/test/java/org/apache/fury/codegen/CodeGeneratorTest.java index e17cc4a28e..1f27527b4a 100644 --- a/java/fury-core/src/test/java/org/apache/fury/codegen/CodeGeneratorTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/codegen/CodeGeneratorTest.java @@ -23,12 +23,6 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import org.apache.fury.Fury; -import org.apache.fury.builder.ObjectCodecBuilder; -import org.apache.fury.collection.MultiKeyWeakMap; -import org.apache.fury.test.bean.Foo; -import org.apache.fury.util.ClassLoaderUtils; -import org.apache.fury.util.ClassLoaderUtils.ByteArrayClassLoader; import java.lang.ref.SoftReference; import java.lang.reflect.Field; import java.util.HashMap; @@ -39,6 +33,12 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import org.apache.fury.Fury; +import org.apache.fury.builder.ObjectCodecBuilder; +import org.apache.fury.collection.MultiKeyWeakMap; +import org.apache.fury.test.bean.Foo; +import org.apache.fury.util.ClassLoaderUtils; +import org.apache.fury.util.ClassLoaderUtils.ByteArrayClassLoader; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/codegen/CodegenContextTest.java b/java/fury-core/src/test/java/org/apache/fury/codegen/CodegenContextTest.java index 4783db3da2..3b3a72a163 100644 --- a/java/fury-core/src/test/java/org/apache/fury/codegen/CodegenContextTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/codegen/CodegenContextTest.java @@ -20,11 +20,11 @@ package org.apache.fury.codegen; import com.google.common.reflect.TypeToken; +import java.util.List; import org.apache.fury.codegen.Expression.Invoke; import org.apache.fury.codegen.Expression.Literal; import org.apache.fury.serializer.Serializer; import org.apache.fury.type.TypeUtils; -import java.util.List; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionOptimizerTest.java b/java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionOptimizerTest.java index f020fd7cfe..5570c1c0dc 100644 --- a/java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionOptimizerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionOptimizerTest.java @@ -22,11 +22,11 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import java.lang.reflect.Method; +import java.util.Arrays; import org.apache.fury.codegen.Expression.Add; import org.apache.fury.codegen.Expression.Literal; import org.apache.fury.codegen.Expression.Return; -import java.lang.reflect.Method; -import java.util.Arrays; import org.testng.annotations.Test; public class ExpressionOptimizerTest { diff --git a/java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionVisitorTest.java b/java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionVisitorTest.java index 5220091e53..e265c93ccf 100644 --- a/java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionVisitorTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/codegen/ExpressionVisitorTest.java @@ -22,15 +22,15 @@ import static org.testng.Assert.assertEquals; import com.google.common.reflect.TypeToken; -import org.apache.fury.codegen.Expression.Literal; -import org.apache.fury.util.Preconditions; -import org.apache.fury.util.ReflectionUtils; import java.lang.invoke.SerializedLambda; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.apache.fury.codegen.Expression.Literal; +import org.apache.fury.util.Preconditions; +import org.apache.fury.util.ReflectionUtils; import org.testng.annotations.Test; public class ExpressionVisitorTest { diff --git a/java/fury-core/src/test/java/org/apache/fury/codegen/JaninoUtilsTest.java b/java/fury-core/src/test/java/org/apache/fury/codegen/JaninoUtilsTest.java index 9e98611888..bfb039ff19 100644 --- a/java/fury-core/src/test/java/org/apache/fury/codegen/JaninoUtilsTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/codegen/JaninoUtilsTest.java @@ -19,16 +19,16 @@ package org.apache.fury.codegen; -import org.apache.fury.test.bean.Struct; -import org.apache.fury.util.ClassLoaderUtils; -import org.apache.fury.util.Platform; -import org.apache.fury.util.ReflectionUtils; import java.lang.ref.WeakReference; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; +import org.apache.fury.test.bean.Struct; +import org.apache.fury.util.ClassLoaderUtils; +import org.apache.fury.util.Platform; +import org.apache.fury.util.ReflectionUtils; import org.codehaus.commons.compiler.CompileException; import org.codehaus.commons.compiler.util.reflect.ByteArrayClassLoader; import org.codehaus.commons.compiler.util.resource.MapResourceCreator; diff --git a/java/fury-core/src/test/java/org/apache/fury/collection/LazyMapTest.java b/java/fury-core/src/test/java/org/apache/fury/collection/LazyMapTest.java index 500a91f447..4d844cfe5b 100644 --- a/java/fury-core/src/test/java/org/apache/fury/collection/LazyMapTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/collection/LazyMapTest.java @@ -23,14 +23,14 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.config.Language; -import org.apache.fury.serializer.collection.MapSerializers; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.serializer.collection.MapSerializers; import org.testng.annotations.Test; public class LazyMapTest extends FuryTestBase { diff --git a/java/fury-core/src/test/java/org/apache/fury/collection/MultiKeyWeakMapTest.java b/java/fury-core/src/test/java/org/apache/fury/collection/MultiKeyWeakMapTest.java index dcec2790d7..1c527450f8 100644 --- a/java/fury-core/src/test/java/org/apache/fury/collection/MultiKeyWeakMapTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/collection/MultiKeyWeakMapTest.java @@ -19,10 +19,10 @@ package org.apache.fury.collection; -import org.apache.fury.util.LoggerFactory; import java.lang.ref.Reference; import java.lang.reflect.Field; import java.util.Set; +import org.apache.fury.util.LoggerFactory; import org.slf4j.Logger; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/io/FuryObjectInputTest.java b/java/fury-core/src/test/java/org/apache/fury/io/FuryObjectInputTest.java index 89464cf084..dbeb4352a1 100644 --- a/java/fury-core/src/test/java/org/apache/fury/io/FuryObjectInputTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/io/FuryObjectInputTest.java @@ -22,10 +22,10 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import java.io.IOException; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; -import java.io.IOException; import org.testng.annotations.Test; public class FuryObjectInputTest { diff --git a/java/fury-core/src/test/java/org/apache/fury/io/FuryObjectOutputTest.java b/java/fury-core/src/test/java/org/apache/fury/io/FuryObjectOutputTest.java index c19771c974..7da6aa96f4 100644 --- a/java/fury-core/src/test/java/org/apache/fury/io/FuryObjectOutputTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/io/FuryObjectOutputTest.java @@ -22,10 +22,10 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import java.io.IOException; import org.apache.fury.Fury; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; -import java.io.IOException; import org.testng.annotations.Test; public class FuryObjectOutputTest { diff --git a/java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java b/java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java index 23fd897a4c..6b1cc7fa47 100644 --- a/java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/memory/MemoryBufferTest.java @@ -22,9 +22,9 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import org.apache.fury.util.Platform; import java.nio.ByteBuffer; import java.util.Random; +import org.apache.fury.util.Platform; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/resolver/BlackListTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/BlackListTest.java index c940657274..341bd9803b 100644 --- a/java/fury-core/src/test/java/org/apache/fury/resolver/BlackListTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/resolver/BlackListTest.java @@ -19,12 +19,12 @@ package org.apache.fury.resolver; +import java.rmi.server.UnicastRemoteObject; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.config.Language; import org.apache.fury.exception.InsecureException; import org.apache.fury.util.Platform; -import java.rmi.server.UnicastRemoteObject; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/resolver/ClassResolverTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/ClassResolverTest.java index f889a4ec91..d591ca329a 100644 --- a/java/fury-core/src/test/java/org/apache/fury/resolver/ClassResolverTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/resolver/ClassResolverTest.java @@ -27,6 +27,23 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Primitives; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.builder.Generated; @@ -46,23 +63,6 @@ import org.apache.fury.test.bean.BeanB; import org.apache.fury.type.TypeUtils; import org.apache.fury.util.LoggerFactory; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ConcurrentHashMap; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.slf4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; @@ -231,7 +231,8 @@ public void testWriteClassName() { buffer.writerIndex(0); buffer.readerIndex(0); List fooList = - Arrays.asList(org.apache.fury.test.bean.Foo.create(), org.apache.fury.test.bean.Foo.create()); + Arrays.asList( + org.apache.fury.test.bean.Foo.create(), org.apache.fury.test.bean.Foo.create()); Assert.assertEquals(fury.deserialize(fury.serialize(fooList)), fooList); Assert.assertEquals(fury.deserialize(fury.serialize(fooList)), fooList); } diff --git a/java/fury-core/src/test/java/org/apache/fury/resolver/FieldResolverTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/FieldResolverTest.java index b1138a6d8c..830dd6a5cf 100644 --- a/java/fury-core/src/test/java/org/apache/fury/resolver/FieldResolverTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/resolver/FieldResolverTest.java @@ -26,12 +26,12 @@ import static org.apache.fury.resolver.FieldResolver.encodingBytesLength; import static org.apache.fury.resolver.FieldResolver.of; -import org.apache.fury.Fury; -import org.apache.fury.config.Language; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/resolver/MapRefResolverTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/MapRefResolverTest.java index d3c041bc26..c56811f3ba 100644 --- a/java/fury-core/src/test/java/org/apache/fury/resolver/MapRefResolverTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/resolver/MapRefResolverTest.java @@ -23,8 +23,8 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import org.apache.fury.memory.MemoryBuffer; import java.util.Map; +import org.apache.fury.memory.MemoryBuffer; import org.testng.annotations.Test; public class MapRefResolverTest { diff --git a/java/fury-core/src/test/java/org/apache/fury/resolver/MetaContextTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/MetaContextTest.java index ee1893b061..f39f339f1b 100644 --- a/java/fury-core/src/test/java/org/apache/fury/resolver/MetaContextTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/resolver/MetaContextTest.java @@ -20,6 +20,10 @@ package org.apache.fury.resolver; import com.google.common.collect.ImmutableList; +import java.util.ArrayList; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Data; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.config.CompatibleMode; @@ -27,10 +31,6 @@ import org.apache.fury.test.bean.BeanA; import org.apache.fury.test.bean.BeanB; import org.apache.fury.test.bean.Foo; -import java.util.ArrayList; -import java.util.List; -import lombok.AllArgsConstructor; -import lombok.Data; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/ArraySerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ArraySerializersTest.java index 46b2d7bbbc..2dba090809 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/ArraySerializersTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/ArraySerializersTest.java @@ -22,6 +22,11 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.config.FuryBuilder; @@ -29,11 +34,6 @@ import org.apache.fury.test.bean.ArraysData; import org.apache.fury.type.Descriptor; import org.apache.fury.util.ReflectionUtils; -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.List; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; import org.testng.annotations.Test; public class ArraySerializersTest extends FuryTestBase { diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/BufferSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/BufferSerializersTest.java index 509aea77d5..675d123504 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/BufferSerializersTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/BufferSerializersTest.java @@ -19,9 +19,9 @@ package org.apache.fury.serializer; +import java.nio.ByteBuffer; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; -import java.nio.ByteBuffer; import org.testng.annotations.Test; public class BufferSerializersTest extends FuryTestBase { diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/ClassUtils.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ClassUtils.java index ebe0008f5a..0844c8f160 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/ClassUtils.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/ClassUtils.java @@ -19,12 +19,6 @@ package org.apache.fury.serializer; -import org.apache.fury.test.bean.BeanA; -import org.apache.fury.test.bean.CollectionFields; -import org.apache.fury.test.bean.MapFields; -import org.apache.fury.test.bean.Struct; -import org.apache.fury.util.ClassLoaderUtils; -import org.apache.fury.util.ReflectionUtils; import java.io.ByteArrayOutputStream; import java.net.URL; import java.nio.file.Files; @@ -32,6 +26,12 @@ import java.nio.file.Paths; import javax.tools.JavaCompiler; import javax.tools.ToolProvider; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.CollectionFields; +import org.apache.fury.test.bean.MapFields; +import org.apache.fury.test.bean.Struct; +import org.apache.fury.util.ClassLoaderUtils; +import org.apache.fury.util.ReflectionUtils; import org.testng.Assert; public class ClassUtils { diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/CodegenCompatibleSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/CodegenCompatibleSerializerTest.java index 1217d15f8e..0a3f56ffae 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/CodegenCompatibleSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/CodegenCompatibleSerializerTest.java @@ -23,6 +23,10 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.stream.Collectors; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.config.CompatibleMode; @@ -34,10 +38,6 @@ import org.apache.fury.test.bean.Foo; import org.apache.fury.test.bean.MapFields; import org.apache.fury.util.ReflectionUtils; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/CodegenSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/CodegenSerializerTest.java index 9945d0c2b0..895595262d 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/CodegenSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/CodegenSerializerTest.java @@ -25,6 +25,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.config.CompatibleMode; @@ -32,12 +38,6 @@ import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; import org.apache.fury.test.bean.Cyclic; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/CompatibleSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/CompatibleSerializerTest.java index 72d9d9b059..0b3f0af210 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/CompatibleSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/CompatibleSerializerTest.java @@ -21,6 +21,14 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import lombok.Data; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.config.CompatibleMode; @@ -33,14 +41,6 @@ import org.apache.fury.test.bean.MapFields; import org.apache.fury.test.bean.Struct; import org.apache.fury.util.ReflectionUtils; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import lombok.Data; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/DuplicateFieldsTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/DuplicateFieldsTest.java index 8b38150bc6..ae87c01def 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/DuplicateFieldsTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/DuplicateFieldsTest.java @@ -21,6 +21,8 @@ import static org.testng.Assert.assertEquals; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.builder.CodecUtils; @@ -28,8 +30,6 @@ import org.apache.fury.config.Language; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; -import lombok.EqualsAndHashCode; -import lombok.ToString; import org.testng.annotations.Test; public class DuplicateFieldsTest extends FuryTestBase { diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/ExternalizableSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ExternalizableSerializerTest.java index d1f3602a19..a3c1ba596e 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/ExternalizableSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/ExternalizableSerializerTest.java @@ -21,10 +21,10 @@ import static org.testng.Assert.assertEquals; +import java.io.Externalizable; import org.apache.fury.Fury; import org.apache.fury.config.Language; import org.apache.fury.serializer.test.Factory; -import java.io.Externalizable; import org.testng.annotations.Test; public class ExternalizableSerializerTest { diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/ForwardSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ForwardSerializerTest.java index 0078e530ca..26322f3e14 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/ForwardSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/ForwardSerializerTest.java @@ -28,13 +28,13 @@ import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import org.apache.fury.Fury; import org.apache.fury.codegen.CompileUnit; import org.apache.fury.codegen.JaninoUtils; import org.apache.fury.test.bean.BeanA; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import org.testng.annotations.Test; public class ForwardSerializerTest { diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/JavaSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/JavaSerializerTest.java index 729beeaec0..6041228268 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/JavaSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/JavaSerializerTest.java @@ -19,10 +19,6 @@ package org.apache.fury.serializer; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.config.Language; -import org.apache.fury.memory.MemoryBuffer; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; @@ -30,6 +26,10 @@ import java.io.Serializable; import java.nio.ByteBuffer; import lombok.Data; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/JdkProxySerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/JdkProxySerializerTest.java index 4d0920e402..73df1bd41f 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/JdkProxySerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/JdkProxySerializerTest.java @@ -21,14 +21,14 @@ import static org.testng.Assert.assertEquals; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.config.Language; import java.io.Serializable; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.function.Function; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; import org.testng.annotations.Test; @SuppressWarnings({"unchecked", "rawtypes"}) diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/LambdaSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/LambdaSerializerTest.java index c63061d269..a65a3b3706 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/LambdaSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/LambdaSerializerTest.java @@ -24,13 +24,13 @@ import static org.testng.Assert.assertThrows; import static org.testng.Assert.assertTrue; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; import java.io.Serializable; import java.util.Arrays; import java.util.List; import java.util.function.BiFunction; import java.util.function.Function; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; import org.testng.annotations.Test; @SuppressWarnings("unchecked") diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/LocaleSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/LocaleSerializerTest.java index 0410d6a5d3..03347aafdf 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/LocaleSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/LocaleSerializerTest.java @@ -19,10 +19,10 @@ package org.apache.fury.serializer; +import java.util.Locale; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.config.Language; -import java.util.Locale; import org.testng.annotations.Test; public class LocaleSerializerTest extends FuryTestBase { diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/MetaSharedCompatibleTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/MetaSharedCompatibleTest.java index 8a979528e3..19320ba5c5 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/MetaSharedCompatibleTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/MetaSharedCompatibleTest.java @@ -23,6 +23,11 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.stream.Collectors; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.builder.MetaSharedCodecBuilder; @@ -36,11 +41,6 @@ import org.apache.fury.test.bean.Foo; import org.apache.fury.test.bean.MapFields; import org.apache.fury.util.ReflectionUtils; -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.stream.Collectors; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/ObjectSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ObjectSerializerTest.java index 5f86d557f9..b47c1afa46 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/ObjectSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/ObjectSerializerTest.java @@ -21,13 +21,13 @@ import static org.testng.Assert.assertEquals; +import lombok.Data; import org.apache.fury.Fury; import org.apache.fury.config.Language; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; import org.apache.fury.test.bean.Cyclic; import org.apache.fury.util.Preconditions; -import lombok.Data; import org.testng.annotations.Test; @SuppressWarnings("unchecked") diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/ObjectStreamSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ObjectStreamSerializerTest.java index d6bdd6bb4c..4ab263243b 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/ObjectStreamSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/ObjectStreamSerializerTest.java @@ -24,11 +24,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.config.Language; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.util.Preconditions; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -47,6 +42,11 @@ import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; import lombok.EqualsAndHashCode; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.Preconditions; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/OptionalSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/OptionalSerializersTest.java index 0809b23c59..0ef9be30e9 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/OptionalSerializersTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/OptionalSerializersTest.java @@ -19,13 +19,13 @@ package org.apache.fury.serializer; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.config.Language; import java.util.Optional; import java.util.OptionalDouble; import java.util.OptionalInt; import java.util.OptionalLong; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; import org.testng.annotations.Test; public class OptionalSerializersTest extends FuryTestBase { diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/ProtocolInteroperabilityTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ProtocolInteroperabilityTest.java index 855436d376..76de5e561c 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/ProtocolInteroperabilityTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/ProtocolInteroperabilityTest.java @@ -25,16 +25,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.config.CompatibleMode; -import org.apache.fury.config.Language; -import org.apache.fury.resolver.MetaContext; -import org.apache.fury.serializer.collection.CollectionSerializersTest; -import org.apache.fury.serializer.collection.MapSerializersTest; -import org.apache.fury.test.bean.BeanA; -import org.apache.fury.test.bean.BeanB; -import org.apache.fury.test.bean.MapFields; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -50,6 +40,16 @@ import java.util.function.Function; import lombok.AllArgsConstructor; import lombok.Data; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; +import org.apache.fury.resolver.MetaContext; +import org.apache.fury.serializer.collection.CollectionSerializersTest; +import org.apache.fury.serializer.collection.MapSerializersTest; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; +import org.apache.fury.test.bean.MapFields; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/ReplaceResolveSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/ReplaceResolveSerializerTest.java index 26243545d4..955639e78a 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/ReplaceResolveSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/ReplaceResolveSerializerTest.java @@ -26,10 +26,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.config.Language; -import org.apache.fury.util.Preconditions; import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; @@ -41,6 +37,10 @@ import java.util.Map; import lombok.AllArgsConstructor; import lombok.Data; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.util.Preconditions; import org.testng.annotations.Test; public class ReplaceResolveSerializerTest extends FuryTestBase { diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/SerializerFactoryTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/SerializerFactoryTest.java index c9cbf06d12..001aec5ba6 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/SerializerFactoryTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/SerializerFactoryTest.java @@ -24,10 +24,10 @@ import com.esotericsoftware.kryo.io.ByteBufferInput; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; +import lombok.Data; import org.apache.fury.Fury; import org.apache.fury.config.Language; import org.apache.fury.memory.MemoryBuffer; -import lombok.Data; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/SerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/SerializersTest.java index 9782312193..7a0a411174 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/SerializersTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/SerializersTest.java @@ -23,10 +23,6 @@ import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.config.FuryBuilder; -import org.apache.fury.config.Language; import java.math.BigDecimal; import java.math.BigInteger; import java.net.URI; @@ -41,6 +37,10 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Pattern; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.FuryBuilder; +import org.apache.fury.config.Language; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/StringSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/StringSerializerTest.java index a763084003..c2c26cae70 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/StringSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/StringSerializerTest.java @@ -24,6 +24,13 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import java.lang.reflect.Field; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentLinkedQueue; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.collection.Tuple2; @@ -34,13 +41,6 @@ import org.apache.fury.util.Platform; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.StringUtils; -import java.lang.reflect.Field; -import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ConcurrentLinkedQueue; import org.testng.Assert; import org.testng.SkipException; import org.testng.annotations.DataProvider; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/TimeSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/TimeSerializersTest.java index c05405ef4f..6688cf4cf5 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/TimeSerializersTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/TimeSerializersTest.java @@ -19,10 +19,6 @@ package org.apache.fury.serializer; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.config.Language; -import org.apache.fury.util.DateTimeUtils; import java.sql.Timestamp; import java.time.Duration; import java.time.Instant; @@ -43,6 +39,10 @@ import java.util.Date; import java.util.GregorianCalendar; import lombok.Data; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.util.DateTimeUtils; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/URLSerializerTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/URLSerializerTest.java index d7e78977ad..570ce6d3c1 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/URLSerializerTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/URLSerializerTest.java @@ -19,10 +19,10 @@ package org.apache.fury.serializer; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; import java.net.MalformedURLException; import java.net.URL; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/UnexistedClassSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/UnexistedClassSerializersTest.java index 1c95b35c6d..0575a8ac81 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/UnexistedClassSerializersTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/UnexistedClassSerializersTest.java @@ -23,6 +23,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; +import java.util.List; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.config.CompatibleMode; @@ -30,7 +31,6 @@ import org.apache.fury.config.Language; import org.apache.fury.resolver.MetaContext; import org.apache.fury.test.bean.Struct; -import java.util.List; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/ChildContainerSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/ChildContainerSerializersTest.java index 057d3211d9..cb86a0f190 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/ChildContainerSerializersTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/ChildContainerSerializersTest.java @@ -21,10 +21,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.config.CompatibleMode; -import org.apache.fury.config.Language; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.HashMap; @@ -36,6 +32,10 @@ import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; import lombok.Data; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.CompatibleMode; +import org.apache.fury.config.Language; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/CollectionSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/CollectionSerializersTest.java index b3a44611d2..226003e543 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/CollectionSerializersTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/CollectionSerializersTest.java @@ -28,13 +28,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.common.reflect.TypeToken; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.config.Language; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.serializer.collection.CollectionSerializers.JDKCompatibleCollectionSerializer; -import org.apache.fury.type.GenericType; import java.io.Serializable; import java.util.AbstractCollection; import java.util.ArrayDeque; @@ -63,6 +56,13 @@ import java.util.stream.LongStream; import lombok.AllArgsConstructor; import lombok.Data; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.collection.CollectionSerializers.JDKCompatibleCollectionSerializer; +import org.apache.fury.type.GenericType; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/MapSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/MapSerializersTest.java index b054889748..78826efafb 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/MapSerializersTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/MapSerializersTest.java @@ -26,13 +26,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.collection.MapEntry; -import org.apache.fury.config.Language; -import org.apache.fury.serializer.collection.CollectionSerializersTest.TestEnum; -import org.apache.fury.test.bean.MapFields; -import org.apache.fury.type.GenericType; import java.io.Serializable; import java.util.AbstractMap; import java.util.ArrayList; @@ -51,6 +44,13 @@ import java.util.concurrent.ConcurrentSkipListMap; import lombok.AllArgsConstructor; import lombok.Data; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.collection.MapEntry; +import org.apache.fury.config.Language; +import org.apache.fury.serializer.collection.CollectionSerializersTest.TestEnum; +import org.apache.fury.test.bean.MapFields; +import org.apache.fury.type.GenericType; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/SynchronizedSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/SynchronizedSerializersTest.java index 589f528c0c..774e8d6f46 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/SynchronizedSerializersTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/SynchronizedSerializersTest.java @@ -23,15 +23,6 @@ import static org.testng.Assert.assertTrue; import com.google.common.collect.ImmutableMap; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.config.Language; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.serializer.Serializer; -import org.apache.fury.test.bean.CollectionFields; -import org.apache.fury.util.Platform; -import org.apache.fury.util.ReflectionUtils; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -44,6 +35,15 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.test.bean.CollectionFields; +import org.apache.fury.util.Platform; +import org.apache.fury.util.ReflectionUtils; import org.testng.annotations.Test; public class SynchronizedSerializersTest extends FuryTestBase { diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/UnmodifiableSerializersTest.java b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/UnmodifiableSerializersTest.java index 8ff67ef244..2e6197c754 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/UnmodifiableSerializersTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/UnmodifiableSerializersTest.java @@ -24,16 +24,6 @@ import static org.testng.Assert.assertTrue; import com.google.common.collect.ImmutableMap; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.config.Language; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.serializer.Serializer; -import org.apache.fury.test.bean.CollectionFields; -import org.apache.fury.test.bean.MapFields; -import org.apache.fury.util.Platform; -import org.apache.fury.util.ReflectionUtils; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -51,6 +41,16 @@ import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListMap; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.config.Language; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.Serializer; +import org.apache.fury.test.bean.CollectionFields; +import org.apache.fury.test.bean.MapFields; +import org.apache.fury.util.Platform; +import org.apache.fury.util.ReflectionUtils; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/serializer/test/Inaccessible.java b/java/fury-core/src/test/java/org/apache/fury/serializer/test/Inaccessible.java index b6ea6e7355..956120f653 100644 --- a/java/fury-core/src/test/java/org/apache/fury/serializer/test/Inaccessible.java +++ b/java/fury-core/src/test/java/org/apache/fury/serializer/test/Inaccessible.java @@ -19,16 +19,16 @@ package org.apache.fury.serializer.test; -import org.apache.fury.util.Preconditions; import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import lombok.Data; +import org.apache.fury.util.Preconditions; /** - * Package-private class for testing {@link org.apache.fury.serializer.ExternalizableSerializer} when the - * serialized class is inaccessible to the serializer. + * Package-private class for testing {@link org.apache.fury.serializer.ExternalizableSerializer} + * when the serialized class is inaccessible to the serializer. */ @Data class Inaccessible implements Externalizable { diff --git a/java/fury-core/src/test/java/org/apache/fury/type/ClassDefTest.java b/java/fury-core/src/test/java/org/apache/fury/type/ClassDefTest.java index f0269d9401..07891ff421 100644 --- a/java/fury-core/src/test/java/org/apache/fury/type/ClassDefTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/type/ClassDefTest.java @@ -22,10 +22,6 @@ import static org.testng.Assert.assertEquals; import com.google.common.collect.ImmutableList; -import org.apache.fury.Fury; -import org.apache.fury.FuryTestBase; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.util.ReflectionUtils; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; @@ -33,6 +29,10 @@ import java.util.List; import java.util.Map; import java.util.TreeSet; +import org.apache.fury.Fury; +import org.apache.fury.FuryTestBase; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.ReflectionUtils; import org.testng.annotations.Test; public class ClassDefTest extends FuryTestBase { diff --git a/java/fury-core/src/test/java/org/apache/fury/type/DescriptorTest.java b/java/fury-core/src/test/java/org/apache/fury/type/DescriptorTest.java index 0fedc2adbb..13c22f7383 100644 --- a/java/fury-core/src/test/java/org/apache/fury/type/DescriptorTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/type/DescriptorTest.java @@ -20,8 +20,6 @@ package org.apache.fury.type; import com.google.common.reflect.TypeToken; -import org.apache.fury.codegen.CodeGenerator; -import org.apache.fury.test.bean.BeanA; import java.beans.IntrospectionException; import java.beans.Introspector; import java.lang.reflect.Field; @@ -29,6 +27,8 @@ import java.util.List; import java.util.SortedMap; import java.util.stream.Collectors; +import org.apache.fury.codegen.CodeGenerator; +import org.apache.fury.test.bean.BeanA; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/type/GenericsTest.java b/java/fury-core/src/test/java/org/apache/fury/type/GenericsTest.java index d71270b374..6c856af008 100644 --- a/java/fury-core/src/test/java/org/apache/fury/type/GenericsTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/type/GenericsTest.java @@ -20,13 +20,13 @@ package org.apache.fury.type; import com.google.common.collect.ImmutableList; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import org.apache.fury.Fury; import org.apache.fury.FuryTestBase; import org.apache.fury.TestUtils; import org.apache.fury.config.Language; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/type/TypeUtilsTest.java b/java/fury-core/src/test/java/org/apache/fury/type/TypeUtilsTest.java index 83e79ac026..342dc01c97 100644 --- a/java/fury-core/src/test/java/org/apache/fury/type/TypeUtilsTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/type/TypeUtilsTest.java @@ -23,9 +23,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.reflect.TypeToken; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.test.bean.BeanA; -import org.apache.fury.test.bean.BeanB; import java.lang.reflect.Type; import java.util.AbstractList; import java.util.ArrayList; @@ -38,6 +35,9 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/util/ClassLoaderUtilsTest.java b/java/fury-core/src/test/java/org/apache/fury/util/ClassLoaderUtilsTest.java index f307d2417c..1540461157 100644 --- a/java/fury-core/src/test/java/org/apache/fury/util/ClassLoaderUtilsTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/util/ClassLoaderUtilsTest.java @@ -19,11 +19,11 @@ package org.apache.fury.util; +import java.io.StringReader; import org.apache.fury.Fury; import org.apache.fury.codegen.CompileUnit; import org.apache.fury.codegen.JaninoUtils; import org.apache.fury.config.Language; -import java.io.StringReader; import org.codehaus.janino.SimpleCompiler; import org.testng.Assert; import org.testng.annotations.DataProvider; diff --git a/java/fury-core/src/test/java/org/apache/fury/util/FunctionsTest.java b/java/fury-core/src/test/java/org/apache/fury/util/FunctionsTest.java index 4702bc5fe7..95a85bdc9a 100644 --- a/java/fury-core/src/test/java/org/apache/fury/util/FunctionsTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/util/FunctionsTest.java @@ -19,14 +19,14 @@ package org.apache.fury.util; -import org.apache.fury.util.function.Functions; -import org.apache.fury.util.function.SerializableFunction; -import org.apache.fury.util.function.SerializableTriFunction; -import org.apache.fury.util.function.TriFunction; import java.util.ArrayList; import java.util.Collections; import java.util.function.Consumer; import java.util.function.Function; +import org.apache.fury.util.function.Functions; +import org.apache.fury.util.function.SerializableFunction; +import org.apache.fury.util.function.SerializableTriFunction; +import org.apache.fury.util.function.TriFunction; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-core/src/test/java/org/apache/fury/util/ReflectionUtilsTest.java b/java/fury-core/src/test/java/org/apache/fury/util/ReflectionUtilsTest.java index b26c129550..0bc089d3c3 100644 --- a/java/fury-core/src/test/java/org/apache/fury/util/ReflectionUtilsTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/util/ReflectionUtilsTest.java @@ -24,9 +24,9 @@ import static org.testng.Assert.assertTrue; import com.google.common.collect.ImmutableList; +import java.util.List; import org.apache.fury.test.bean.BeanA; import org.apache.fury.type.Descriptor; -import java.util.List; import org.testng.annotations.Test; public class ReflectionUtilsTest { diff --git a/java/fury-core/src/test/java/org/apache/fury/util/unsafe/JDKAccessTest.java b/java/fury-core/src/test/java/org/apache/fury/util/unsafe/JDKAccessTest.java index aa8795ef92..5dd30e69bb 100644 --- a/java/fury-core/src/test/java/org/apache/fury/util/unsafe/JDKAccessTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/util/unsafe/JDKAccessTest.java @@ -19,13 +19,13 @@ package org.apache.fury.util.unsafe; -import org.apache.fury.util.Platform; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; +import org.apache.fury.util.Platform; import org.testng.Assert; import org.testng.SkipException; import org.testng.annotations.Test; diff --git a/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayDataForEach.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayDataForEach.java index 7192cf36e8..fcb92d9154 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayDataForEach.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayDataForEach.java @@ -37,8 +37,8 @@ import org.apache.fury.util.function.SerializableFunction; /** - * Expression for iterate {@link org.apache.fury.format.row.ArrayData} with specified not null element - * action expression and null element action expression. + * Expression for iterate {@link org.apache.fury.format.row.ArrayData} with specified not null + * element action expression and null element action expression. * * @author chaokunyang */ diff --git a/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayEncoder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayEncoder.java index cd92274b85..356b414dc2 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayEncoder.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayEncoder.java @@ -19,8 +19,8 @@ package org.apache.fury.format.encoder; -import org.apache.fury.format.row.binary.BinaryArray; import org.apache.arrow.vector.types.pojo.Field; +import org.apache.fury.format.row.binary.BinaryArray; /** * Encoder to encode/decode object in the list container by toArray/fromArray row. diff --git a/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayEncoderBuilder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayEncoderBuilder.java index c90321b99a..e1e2e078e2 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayEncoderBuilder.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/encoder/ArrayEncoderBuilder.java @@ -23,6 +23,7 @@ import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; +import org.apache.arrow.vector.types.pojo.Field; import org.apache.fury.Fury; import org.apache.fury.codegen.CodeGenerator; import org.apache.fury.codegen.CodegenContext; @@ -34,7 +35,6 @@ import org.apache.fury.type.TypeUtils; import org.apache.fury.util.LoggerFactory; import org.apache.fury.util.StringUtils; -import org.apache.arrow.vector.types.pojo.Field; import org.slf4j.Logger; /** diff --git a/java/fury-format/src/main/java/org/apache/fury/format/encoder/BaseBinaryEncoderBuilder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/BaseBinaryEncoderBuilder.java index 47e3f1585d..bd14230389 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/encoder/BaseBinaryEncoderBuilder.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/encoder/BaseBinaryEncoderBuilder.java @@ -22,6 +22,15 @@ import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Objects; +import org.apache.arrow.vector.types.pojo.Field; +import org.apache.arrow.vector.types.pojo.Schema; import org.apache.fury.builder.CodecBuilder; import org.apache.fury.codegen.CodeGenerator; import org.apache.fury.codegen.CodegenContext; @@ -59,15 +68,6 @@ import org.apache.fury.util.Preconditions; import org.apache.fury.util.ReflectionUtils; import org.apache.fury.util.StringUtils; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Objects; -import org.apache.arrow.vector.types.pojo.Field; -import org.apache.arrow.vector.types.pojo.Schema; /** * Base encoder builder for {@link Row}, {@link ArrayData} and {@link MapData}. diff --git a/java/fury-format/src/main/java/org/apache/fury/format/encoder/Encoders.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/Encoders.java index 112fa9b8e1..5b6b888a2a 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/encoder/Encoders.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/encoder/Encoders.java @@ -22,6 +22,13 @@ import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; +import java.util.Collection; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import org.apache.arrow.util.Preconditions; +import org.apache.arrow.vector.types.pojo.Field; +import org.apache.arrow.vector.types.pojo.Schema; import org.apache.fury.Fury; import org.apache.fury.codegen.CodeGenerator; import org.apache.fury.codegen.CompileUnit; @@ -38,13 +45,6 @@ import org.apache.fury.memory.MemoryUtils; import org.apache.fury.type.TypeUtils; import org.apache.fury.util.LoggerFactory; -import java.util.Collection; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import org.apache.arrow.util.Preconditions; -import org.apache.arrow.vector.types.pojo.Field; -import org.apache.arrow.vector.types.pojo.Schema; import org.slf4j.Logger; /** diff --git a/java/fury-format/src/main/java/org/apache/fury/format/encoder/MapEncoder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/MapEncoder.java index 84a9bc108b..5ab299d111 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/encoder/MapEncoder.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/encoder/MapEncoder.java @@ -19,9 +19,9 @@ package org.apache.fury.format.encoder; +import org.apache.arrow.vector.types.pojo.Field; import org.apache.fury.format.row.binary.BinaryArray; import org.apache.fury.format.row.binary.BinaryMap; -import org.apache.arrow.vector.types.pojo.Field; /** * Encoder to encode/decode object in the map container by toMap/fromMap row. diff --git a/java/fury-format/src/main/java/org/apache/fury/format/encoder/MapEncoderBuilder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/MapEncoderBuilder.java index f1e4dde363..b4ba11e549 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/encoder/MapEncoderBuilder.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/encoder/MapEncoderBuilder.java @@ -23,6 +23,8 @@ import static org.apache.fury.type.TypeUtils.getRawType; import com.google.common.reflect.TypeToken; +import java.util.Map; +import org.apache.arrow.vector.types.pojo.Field; import org.apache.fury.Fury; import org.apache.fury.codegen.CodeGenerator; import org.apache.fury.codegen.CodegenContext; @@ -35,8 +37,6 @@ import org.apache.fury.type.TypeUtils; import org.apache.fury.util.LoggerFactory; import org.apache.fury.util.StringUtils; -import java.util.Map; -import org.apache.arrow.vector.types.pojo.Field; import org.slf4j.Logger; /** diff --git a/java/fury-format/src/main/java/org/apache/fury/format/encoder/RowEncoder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/RowEncoder.java index b1c2431af0..d8310e40e9 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/encoder/RowEncoder.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/encoder/RowEncoder.java @@ -19,8 +19,8 @@ package org.apache.fury.format.encoder; -import org.apache.fury.format.row.binary.BinaryRow; import org.apache.arrow.vector.types.pojo.Schema; +import org.apache.fury.format.row.binary.BinaryRow; /** * Encoder to encode/decode object to/from row. diff --git a/java/fury-format/src/main/java/org/apache/fury/format/encoder/RowEncoderBuilder.java b/java/fury-format/src/main/java/org/apache/fury/format/encoder/RowEncoderBuilder.java index 9c7bdc20e1..edf037aa4f 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/encoder/RowEncoderBuilder.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/encoder/RowEncoderBuilder.java @@ -24,6 +24,10 @@ import com.google.common.base.CaseFormat; import com.google.common.reflect.TypeToken; +import java.lang.reflect.Modifier; +import java.util.SortedMap; +import org.apache.arrow.vector.types.pojo.Field; +import org.apache.arrow.vector.types.pojo.Schema; import org.apache.fury.Fury; import org.apache.fury.builder.CodecBuilder; import org.apache.fury.codegen.CodeGenerator; @@ -48,10 +52,6 @@ import org.apache.fury.util.LoggerFactory; import org.apache.fury.util.Preconditions; import org.apache.fury.util.StringUtils; -import java.lang.reflect.Modifier; -import java.util.SortedMap; -import org.apache.arrow.vector.types.pojo.Field; -import org.apache.arrow.vector.types.pojo.Schema; import org.slf4j.Logger; /** diff --git a/java/fury-format/src/main/java/org/apache/fury/format/row/Getters.java b/java/fury-format/src/main/java/org/apache/fury/format/row/Getters.java index 679b7608db..9cb4639644 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/row/Getters.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/row/Getters.java @@ -19,9 +19,9 @@ package org.apache.fury.format.row; -import org.apache.fury.memory.MemoryBuffer; import java.math.BigDecimal; import org.apache.arrow.vector.types.pojo.Field; +import org.apache.fury.memory.MemoryBuffer; /** * Getter methods for row format. {@link #isNullAt(int)} must be checked before attempting to diff --git a/java/fury-format/src/main/java/org/apache/fury/format/row/ValueVisitor.java b/java/fury-format/src/main/java/org/apache/fury/format/row/ValueVisitor.java index 5de074c125..a02bbdf280 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/row/ValueVisitor.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/row/ValueVisitor.java @@ -19,9 +19,9 @@ package org.apache.fury.format.row; -import org.apache.fury.format.type.DefaultTypeVisitor; import java.util.function.Function; import org.apache.arrow.vector.types.pojo.ArrowType; +import org.apache.fury.format.type.DefaultTypeVisitor; /** * An arrow visitor to visit values in {@link Row} and {@link ArrayData}. diff --git a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java index 1c4428e24f..c8e263a0b9 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryArray.java @@ -27,6 +27,8 @@ import static org.apache.fury.format.type.DataTypes.PRIMITIVE_LONG_ARRAY_FIELD; import static org.apache.fury.format.type.DataTypes.PRIMITIVE_SHORT_ARRAY_FIELD; +import java.math.BigDecimal; +import org.apache.arrow.vector.types.pojo.Field; import org.apache.fury.format.row.ArrayData; import org.apache.fury.format.type.DataTypes; import org.apache.fury.memory.BitUtils; @@ -34,8 +36,6 @@ import org.apache.fury.memory.MemoryUtils; import org.apache.fury.util.Platform; import org.apache.fury.util.Preconditions; -import java.math.BigDecimal; -import org.apache.arrow.vector.types.pojo.Field; /** * Each array has four parts(8-byte aligned): [numElements][validity bits][values or diff --git a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java index fb9506e7d6..f79f09885e 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryMap.java @@ -19,13 +19,13 @@ package org.apache.fury.format.row.binary; +import java.nio.ByteBuffer; +import org.apache.arrow.vector.types.pojo.Field; import org.apache.fury.format.row.MapData; import org.apache.fury.format.type.DataTypes; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; import org.apache.fury.util.Platform; -import java.nio.ByteBuffer; -import org.apache.arrow.vector.types.pojo.Field; /** * An BinaryMap implementation of Map which is backed by two BinaryArray./FuryObjectOutput diff --git a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryRow.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryRow.java index c1a5e53847..194e200d6d 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryRow.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/BinaryRow.java @@ -21,18 +21,18 @@ import static org.apache.fury.util.Preconditions.checkArgument; -import org.apache.fury.format.row.Row; -import org.apache.fury.format.type.DataTypes; -import org.apache.fury.memory.BitUtils; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.util.Preconditions; import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; import org.apache.arrow.vector.types.pojo.ArrowType; import org.apache.arrow.vector.types.pojo.Field; import org.apache.arrow.vector.types.pojo.Schema; +import org.apache.fury.format.row.Row; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.memory.BitUtils; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.util.Preconditions; /** * A binary implementation of {@link Row} backed by binary buffer instead of java objects. diff --git a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/UnsafeTrait.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/UnsafeTrait.java index ce6893a2ab..e0714c1000 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/UnsafeTrait.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/UnsafeTrait.java @@ -21,17 +21,17 @@ import static org.apache.fury.util.DecimalUtils.DECIMAL_BYTE_LENGTH; -import org.apache.fury.format.row.Getters; -import org.apache.fury.format.row.Setters; -import org.apache.fury.format.type.DataTypes; -import org.apache.fury.format.vectorized.ArrowUtils; -import org.apache.fury.memory.MemoryBuffer; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.types.pojo.ArrowType; import org.apache.arrow.vector.types.pojo.Field; import org.apache.arrow.vector.util.DecimalUtility; +import org.apache.fury.format.row.Getters; +import org.apache.fury.format.row.Setters; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.format.vectorized.ArrowUtils; +import org.apache.fury.memory.MemoryBuffer; /** Internal to binary row format to reuse code, don't use it in anywhere else. */ abstract class UnsafeTrait implements Getters, Setters { diff --git a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java index 9437a92b18..5d201dba1b 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryArrayWriter.java @@ -27,14 +27,14 @@ import static org.apache.fury.format.type.DataTypes.PRIMITIVE_LONG_ARRAY_FIELD; import static org.apache.fury.format.type.DataTypes.PRIMITIVE_SHORT_ARRAY_FIELD; +import java.math.BigDecimal; +import org.apache.arrow.vector.types.pojo.ArrowType; +import org.apache.arrow.vector.types.pojo.Field; import org.apache.fury.format.row.binary.BinaryArray; import org.apache.fury.format.type.DataTypes; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; import org.apache.fury.util.Platform; -import java.math.BigDecimal; -import org.apache.arrow.vector.types.pojo.ArrowType; -import org.apache.arrow.vector.types.pojo.Field; /** * Writer for binary array. See {@link BinaryArray} diff --git a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryRowWriter.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryRowWriter.java index 710508962c..aa0f9d4a67 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryRowWriter.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryRowWriter.java @@ -21,12 +21,12 @@ import static org.apache.fury.memory.BitUtils.calculateBitmapWidthInBytes; -import org.apache.fury.format.row.binary.BinaryRow; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.memory.MemoryUtils; import java.math.BigDecimal; import org.apache.arrow.vector.types.pojo.ArrowType; import org.apache.arrow.vector.types.pojo.Schema; +import org.apache.fury.format.row.binary.BinaryRow; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; /** * Writer to write data into buffer using row format, see {@link BinaryRow}. diff --git a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryWriter.java b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryWriter.java index 19b61b054c..ba35fc2eb4 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryWriter.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/row/binary/writer/BinaryWriter.java @@ -19,13 +19,6 @@ package org.apache.fury.format.row.binary.writer; -import org.apache.fury.format.row.binary.BinaryArray; -import org.apache.fury.format.row.binary.BinaryMap; -import org.apache.fury.format.row.binary.BinaryRow; -import org.apache.fury.format.vectorized.ArrowUtils; -import org.apache.fury.memory.BitUtils; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.util.DecimalUtils; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -33,6 +26,13 @@ import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.types.pojo.ArrowType; import org.apache.arrow.vector.util.DecimalUtility; +import org.apache.fury.format.row.binary.BinaryArray; +import org.apache.fury.format.row.binary.BinaryMap; +import org.apache.fury.format.row.binary.BinaryRow; +import org.apache.fury.format.vectorized.ArrowUtils; +import org.apache.fury.memory.BitUtils; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.DecimalUtils; /** Base class for writing row-format structures. */ public abstract class BinaryWriter { diff --git a/java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java b/java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java index b0e7c4bbb5..1a0d1f5cc0 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/type/DataTypes.java @@ -21,12 +21,6 @@ import static org.apache.fury.util.Preconditions.checkArgument; -import org.apache.fury.exception.FuryException; -import org.apache.fury.io.FuryOutputStream; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.type.Type; -import org.apache.fury.util.DecimalUtils; -import org.apache.fury.util.Preconditions; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -46,6 +40,12 @@ import org.apache.arrow.vector.types.pojo.Field; import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.types.pojo.Schema; +import org.apache.fury.exception.FuryException; +import org.apache.fury.io.FuryOutputStream; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.type.Type; +import org.apache.fury.util.DecimalUtils; +import org.apache.fury.util.Preconditions; /** * Arrow data type utils. diff --git a/java/fury-format/src/main/java/org/apache/fury/format/type/TypeInference.java b/java/fury-format/src/main/java/org/apache/fury/format/type/TypeInference.java index b0d1824639..556db3a459 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/type/TypeInference.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/type/TypeInference.java @@ -24,11 +24,6 @@ import com.google.common.base.CaseFormat; import com.google.common.reflect.TypeToken; -import org.apache.fury.collection.Tuple2; -import org.apache.fury.type.Descriptor; -import org.apache.fury.type.TypeUtils; -import org.apache.fury.util.DecimalUtils; -import org.apache.fury.util.Preconditions; import java.util.Arrays; import java.util.LinkedHashSet; import java.util.List; @@ -43,6 +38,11 @@ import org.apache.arrow.vector.types.pojo.Field; import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.types.pojo.Schema; +import org.apache.fury.collection.Tuple2; +import org.apache.fury.type.Descriptor; +import org.apache.fury.type.TypeUtils; +import org.apache.fury.util.DecimalUtils; +import org.apache.fury.util.Preconditions; /** * Arrow related type inference. diff --git a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java index dd083ca011..4085173dfe 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowSerializers.java @@ -19,16 +19,6 @@ package org.apache.fury.format.vectorized; -import org.apache.fury.Fury; -import org.apache.fury.io.FuryReadableByteChannel; -import org.apache.fury.io.FuryWritableByteChannel; -import org.apache.fury.io.MockWritableByteChannel; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.serializer.BufferObject; -import org.apache.fury.serializer.Serializers.CrossLanguageCompatibleSerializer; -import org.apache.fury.type.Type; -import org.apache.fury.util.Platform; import java.io.IOException; import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; @@ -40,6 +30,16 @@ import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; import org.apache.arrow.vector.ipc.message.IpcOption; import org.apache.arrow.vector.ipc.message.MessageSerializer; +import org.apache.fury.Fury; +import org.apache.fury.io.FuryReadableByteChannel; +import org.apache.fury.io.FuryWritableByteChannel; +import org.apache.fury.io.MockWritableByteChannel; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.BufferObject; +import org.apache.fury.serializer.Serializers.CrossLanguageCompatibleSerializer; +import org.apache.fury.type.Type; +import org.apache.fury.util.Platform; /** * Serializers for apache arrow. diff --git a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTable.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTable.java index 7ce8900f8c..bc93ddd412 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTable.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTable.java @@ -19,13 +19,13 @@ package org.apache.fury.format.vectorized; -import org.apache.fury.util.Preconditions; import java.util.Iterator; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.VectorLoader; import org.apache.arrow.vector.VectorSchemaRoot; import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; import org.apache.arrow.vector.types.pojo.Schema; +import org.apache.fury.util.Preconditions; /** * A custom pyarrow-style arrow table by attach {@link Schema} to {@link ArrowRecordBatch}. diff --git a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java index bddf8ad678..40b192dbb9 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowTableSerializer.java @@ -19,12 +19,6 @@ package org.apache.fury.format.vectorized; -import org.apache.fury.Fury; -import org.apache.fury.io.FuryReadableByteChannel; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.serializer.Serializers; -import org.apache.fury.type.Type; -import org.apache.fury.util.Platform; import java.nio.channels.ReadableByteChannel; import java.util.ArrayList; import java.util.List; @@ -33,6 +27,12 @@ import org.apache.arrow.vector.VectorUnloader; import org.apache.arrow.vector.ipc.ArrowStreamReader; import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; +import org.apache.fury.Fury; +import org.apache.fury.io.FuryReadableByteChannel; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.serializer.Serializers; +import org.apache.fury.type.Type; +import org.apache.fury.util.Platform; /** * Serializers for {@link ArrowTable}. diff --git a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowUtils.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowUtils.java index 71c9120b70..6b196d3a4b 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowUtils.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowUtils.java @@ -19,10 +19,6 @@ package org.apache.fury.format.vectorized; -import org.apache.fury.io.FuryInputStream; -import org.apache.fury.io.FuryOutputStream; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.util.DecimalUtils; import java.io.IOException; import java.nio.channels.Channels; import org.apache.arrow.memory.ArrowBuf; @@ -33,6 +29,10 @@ import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; import org.apache.arrow.vector.ipc.message.MessageSerializer; import org.apache.arrow.vector.types.pojo.Schema; +import org.apache.fury.io.FuryInputStream; +import org.apache.fury.io.FuryOutputStream; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.util.DecimalUtils; /** * Arrow utils. diff --git a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java index eac0710d7d..4f1f5b0008 100644 --- a/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java +++ b/java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java @@ -17,11 +17,6 @@ package org.apache.fury.format.vectorized; -import org.apache.fury.format.row.ArrayData; -import org.apache.fury.format.row.Getters; -import org.apache.fury.format.row.MapData; -import org.apache.fury.format.row.Row; -import org.apache.fury.format.type.DefaultTypeVisitor; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.stream.IntStream; @@ -47,6 +42,11 @@ import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; import org.apache.arrow.vector.types.DateUnit; import org.apache.arrow.vector.types.pojo.ArrowType; +import org.apache.fury.format.row.ArrayData; +import org.apache.fury.format.row.Getters; +import org.apache.fury.format.row.MapData; +import org.apache.fury.format.row.Row; +import org.apache.fury.format.type.DefaultTypeVisitor; // Drived from // https://github.com/apache/spark/blob/921fb289f003317d89120faa6937e4abd359195c/sql/catalyst/src/main/scala/org/apache/spark/sql/execution/arrow/ArrowWriter.scala. diff --git a/java/fury-format/src/test/java/org/apache/fury/format/CrossLanguageTest.java b/java/fury-format/src/test/java/org/apache/fury/format/CrossLanguageTest.java index 6aafd0739f..c9a01fbdba 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/CrossLanguageTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/CrossLanguageTest.java @@ -25,21 +25,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.apache.fury.Fury; -import org.apache.fury.config.Language; -import org.apache.fury.format.encoder.Encoders; -import org.apache.fury.format.encoder.RowEncoder; -import org.apache.fury.format.row.binary.BinaryRow; -import org.apache.fury.format.type.DataTypes; -import org.apache.fury.format.vectorized.ArrowSerializers; -import org.apache.fury.format.vectorized.ArrowTable; -import org.apache.fury.format.vectorized.ArrowUtils; -import org.apache.fury.format.vectorized.ArrowWriter; -import org.apache.fury.io.FuryOutputStream; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.serializer.BufferObject; -import org.apache.fury.util.LoggerFactory; import java.io.IOException; import java.nio.channels.Channels; import java.nio.file.Files; @@ -68,6 +53,21 @@ import org.apache.arrow.vector.types.pojo.Field; import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.types.pojo.Schema; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.format.encoder.Encoders; +import org.apache.fury.format.encoder.RowEncoder; +import org.apache.fury.format.row.binary.BinaryRow; +import org.apache.fury.format.type.DataTypes; +import org.apache.fury.format.vectorized.ArrowSerializers; +import org.apache.fury.format.vectorized.ArrowTable; +import org.apache.fury.format.vectorized.ArrowUtils; +import org.apache.fury.format.vectorized.ArrowWriter; +import org.apache.fury.io.FuryOutputStream; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.serializer.BufferObject; +import org.apache.fury.util.LoggerFactory; import org.slf4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-format/src/test/java/org/apache/fury/format/encoder/ArrayEncoderTest.java b/java/fury-format/src/test/java/org/apache/fury/format/encoder/ArrayEncoderTest.java index c9ee5ef728..4d375e8480 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/encoder/ArrayEncoderTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/encoder/ArrayEncoderTest.java @@ -20,12 +20,12 @@ package org.apache.fury.format.encoder; import com.google.common.reflect.TypeToken; -import org.apache.fury.format.row.binary.BinaryArray; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.fury.format.row.binary.BinaryArray; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-format/src/test/java/org/apache/fury/format/encoder/CodecBuilderTest.java b/java/fury-format/src/test/java/org/apache/fury/format/encoder/CodecBuilderTest.java index 0feb7e606d..648009f78b 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/encoder/CodecBuilderTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/encoder/CodecBuilderTest.java @@ -21,10 +21,10 @@ import static org.testng.Assert.assertTrue; +import java.util.concurrent.atomic.AtomicLong; import org.apache.fury.test.bean.BeanA; import org.apache.fury.test.bean.BeanB; import org.apache.fury.test.bean.Foo; -import java.util.concurrent.atomic.AtomicLong; import org.testng.annotations.Test; public class CodecBuilderTest { diff --git a/java/fury-format/src/test/java/org/apache/fury/format/encoder/MapEncoderTest.java b/java/fury-format/src/test/java/org/apache/fury/format/encoder/MapEncoderTest.java index 9f19d3455b..b9bf07f590 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/encoder/MapEncoderTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/encoder/MapEncoderTest.java @@ -20,12 +20,12 @@ package org.apache.fury.format.encoder; import com.google.common.reflect.TypeToken; -import org.apache.fury.format.row.binary.BinaryMap; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.fury.format.row.binary.BinaryMap; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-format/src/test/java/org/apache/fury/format/encoder/RowEncoderTest.java b/java/fury-format/src/test/java/org/apache/fury/format/encoder/RowEncoderTest.java index 8cb4e078f0..973804d5b7 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/encoder/RowEncoderTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/encoder/RowEncoderTest.java @@ -20,17 +20,17 @@ package org.apache.fury.format.encoder; import com.google.common.collect.ImmutableMap; -import org.apache.fury.format.row.binary.BinaryRow; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.test.bean.BeanA; -import org.apache.fury.test.bean.BeanB; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import lombok.Data; +import org.apache.fury.format.row.binary.BinaryRow; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.test.bean.BeanB; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryArrayTest.java b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryArrayTest.java index 0972f82782..e133297e03 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryArrayTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryArrayTest.java @@ -19,10 +19,10 @@ package org.apache.fury.format.row.binary; +import java.util.Random; import org.apache.fury.format.row.binary.writer.BinaryArrayWriter; import org.apache.fury.format.type.DataTypes; import org.apache.fury.util.LoggerFactory; -import java.util.Random; import org.slf4j.Logger; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryMapTest.java b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryMapTest.java index ff560fa15b..be900bc026 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryMapTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryMapTest.java @@ -19,15 +19,15 @@ package org.apache.fury.format.row.binary; +import java.util.Collections; +import java.util.List; +import org.apache.arrow.vector.types.pojo.Field; +import org.apache.arrow.vector.types.pojo.Schema; import org.apache.fury.format.row.binary.writer.BinaryArrayWriter; import org.apache.fury.format.row.binary.writer.BinaryRowWriter; import org.apache.fury.format.type.DataTypes; import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; -import java.util.Collections; -import java.util.List; -import org.apache.arrow.vector.types.pojo.Field; -import org.apache.arrow.vector.types.pojo.Schema; import org.testng.annotations.Test; public class BinaryMapTest { diff --git a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java index 66e0c9e91b..5cf23c4238 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/row/binary/BinaryRowTest.java @@ -19,6 +19,11 @@ package org.apache.fury.format.row.binary; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.List; +import org.apache.arrow.vector.types.pojo.Field; +import org.apache.arrow.vector.types.pojo.Schema; import org.apache.fury.format.row.binary.writer.BinaryArrayWriter; import org.apache.fury.format.row.binary.writer.BinaryRowWriter; import org.apache.fury.format.type.DataTypes; @@ -26,11 +31,6 @@ import org.apache.fury.memory.MemoryUtils; import org.apache.fury.util.LoggerFactory; import org.apache.fury.util.Platform; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.List; -import org.apache.arrow.vector.types.pojo.Field; -import org.apache.arrow.vector.types.pojo.Schema; import org.slf4j.Logger; import org.testng.annotations.Test; diff --git a/java/fury-format/src/test/java/org/apache/fury/format/type/DataTypesTest.java b/java/fury-format/src/test/java/org/apache/fury/format/type/DataTypesTest.java index eb1cfddfb2..193bcfaae3 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/type/DataTypesTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/type/DataTypesTest.java @@ -21,10 +21,10 @@ import static org.testng.Assert.assertEquals; -import org.apache.fury.test.bean.BeanA; import java.nio.ByteBuffer; import org.apache.arrow.vector.types.pojo.ArrowType; import org.apache.arrow.vector.types.pojo.Schema; +import org.apache.fury.test.bean.BeanA; import org.testng.annotations.Test; public class DataTypesTest { diff --git a/java/fury-format/src/test/java/org/apache/fury/format/type/TypeInferenceTest.java b/java/fury-format/src/test/java/org/apache/fury/format/type/TypeInferenceTest.java index 06b5c55efd..66e148f9e1 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/type/TypeInferenceTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/type/TypeInferenceTest.java @@ -22,12 +22,12 @@ import static org.testng.Assert.assertEquals; import com.google.common.base.CaseFormat; -import org.apache.fury.test.bean.BeanA; -import org.apache.fury.type.Descriptor; import java.util.List; import java.util.stream.Collectors; import org.apache.arrow.vector.types.pojo.Field; import org.apache.arrow.vector.types.pojo.Schema; +import org.apache.fury.test.bean.BeanA; +import org.apache.fury.type.Descriptor; import org.testng.annotations.Test; public class TypeInferenceTest { diff --git a/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowSerializersTest.java b/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowSerializersTest.java index 30f02493e1..72cd98baa1 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowSerializersTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowSerializersTest.java @@ -21,13 +21,6 @@ import static org.testng.Assert.assertEquals; -import org.apache.fury.Fury; -import org.apache.fury.config.Language; -import org.apache.fury.io.FuryWritableByteChannel; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.memory.MemoryUtils; -import org.apache.fury.resolver.ClassResolver; -import org.apache.fury.serializer.BufferObject; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -38,6 +31,13 @@ import org.apache.arrow.vector.ipc.ArrowStreamWriter; import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; import org.apache.arrow.vector.types.pojo.Schema; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; +import org.apache.fury.io.FuryWritableByteChannel; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; +import org.apache.fury.resolver.ClassResolver; +import org.apache.fury.serializer.BufferObject; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowUtilsTest.java b/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowUtilsTest.java index 0566d8c000..7d902afe37 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowUtilsTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowUtilsTest.java @@ -21,8 +21,6 @@ import static org.testng.Assert.assertEquals; -import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.memory.MemoryUtils; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; @@ -33,6 +31,8 @@ import org.apache.arrow.vector.VectorUnloader; import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; import org.apache.arrow.vector.types.pojo.Field; +import org.apache.fury.memory.MemoryBuffer; +import org.apache.fury.memory.MemoryUtils; import org.testng.annotations.Test; public class ArrowUtilsTest { diff --git a/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowWriterTest.java b/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowWriterTest.java index 1e78d05201..e1c9c5dbe3 100644 --- a/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowWriterTest.java +++ b/java/fury-format/src/test/java/org/apache/fury/format/vectorized/ArrowWriterTest.java @@ -19,6 +19,8 @@ package org.apache.fury.format.vectorized; +import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; +import org.apache.arrow.vector.types.pojo.Schema; import org.apache.fury.format.encoder.Encoders; import org.apache.fury.format.encoder.RowEncoder; import org.apache.fury.format.row.binary.BinaryRow; @@ -26,8 +28,6 @@ import org.apache.fury.memory.MemoryBuffer; import org.apache.fury.memory.MemoryUtils; import org.apache.fury.test.bean.BeanA; -import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; -import org.apache.arrow.vector.types.pojo.Schema; import org.testng.annotations.Test; public class ArrowWriterTest { diff --git a/java/fury-testsuite/src/test/java/org/apache/fury/benchmark/DeserializationBenchmark.java b/java/fury-testsuite/src/test/java/org/apache/fury/benchmark/DeserializationBenchmark.java index 025a547109..fb5c1e5f10 100644 --- a/java/fury-testsuite/src/test/java/org/apache/fury/benchmark/DeserializationBenchmark.java +++ b/java/fury-testsuite/src/test/java/org/apache/fury/benchmark/DeserializationBenchmark.java @@ -24,6 +24,12 @@ import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.ArrayList; import org.apache.fury.Fury; import org.apache.fury.config.Language; import org.apache.fury.format.encoder.Encoders; @@ -31,12 +37,6 @@ import org.apache.fury.format.row.binary.BinaryRow; import org.apache.fury.test.bean.Foo; import org.apache.fury.util.LoggerFactory; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.util.ArrayList; import org.nustaq.serialization.FSTConfiguration; import org.objenesis.strategy.StdInstantiatorStrategy; import org.slf4j.Logger; diff --git a/java/fury-testsuite/src/test/java/org/apache/fury/benchmark/SerializationBenchmark.java b/java/fury-testsuite/src/test/java/org/apache/fury/benchmark/SerializationBenchmark.java index 9a8102bf1c..aa5031caaa 100644 --- a/java/fury-testsuite/src/test/java/org/apache/fury/benchmark/SerializationBenchmark.java +++ b/java/fury-testsuite/src/test/java/org/apache/fury/benchmark/SerializationBenchmark.java @@ -21,6 +21,9 @@ import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Output; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; import org.apache.fury.Fury; import org.apache.fury.config.Language; import org.apache.fury.format.encoder.Encoders; @@ -29,9 +32,6 @@ import org.apache.fury.memory.MemoryUtils; import org.apache.fury.test.bean.Foo; import org.apache.fury.util.LoggerFactory; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectOutputStream; import org.nustaq.serialization.FSTConfiguration; import org.slf4j.Logger; import org.testng.annotations.BeforeTest; diff --git a/java/fury-testsuite/src/test/java/org/apache/fury/test/DTOTest.java b/java/fury-testsuite/src/test/java/org/apache/fury/test/DTOTest.java index b72004e010..97167ecda5 100644 --- a/java/fury-testsuite/src/test/java/org/apache/fury/test/DTOTest.java +++ b/java/fury-testsuite/src/test/java/org/apache/fury/test/DTOTest.java @@ -19,14 +19,14 @@ package org.apache.fury.test; -import org.apache.fury.Fury; -import org.apache.fury.config.Language; import java.io.Serializable; import java.util.Date; import java.util.List; import java.util.Set; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.fury.Fury; +import org.apache.fury.config.Language; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/java/fury-testsuite/src/test/java/org/apache/fury/test/ReadResolveCircularTest.java b/java/fury-testsuite/src/test/java/org/apache/fury/test/ReadResolveCircularTest.java index 4552785a2a..44d3968142 100644 --- a/java/fury-testsuite/src/test/java/org/apache/fury/test/ReadResolveCircularTest.java +++ b/java/fury-testsuite/src/test/java/org/apache/fury/test/ReadResolveCircularTest.java @@ -19,12 +19,12 @@ package org.apache.fury.test; -import org.apache.fury.Fury; import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import org.apache.fury.Fury; import org.testng.annotations.Test; public class ReadResolveCircularTest { diff --git a/java/fury-testsuite/src/test/java/org/test/Org.java b/java/fury-testsuite/src/test/java/org/test/Org.java index 2a58b5efc8..7893cc1da2 100644 --- a/java/fury-testsuite/src/test/java/org/test/Org.java +++ b/java/fury-testsuite/src/test/java/org/test/Org.java @@ -19,11 +19,11 @@ package org.test; +import java.io.Serializable; +import java.util.List; import org.apache.fury.Fury; import org.apache.fury.config.CompatibleMode; import org.apache.fury.config.Language; -import java.io.Serializable; -import java.util.List; import org.testng.Assert; import org.testng.annotations.Test;