This is an automated email from the ASF dual-hosted git repository.
chaokunyang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-fury.git
The following commit(s) were added to refs/heads/main by this push:
new 224cd03e [Java] Format integration tests code (#1263)
224cd03e is described below
commit 224cd03e15644de0f35530226af58a902f85579b
Author: Shawn Yang <[email protected]>
AuthorDate: Wed Dec 27 17:04:23 2023 +0800
[Java] Format integration tests code (#1263)
- Format integration tests code
- Upgrade spotless plugin to support JDK 17&21
- Format java code using upgraded spotless plugin
---
.github/workflows/ci.yml | 5 +++
ci/format.sh | 38 ++++++++++--------
integration_tests/graalvm_tests/pom.xml | 8 +++-
.../java/org/apache/fury/graalvm/Benchmark.java | 14 +++----
.../main/java/org/apache/fury/graalvm/Example.java | 8 ++--
.../src/main/java/org/apache/fury/graalvm/Foo.java | 13 +++----
.../main/java/org/apache/fury/graalvm/Struct.java | 29 ++++++++------
.../org/apache/fury/graalvm/ThreadSafeExample.java | 45 ++++++++++++----------
.../java/org/apache/fury/graalvm/record/Foo.java | 8 +---
.../apache/fury/graalvm/record/RecordExample.java | 12 ++----
.../apache/fury/graalvm/record/RecordExample2.java | 12 ++----
integration_tests/jdk_compatibility_tests/pom.xml | 9 +++--
.../integration_tests/JDKCompatibilityTest.java | 12 +++---
integration_tests/latest_jdk_tests/pom.xml | 9 +++--
.../ImmutableCollectionSerializersTest.java | 6 +--
.../integration_tests/RecordSerializersTest.java | 10 ++---
integration_tests/perftests/pom.xml | 9 ++++-
.../UserTypeDeserializeSuite.java | 2 +-
.../integration_tests/UserTypeSerializeSuite.java | 2 +-
.../integration_tests/state/FlatBuffersState.java | 12 +++---
.../integration_tests/state/ProtoBuffersState.java | 6 +--
.../state/FlatBuffersStateTest.java | 2 +-
.../org/apache/fury/benchmark/Identity2IdMap.java | 1 +
.../fury/benchmark/NewJava11StringSuite.java | 2 +-
.../org/apache/fury/benchmark/NewStringSuite.java | 2 +-
.../java/org/apache/fury/builder/Generated.java | 1 +
.../java/org/apache/fury/collection/Tuple2.java | 1 +
.../java/org/apache/fury/collection/Tuple3.java | 2 +
.../java/org/apache/fury/resolver/MetaContext.java | 1 +
.../fury/serializer/MetaSharedSerializer.java | 1 +
.../apache/fury/serializer/ObjectSerializer.java | 1 +
.../collection/AbstractCollectionSerializer.java | 1 +
.../serializer/collection/CollectionFlags.java | 3 ++
.../main/java/org/apache/fury/type/ClassDef.java | 1 +
.../main/java/org/apache/fury/type/TypeUtils.java | 1 +
.../org/apache/fury/codegen/JaninoUtilsTest.java | 4 +-
.../org/apache/fury/format/type/DataTypes.java | 1 +
.../fury-testsuite/src/test/java/org/test/Org.java | 1 +
java/pom.xml | 5 ++-
39 files changed, 167 insertions(+), 133 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index af21aecc..83f0693a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -202,6 +202,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
+ - name: Set up JDK ${{ matrix.java-version }}
+ uses: actions/setup-java@v3
+ with:
+ java-version: 21
+ distribution: 'oracle'
- name: Check License Header
uses: korandoru/hawkeye@v3
- name: Set up Python 3.8
diff --git a/ci/format.sh b/ci/format.sh
index 496867e1..5ae5f9ed 100755
--- a/ci/format.sh
+++ b/ci/format.sh
@@ -179,6 +179,24 @@ format_all_scripts() {
fi
}
+format_java() {
+ if command -v mvn >/dev/null ; then
+ echo "Maven installed"
+ cd "$ROOT/java"
+ mvn -T10 --no-transfer-progress spotless:apply
+ mvn -T10 --no-transfer-progress checkstyle:check
+ cd "$ROOT/integration_tests"
+ dirs=("graalvm_tests" "jdk_compatibility_tests" "latest_jdk_tests"
"perftests")
+ for d in "${dirs[@]}" ; do
+ pushd "$d"
+ mvn -T10 --no-transfer-progress spotless:apply
+ popd
+ done
+ else
+ echo "Maven not installed, skip java check"
+ fi
+}
+
# Format all files, and print the diff to stdout for travis.
format_all() {
format_all_scripts "${@}"
@@ -190,14 +208,7 @@ format_all() {
echo "$(date)" "format java...."
if command -v java >/dev/null; then
- if command -v mvn >/dev/null ; then
- echo "Maven installed"
- cd "$ROOT/java"
- mvn -T10 --no-transfer-progress spotless:apply
- mvn -T10 --no-transfer-progress checkstyle:check
- else
- echo "Maven not installed, skip java check"
- fi
+ format_java
fi
echo "$(date)" "format javascript...."
@@ -251,14 +262,7 @@ format_changed() {
if command -v java >/dev/null; then
if ! git diff --diff-filter=ACRM --quiet --exit-code "$MERGEBASE" --
'*.java' &>/dev/null; then
- if command -v mvn >/dev/null ; then
- echo "Maven installed"
- cd "$ROOT/java"
- mvn -T10 --no-transfer-progress spotless:apply
- mvn -T10 --no-transfer-progress checkstyle:check
- else
- echo "Maven not installed, skip java check"
- fi
+ format_java
fi
fi
@@ -293,6 +297,8 @@ elif [ "${1-}" == '--all-scripts' ]; then
elif [ "${1-}" == '--all' ]; then
format_all "${@}"
if [ -n "${FORMAT_SH_PRINT_DIFF-}" ]; then git --no-pager diff; fi
+elif [ "${1-}" == '--java' ]; then
+ format_java
else
# Add the origin remote if it doesn't exist
if ! git remote -v | grep -q origin; then
diff --git a/integration_tests/graalvm_tests/pom.xml
b/integration_tests/graalvm_tests/pom.xml
index 5584e699..c9dbc524 100644
--- a/integration_tests/graalvm_tests/pom.xml
+++ b/integration_tests/graalvm_tests/pom.xml
@@ -22,10 +22,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
+ <parent>
+ <groupId>org.apache.fury</groupId>
+ <artifactId>fury-parent</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <relativePath>../../java</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.fury</groupId>
<artifactId>graalvm_tests</artifactId>
- <version>0.5.0-SNAPSHOT</version>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
diff --git
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Benchmark.java
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Benchmark.java
index 674ef6b0..202296c2 100644
---
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Benchmark.java
+++
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Benchmark.java
@@ -19,10 +19,6 @@
package org.apache.fury.graalvm;
-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;
import java.io.IOException;
@@ -33,6 +29,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.fury.Fury;
+import org.apache.fury.io.ClassLoaderObjectInputStream;
+import org.apache.fury.util.Preconditions;
/**
* Benchmark suite for fury and jdk.
@@ -40,7 +39,8 @@ import java.util.Map;
* @author chaokunyang
*/
public class Benchmark {
- static ObjectInputFilter filter =
ObjectInputFilter.Config.createFilter("org.apache.fury.graalvm.*");
+ static ObjectInputFilter filter =
+ ObjectInputFilter.Config.createFilter("org.apache.fury.graalvm.*");
public static Object testJDKSerialization(Object o) {
byte[] bytes = jdkSerialize(o);
@@ -65,8 +65,8 @@ public class Benchmark {
public static Object jdkDeserialize(byte[] data) {
try (ByteArrayInputStream bis = new ByteArrayInputStream(data);
- ObjectInputStream objectInputStream =
- new
ClassLoaderObjectInputStream(Thread.currentThread().getContextClassLoader(),
bis)) {
+ ObjectInputStream objectInputStream =
+ new
ClassLoaderObjectInputStream(Thread.currentThread().getContextClassLoader(),
bis)) {
return objectInputStream.readObject();
} catch (Exception e) {
throw new RuntimeException(e);
diff --git
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Example.java
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Example.java
index fa733d86..e536fec9 100644
---
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Example.java
+++
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Example.java
@@ -19,11 +19,10 @@
package org.apache.fury.graalvm;
-import org.apache.fury.Fury;
-import org.apache.fury.util.Preconditions;
-
import java.util.List;
import java.util.Map;
+import org.apache.fury.Fury;
+import org.apache.fury.util.Preconditions;
public class Example {
static Fury fury;
@@ -36,7 +35,8 @@ public class Example {
public static void main(String[] args) {
Preconditions.checkArgument("abc".equals(fury.deserialize(fury.serialize("abc"))));
-
Preconditions.checkArgument(List.of(1,2,3).equals(fury.deserialize(fury.serialize(List.of(1,2,3)))));
+ Preconditions.checkArgument(
+ List.of(1, 2, 3).equals(fury.deserialize(fury.serialize(List.of(1, 2,
3)))));
Map<String, Integer> map = Map.of("k1", 1, "k2", 2);
Preconditions.checkArgument(map.equals(fury.deserialize(fury.serialize(map))));
Foo foo = new Foo(10, "abc", List.of("str1", "str2"), Map.of("k1", 10L,
"k2", 20L));
diff --git
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Foo.java
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Foo.java
index dc8d690a..aa32a475 100644
---
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Foo.java
+++
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Foo.java
@@ -42,8 +42,10 @@ public class Foo implements Serializable {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Foo foo = (Foo) o;
- return f1 == foo.f1 && Objects.equals(f2, foo.f2) && Objects.equals(f3,
foo.f3)
- && Objects.equals(f4, foo.f4);
+ return f1 == foo.f1
+ && Objects.equals(f2, foo.f2)
+ && Objects.equals(f3, foo.f3)
+ && Objects.equals(f4, foo.f4);
}
@Override
@@ -53,11 +55,6 @@ public class Foo implements Serializable {
@Override
public String toString() {
- return "Foo{" +
- "f1=" + f1 +
- ", f2='" + f2 + '\'' +
- ", f3=" + f3 +
- ", f4=" + f4 +
- '}';
+ return "Foo{" + "f1=" + f1 + ", f2='" + f2 + '\'' + ", f3=" + f3 + ", f4="
+ f4 + '}';
}
}
diff --git
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Struct.java
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Struct.java
index 6a2e1589..346bc9b3 100644
---
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Struct.java
+++
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/Struct.java
@@ -40,16 +40,16 @@ public class Struct implements Serializable {
Struct struct = new Struct();
struct.f1 = 10;
struct.f2 = 123456788;
- struct.f3 = 1/5f;
- struct.f4 = 1/7d;
+ struct.f3 = 1 / 5f;
+ struct.f4 = 1 / 7d;
struct.f5 = 11;
struct.f6 = 123456789;
- struct.f7 = 2/5f;
- struct.f8 = 2/7d;
+ struct.f7 = 2 / 5f;
+ struct.f8 = 2 / 7d;
struct.f9 = 12;
struct.f10 = 123456788;
- struct.f11 = 3/5f;
- struct.f12 = 3/7d;
+ struct.f11 = 3 / 5f;
+ struct.f12 = 3 / 7d;
return struct;
}
@@ -62,11 +62,18 @@ public class Struct implements Serializable {
return false;
}
Struct struct = (Struct) o;
- return f1 == struct.f1 && f2 == struct.f2 && Float.compare(f3, struct.f3)
== 0
- && Double.compare(f4, struct.f4) == 0 && f5 == struct.f5 && f6 ==
struct.f6
- && Float.compare(f7, struct.f7) == 0 && Double.compare(f8, struct.f8) == 0
- && f9 == struct.f9 && f10 == struct.f10 && Float.compare(f11,
struct.f11) == 0
- && Double.compare(f12, struct.f12) == 0;
+ return f1 == struct.f1
+ && f2 == struct.f2
+ && Float.compare(f3, struct.f3) == 0
+ && Double.compare(f4, struct.f4) == 0
+ && f5 == struct.f5
+ && f6 == struct.f6
+ && Float.compare(f7, struct.f7) == 0
+ && Double.compare(f8, struct.f8) == 0
+ && f9 == struct.f9
+ && f10 == struct.f10
+ && Float.compare(f11, struct.f11) == 0
+ && Double.compare(f12, struct.f12) == 0;
}
@Override
diff --git
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/ThreadSafeExample.java
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/ThreadSafeExample.java
index c1474572..332a9793 100644
---
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/ThreadSafeExample.java
+++
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/ThreadSafeExample.java
@@ -19,28 +19,29 @@
package org.apache.fury.graalvm;
-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;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+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;
public class ThreadSafeExample {
static ThreadSafeFury fury;
static {
- fury = new ThreadLocalFury(classLoader -> {
- Fury f = Fury.builder().requireClassRegistration(true).build();
- // register and generate serializer code.
- f.register(Foo.class, true);
- return f;
- });
+ fury =
+ new ThreadLocalFury(
+ classLoader -> {
+ Fury f = Fury.builder().requireClassRegistration(true).build();
+ // register and generate serializer code.
+ f.register(Foo.class, true);
+ return f;
+ });
System.out.println("Init fury at build time");
}
@@ -51,13 +52,14 @@ public class ThreadSafeExample {
ExecutorService service = Executors.newFixedThreadPool(10);
System.out.println("Start to submit tasks");
for (int i = 0; i < 1000; i++) {
- service.submit(() -> {
- try {
- threadSafeExample.test();
- } catch (Throwable t) {
- threadSafeExample.throwable = t;
- }
- });
+ service.submit(
+ () -> {
+ try {
+ threadSafeExample.test();
+ } catch (Throwable t) {
+ threadSafeExample.throwable = t;
+ }
+ });
}
Thread.sleep(3000);
service.shutdown();
@@ -71,9 +73,10 @@ public class ThreadSafeExample {
private volatile Throwable throwable;
- private void test() {
+ private void test() {
Preconditions.checkArgument("abc".equals(fury.deserialize(fury.serialize("abc"))));
-
Preconditions.checkArgument(List.of(1,2,3).equals(fury.deserialize(fury.serialize(List.of(1,2,3)))));
+ Preconditions.checkArgument(
+ List.of(1, 2, 3).equals(fury.deserialize(fury.serialize(List.of(1, 2,
3)))));
List<String> list = Collections.ofArrayList("a", "b", "c");
Preconditions.checkArgument(list.equals(fury.deserialize(fury.serialize(list))));
Map<String, Integer> map = Collections.ofHashMap("k1", 1, "k2", 2);
diff --git
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/Foo.java
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/Foo.java
index e0f853d8..0e5279ab 100644
---
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/Foo.java
+++
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/Foo.java
@@ -22,10 +22,4 @@ package org.apache.fury.graalvm.record;
import java.util.List;
import java.util.Map;
-public record Foo (
- int f1,
- String f2,
- List<String> f3,
- Map<String, Long> f4) {
-}
-
+public record Foo(int f1, String f2, List<String> f3, Map<String, Long> f4) {}
diff --git
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample.java
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample.java
index 7672b04a..f93f0c81 100644
---
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample.java
+++
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample.java
@@ -19,19 +19,13 @@
package org.apache.fury.graalvm.record;
-import org.apache.fury.Fury;
-import org.apache.fury.util.Preconditions;
-
import java.util.List;
import java.util.Map;
+import org.apache.fury.Fury;
+import org.apache.fury.util.Preconditions;
public class RecordExample {
- public record Record (
- int f1,
- String f2,
- List<String> f3,
- Map<String, Long> f4) {
- }
+ public record Record(int f1, String f2, List<String> f3, Map<String, Long>
f4) {}
static Fury fury;
diff --git
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample2.java
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample2.java
index ce82d370..7c57bdaf 100644
---
a/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample2.java
+++
b/integration_tests/graalvm_tests/src/main/java/org/apache/fury/graalvm/record/RecordExample2.java
@@ -19,19 +19,13 @@
package org.apache.fury.graalvm.record;
-import org.apache.fury.Fury;
-import org.apache.fury.util.Preconditions;
-
import java.util.List;
import java.util.Map;
+import org.apache.fury.Fury;
+import org.apache.fury.util.Preconditions;
public class RecordExample2 {
- private record Record (
- int f1,
- String f2,
- List<String> f3,
- Map<String, Long> f4) {
- }
+ private record Record(int f1, String f2, List<String> f3, Map<String, Long>
f4) {}
static Fury fury;
diff --git a/integration_tests/jdk_compatibility_tests/pom.xml
b/integration_tests/jdk_compatibility_tests/pom.xml
index 36e253c3..4c09dc32 100644
--- a/integration_tests/jdk_compatibility_tests/pom.xml
+++ b/integration_tests/jdk_compatibility_tests/pom.xml
@@ -22,11 +22,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
+ <parent>
+ <groupId>org.apache.fury</groupId>
+ <artifactId>fury-parent</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <relativePath>../../java</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.fury</groupId>
<artifactId>jdk_compatibility_tests</artifactId>
- <version>0.5.0-SNAPSHOT</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>
diff --git
a/integration_tests/jdk_compatibility_tests/src/test/java/org/apache/fury/integration_tests/JDKCompatibilityTest.java
b/integration_tests/jdk_compatibility_tests/src/test/java/org/apache/fury/integration_tests/JDKCompatibilityTest.java
index ea32843b..f191277f 100644
---
a/integration_tests/jdk_compatibility_tests/src/test/java/org/apache/fury/integration_tests/JDKCompatibilityTest.java
+++
b/integration_tests/jdk_compatibility_tests/src/test/java/org/apache/fury/integration_tests/JDKCompatibilityTest.java
@@ -19,18 +19,18 @@
package org.apache.fury.integration_tests;
-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;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
+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 org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/integration_tests/latest_jdk_tests/pom.xml
b/integration_tests/latest_jdk_tests/pom.xml
index 6e00f0b4..dca2a9ad 100644
--- a/integration_tests/latest_jdk_tests/pom.xml
+++ b/integration_tests/latest_jdk_tests/pom.xml
@@ -22,11 +22,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
+ <parent>
+ <groupId>org.apache.fury</groupId>
+ <artifactId>fury-parent</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <relativePath>../../java</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.fury</groupId>
<artifactId>latest_jdk_tests</artifactId>
- <version>0.5.0-SNAPSHOT</version>
<properties>
<maven.compiler.source>17</maven.compiler.source>
diff --git
a/integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/ImmutableCollectionSerializersTest.java
b/integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/ImmutableCollectionSerializersTest.java
index af80ff8d..d0e1a108 100644
---
a/integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/ImmutableCollectionSerializersTest.java
+++
b/integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/ImmutableCollectionSerializersTest.java
@@ -21,12 +21,12 @@ package org.apache.fury.integration_tests;
import static org.apache.fury.integration_tests.TestUtils.serDeCheck;
-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;
+import org.apache.fury.Fury;
+import org.apache.fury.test.bean.CollectionFields;
+import org.apache.fury.test.bean.MapFields;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git
a/integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/RecordSerializersTest.java
b/integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/RecordSerializersTest.java
index e63828c3..f17daa30 100644
---
a/integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/RecordSerializersTest.java
+++
b/integration_tests/latest_jdk_tests/src/test/java/org/apache/fury/integration_tests/RecordSerializersTest.java
@@ -22,17 +22,17 @@ package org.apache.fury.integration_tests;
import static org.apache.fury.collection.Collections.ofArrayList;
import static org.apache.fury.collection.Collections.ofHashMap;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
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;
-import java.util.Arrays;
-import java.util.List;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/integration_tests/perftests/pom.xml
b/integration_tests/perftests/pom.xml
index 639b57a1..798d7b5f 100644
--- a/integration_tests/perftests/pom.xml
+++ b/integration_tests/perftests/pom.xml
@@ -22,10 +22,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
+ <parent>
+ <groupId>org.apache.fury</groupId>
+ <artifactId>fury-parent</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <relativePath>../../java</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.fury</groupId>
+
<artifactId>perftests</artifactId>
- <version>0.5.0-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jmh.version>1.33</jmh.version>
diff --git
a/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/UserTypeDeserializeSuite.java
b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/UserTypeDeserializeSuite.java
index c9366ea1..4030d156 100644
---
a/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/UserTypeDeserializeSuite.java
+++
b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/UserTypeDeserializeSuite.java
@@ -19,13 +19,13 @@
package org.apache.fury.integration_tests;
+import java.io.IOException;
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;
import org.openjdk.jmh.annotations.BenchmarkMode;
diff --git
a/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/UserTypeSerializeSuite.java
b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/UserTypeSerializeSuite.java
index cfbe2e0b..ce28f64c 100644
---
a/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/UserTypeSerializeSuite.java
+++
b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/UserTypeSerializeSuite.java
@@ -19,6 +19,7 @@
package org.apache.fury.integration_tests;
+import java.io.IOException;
import org.apache.fury.benchmark.data.MediaContent;
import org.apache.fury.benchmark.data.Sample;
import org.apache.fury.benchmark.state.BufferType;
@@ -28,7 +29,6 @@ import
org.apache.fury.integration_tests.state.FlatBuffersState.FlatBuffersUserT
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;
import org.openjdk.jmh.annotations.CompilerControl;
diff --git
a/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/FlatBuffersState.java
b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/FlatBuffersState.java
index f714726d..e253c583 100644
---
a/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/FlatBuffersState.java
+++
b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/FlatBuffersState.java
@@ -21,6 +21,12 @@ package org.apache.fury.integration_tests.state;
import com.google.common.base.Preconditions;
import com.google.flatbuffers.FlatBufferBuilder;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
import org.apache.fury.benchmark.data.Image;
import org.apache.fury.benchmark.data.Media;
import org.apache.fury.benchmark.data.MediaContent;
@@ -37,12 +43,6 @@ 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;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.openjdk.jmh.annotations.Level;
import org.openjdk.jmh.annotations.Param;
diff --git
a/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/ProtoBuffersState.java
b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/ProtoBuffersState.java
index 23da96d3..a392f38b 100644
---
a/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/ProtoBuffersState.java
+++
b/integration_tests/perftests/src/main/java/org/apache/fury/integration_tests/state/ProtoBuffersState.java
@@ -21,6 +21,9 @@ package org.apache.fury.integration_tests.state;
import com.google.common.base.Preconditions;
import com.google.protobuf.InvalidProtocolBufferException;
+import java.util.HashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
import org.apache.fury.benchmark.data.Image;
import org.apache.fury.benchmark.data.Media;
import org.apache.fury.benchmark.data.MediaContent;
@@ -31,9 +34,6 @@ 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;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.openjdk.jmh.annotations.CompilerControl;
import org.openjdk.jmh.annotations.Fork;
diff --git
a/integration_tests/perftests/src/test/java/org/apache/fury/integration_tests/state/FlatBuffersStateTest.java
b/integration_tests/perftests/src/test/java/org/apache/fury/integration_tests/state/FlatBuffersStateTest.java
index f27ab87e..7846abb2 100644
---
a/integration_tests/perftests/src/test/java/org/apache/fury/integration_tests/state/FlatBuffersStateTest.java
+++
b/integration_tests/perftests/src/test/java/org/apache/fury/integration_tests/state/FlatBuffersStateTest.java
@@ -19,9 +19,9 @@
package org.apache.fury.integration_tests.state;
+import java.nio.ByteBuffer;
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/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 00cffc5d..77656c75 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
@@ -54,6 +54,7 @@ public class Identity2IdMap {
// applied
private List<Integer>
linearScanVals; // in case of too deep nesting, this one is filled and
linear search is
+
// applied
public Identity2IdMap(int initialSize) {
diff --git
a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/NewJava11StringSuite.java
b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/NewJava11StringSuite.java
index 5ab22e87..a0e71f98 100644
---
a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/NewJava11StringSuite.java
+++
b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/NewJava11StringSuite.java
@@ -43,7 +43,7 @@ public class NewJava11StringSuite {
}
private static final long STRING_VALUE_FIELD_OFFSET =
- ReflectionUtils.getFieldOffset(String.class, "value");;
+ ReflectionUtils.getFieldOffset(String.class, "value");
private static final long STRING_CODER_FIELD_OFFSET =
ReflectionUtils.getFieldOffset(String.class, "coder");
diff --git
a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/NewStringSuite.java
b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/NewStringSuite.java
index 539f4013..e289cb48 100644
---
a/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/NewStringSuite.java
+++
b/java/fury-benchmark/src/main/java/org/apache/fury/benchmark/NewStringSuite.java
@@ -42,7 +42,7 @@ public class NewStringSuite {
}
private static final long STRING_VALUE_FIELD_OFFSET =
- ReflectionUtils.getFieldOffset(String.class, "value");;
+ ReflectionUtils.getFieldOffset(String.class, "value");
private static String stubStr = new String(new char[] {Character.MAX_VALUE,
Character.MIN_VALUE});
// @Benchmark
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 92ae59ca..e9a0da8a 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
@@ -104,6 +104,7 @@ public interface Generated {
/** 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}. */
public Serializer serializer;
diff --git
a/java/fury-core/src/main/java/org/apache/fury/collection/Tuple2.java
b/java/fury-core/src/main/java/org/apache/fury/collection/Tuple2.java
index 2b200a3a..8e011d25 100644
--- a/java/fury-core/src/main/java/org/apache/fury/collection/Tuple2.java
+++ b/java/fury-core/src/main/java/org/apache/fury/collection/Tuple2.java
@@ -28,6 +28,7 @@ public class Tuple2<T0, T1> implements Serializable {
/** Field 0 of the tuple. */
public T0 f0;
+
/** Field 1 of the tuple. */
public T1 f1;
diff --git
a/java/fury-core/src/main/java/org/apache/fury/collection/Tuple3.java
b/java/fury-core/src/main/java/org/apache/fury/collection/Tuple3.java
index fc496417..f5511605 100644
--- a/java/fury-core/src/main/java/org/apache/fury/collection/Tuple3.java
+++ b/java/fury-core/src/main/java/org/apache/fury/collection/Tuple3.java
@@ -27,8 +27,10 @@ public class Tuple3<T0, T1, T2> implements Serializable {
/** Field 0 of the tuple. */
public T0 f0;
+
/** Field 1 of the tuple. */
public T1 f1;
+
/** Field 1 of the tuple. */
public T2 f2;
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 692d760e..9ce4371a 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
@@ -34,6 +34,7 @@ import org.apache.fury.type.ClassDef;
public class MetaContext {
/** Classes which has sent definitions to peer. */
public final IdentityObjectIntMap<Class<?>> classMap = new
IdentityObjectIntMap<>(8, 0.4f);
+
/** Class definitions read from peer. */
public final List<ClassDef> readClassDefs = new ArrayList<>();
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 da699402..1483a50a 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
@@ -70,6 +70,7 @@ import org.apache.fury.util.record.RecordUtils;
@SuppressWarnings({"unchecked"})
public class MetaSharedSerializer<T> extends Serializer<T> {
private final ObjectSerializer.FinalTypeField[] finalFields;
+
/**
* Whether write class def for non-inner final types.
*
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 d6716a55..7d99b59c 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
@@ -72,6 +72,7 @@ public final class ObjectSerializer<T> extends Serializer<T> {
private final boolean isRecord;
private final RecordInfo recordInfo;
private final FinalTypeField[] finalFields;
+
/**
* Whether write class def for non-inner final types.
*
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 0fdd3d6a..bba93920 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
@@ -47,6 +47,7 @@ public abstract class AbstractCollectionSerializer<T> extends
Serializer<T> {
// TODO remove elemSerializer, support generics in CompatibleSerializer.
private Serializer<?> elemSerializer;
protected final ClassInfoHolder elementClassInfoHolder;
+
// For subclass whose element type are instantiated already, such as
// `Subclass extends ArrayList<String>`. If declared `Collection` doesn't
specify
// instantiated element type, then the serialization will need to write this
element
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionFlags.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionFlags.java
index 6d923cf1..db5fbc47 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionFlags.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/CollectionFlags.java
@@ -34,10 +34,13 @@ package org.apache.fury.serializer.collection;
public class CollectionFlags {
/** Whether track elements ref. */
public static int TRACKING_REF = 0b1;
+
/** Whether collection has null. */
public static int HAS_NULL = 0b10;
+
/** Whether collection elements type is not declare type. */
public static int NOT_DECL_ELEMENT_TYPE = 0b100;
+
/** Whether collection elements type different. */
public static int NOT_SAME_TYPE = 0b1000;
}
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 1bb12975..cf60b721 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
@@ -302,6 +302,7 @@ public class ClassDef implements Serializable {
public static class FieldInfo implements Serializable {
/** where are current field defined. */
private final String definedClass;
+
/** Name of a field. */
private final String fieldName;
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 b51e4586..687cef9c 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
@@ -119,6 +119,7 @@ public class TypeUtils {
public static final TypeToken<?> OBJECT_ARRAY_TYPE =
TypeToken.of(Object[].class);
public static final TypeToken<?> CLASS_TYPE = TypeToken.of(Class.class);
+
/**
* bean fields should all be in SUPPORTED_TYPES, enum,
array/ITERABLE_TYPE/MAP_TYPE type, bean
* type.
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 bfb039ff..71fc566a 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
@@ -144,7 +144,9 @@ public class JaninoUtilsTest {
@Test
public void testJaninoClass()
- throws CompileException, ClassNotFoundException, IllegalAccessException,
+ throws CompileException,
+ ClassNotFoundException,
+ IllegalAccessException,
InstantiationException {
SimpleCompiler compiler = new SimpleCompiler();
String code =
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 1a0d1f5c..6c5e89f6 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
@@ -460,6 +460,7 @@ public class DataTypes {
public static Field structField(String name, boolean nullable, List<Field>
fields) {
return field(name, nullable, ArrowType.Struct.INSTANCE, fields);
}
+
/* ========================= struct field utils end
========================= */
public static Field fieldOfSchema(Schema schema, int index) {
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 7893cc1d..0e893e5b 100644
--- a/java/fury-testsuite/src/test/java/org/test/Org.java
+++ b/java/fury-testsuite/src/test/java/org/test/Org.java
@@ -29,6 +29,7 @@ import org.testng.annotations.Test;
public class Org implements Serializable {
private static final long serialVersionUID = 1L;
+
// constructor
public Org() {}
diff --git a/java/pom.xml b/java/pom.xml
index f51f3cbc..03339ab9 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -71,7 +71,7 @@
<janino.version>3.1.10</janino.version>
<commons_codec.version>1.13</commons_codec.version>
<fury.java.rootdir>${basedir}</fury.java.rootdir>
- <maven-spotless-plugin.version>2.5.0</maven-spotless-plugin.version>
+ <maven-spotless-plugin.version>2.41.1</maven-spotless-plugin.version>
</properties>
<dependencyManagement>
@@ -246,7 +246,8 @@
<configuration>
<java>
<googleJavaFormat>
- <version>1.7</version>
+ <!-- 1.19.1 support JDK21 -->
+ <version>1.19.1</version>
<style>GOOGLE</style>
</googleJavaFormat>
</java>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
