Skip to content

[Java] put together all fury related config classes into config package #940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chaokunyang merged 4 commits into from
Oct 4, 2023
Merged

[Java] put together all fury related config classes into config package #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b41ef8
put together all fury related config
chaokunyang Oct 4, 2023
1a42a12
move CompatibleMode into config
chaokunyang Oct 4, 2023
d42c586
fix JDKCompatibilityTest
chaokunyang Oct 4, 2023
bb19cf9
fix JDKCompatibilityTest
chaokunyang Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/guide/java_object_graph_guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ if(JavaSerializer.serializedByJDK(bytes)){

## Trouble shooting
### Class inconsistency and class version check
If you create fury without setting `CompatibleMode` to `io.fury.serializer.CompatibleMode.COMPATIBLE`, and you got a strange
If you create fury without setting `CompatibleMode` to `io.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
Expand Down
7 changes: 4 additions & 3 deletions ...jdk_compatibility_tests/src/test/java/io/fury/integration_tests/JDKCompatibilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
package io.fury.integration_tests;

import io.fury.Fury;
import io.fury.Language;
import io.fury.serializer.CompatibleMode;
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 java.io.File;
Expand All @@ -32,7 +33,7 @@

public class JDKCompatibilityTest {

io.fury.Fury.FuryBuilder builder() {
FuryBuilder builder() {
return Fury.builder().withLanguage(Language.JAVA).requireClassRegistration(false);
}

Expand Down
2 changes: 1 addition & 1 deletion ...tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/RecordSerializersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import io.fury.Fury;
import io.fury.resolver.MetaContext;
import io.fury.serializer.CompatibleMode;
import io.fury.config.CompatibleMode;
import io.fury.test.bean.Struct;
import io.fury.util.record.RecordComponent;
import io.fury.util.record.RecordUtils;
Expand Down
2 changes: 1 addition & 1 deletion java/fury-benchmark/src/main/java/io/fury/benchmark/ZeroCopySuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
import com.esotericsoftware.kryo.io.UnsafeMemoryOutput;
import com.google.common.base.Preconditions;
import io.fury.Fury;
import io.fury.Language;
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;
Expand Down
7 changes: 4 additions & 3 deletions java/fury-benchmark/src/main/java/io/fury/benchmark/state/FuryState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import com.google.common.base.Preconditions;
import io.fury.Fury;
import io.fury.Language;
import io.fury.benchmark.IntsSerializationSuite;
import io.fury.benchmark.LongStringSerializationSuite;
import io.fury.benchmark.LongsSerializationSuite;
Expand All @@ -30,10 +29,12 @@
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.serializer.CompatibleMode;
import io.fury.util.LoggerFactory;
import java.nio.ByteBuffer;
import java.util.ArrayList;
Expand Down Expand Up @@ -117,7 +118,7 @@ public void setup() {
setupBuffer();
object = ObjectType.createObject(objectType, references);
Thread.currentThread().setContextClassLoader(object.getClass().getClassLoader());
Fury.FuryBuilder furyBuilder =
FuryBuilder furyBuilder =
Fury.builder()
.withLanguage(Language.JAVA)
.withClassVersionCheck(false)
Expand Down
Loading