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/fury.git
The following commit(s) were added to refs/heads/main by this push:
new 407b6582 feat(java): ThreadSafeFury add getClassResolver method (#1780)
407b6582 is described below
commit 407b65820fa3c1395b9643557faee30e39451f58
Author: funkye <[email protected]>
AuthorDate: Sun Aug 4 00:21:06 2024 +0800
feat(java): ThreadSafeFury add getClassResolver method (#1780)
<!--
**Thanks for contributing to Fury.**
**If this is your first time opening a PR on fury, you can refer to
[CONTRIBUTING.md](https://github.com/apache/fury/blob/main/CONTRIBUTING.md).**
Contribution Checklist
- The **Apache Fury (incubating)** community has restrictions on the
naming of pr titles. You can also find instructions in
[CONTRIBUTING.md](https://github.com/apache/fury/blob/main/CONTRIBUTING.md).
- Fury has a strong focus on performance. If the PR you submit will have
an impact on performance, please benchmark it first and provide the
benchmark result here.
-->
## What does this PR do?
<!-- Describe the purpose of this PR. -->
Because using ThreadSafeFury cannot get ClassResolver, so I submitted
this pr to increase some checklistener and other behavior
## Related issues
## Does this PR introduce any user-facing change?
<!--
If any user-facing interface changes, please [open an
issue](https://github.com/apache/fury/issues/new/choose) describing the
need to do so and update the document if necessary.
-->
- [ ] Does this PR introduce any public API change?
- [ ] Does this PR introduce any binary protocol compatibility change?
## Benchmark
<!--
When the PR has an impact on performance (if you don't know whether the
PR will have an impact on performance, you can submit the PR first, and
if it will have impact on performance, the code reviewer will explain
it), be sure to attach a benchmark data here.
-->
---
.../java/org/apache/fury/AbstractThreadSafeFury.java | 6 ++++++
.../src/main/java/org/apache/fury/ThreadSafeFury.java | 16 ++++++++++++++++
.../main/java/org/apache/fury/pool/ThreadPoolFury.java | 10 ++++++++++
.../src/test/java/org/apache/fury/FuryCopyTest.java | 2 ++
.../test/java/org/apache/fury/ThreadSafeFuryTest.java | 3 ++-
5 files changed, 36 insertions(+), 1 deletion(-)
diff --git
a/java/fury-core/src/main/java/org/apache/fury/AbstractThreadSafeFury.java
b/java/fury-core/src/main/java/org/apache/fury/AbstractThreadSafeFury.java
index 752a4dc2..656f3b9d 100644
--- a/java/fury-core/src/main/java/org/apache/fury/AbstractThreadSafeFury.java
+++ b/java/fury-core/src/main/java/org/apache/fury/AbstractThreadSafeFury.java
@@ -21,6 +21,7 @@ package org.apache.fury;
import java.util.function.Consumer;
import java.util.function.Function;
+import org.apache.fury.resolver.ClassChecker;
import org.apache.fury.serializer.Serializer;
import org.apache.fury.serializer.SerializerFactory;
@@ -65,5 +66,10 @@ public abstract class AbstractThreadSafeFury implements
ThreadSafeFury {
processCallback(fury -> fury.setSerializerFactory(serializerFactory));
}
+ @Override
+ public void setClassChecker(ClassChecker classChecker) {
+ processCallback(fury ->
fury.getClassResolver().setClassChecker(classChecker));
+ }
+
protected abstract void processCallback(Consumer<Fury> callback);
}
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 0f730297..569bcc3a 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
@@ -21,6 +21,8 @@ package org.apache.fury;
import java.nio.ByteBuffer;
import java.util.function.Function;
+import org.apache.fury.resolver.ClassChecker;
+import org.apache.fury.serializer.SerializerFactory;
import org.apache.fury.util.LoaderBinding;
/**
@@ -63,6 +65,20 @@ public interface ThreadSafeFury extends BaseFury {
/** Returns classLoader of serializer for current thread. */
ClassLoader getClassLoader();
+ /**
+ * Set ClassChecker of serializer for current thread only.
+ *
+ * @param classChecker {@link ClassChecker} for classChecker
+ */
+ void setClassChecker(ClassChecker classChecker);
+
+ /**
+ * Set tSerializerFactory of serializer for current thread only.
+ *
+ * @param serializerFactory {@link SerializerFactory} for serializerFactory
+ */
+ void setSerializerFactory(SerializerFactory serializerFactory);
+
/**
* Clean up classloader set by {@link #setClassLoader(ClassLoader,
LoaderBinding.StagingType)},
* <code>
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 f2ae405d..8afcdbd1 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
@@ -33,6 +33,7 @@ import org.apache.fury.logging.Logger;
import org.apache.fury.logging.LoggerFactory;
import org.apache.fury.memory.MemoryBuffer;
import org.apache.fury.memory.MemoryUtils;
+import org.apache.fury.resolver.ClassChecker;
import org.apache.fury.serializer.BufferCallback;
import org.apache.fury.util.LoaderBinding;
@@ -286,6 +287,15 @@ public class ThreadPoolFury extends AbstractThreadSafeFury
{
return furyPooledObjectFactory.getClassLoader();
}
+ @Override
+ public void setClassChecker(ClassChecker classChecker) {
+ execute(
+ fury -> {
+ fury.getClassResolver().setClassChecker(classChecker);
+ return null;
+ });
+ }
+
@Override
public void clearClassLoader(ClassLoader loader) {
furyPooledObjectFactory.clearClassLoader(loader);
diff --git a/java/fury-core/src/test/java/org/apache/fury/FuryCopyTest.java
b/java/fury-core/src/test/java/org/apache/fury/FuryCopyTest.java
index 14abfa94..4b1a7107 100644
--- a/java/fury-core/src/test/java/org/apache/fury/FuryCopyTest.java
+++ b/java/fury-core/src/test/java/org/apache/fury/FuryCopyTest.java
@@ -139,6 +139,8 @@ public class FuryCopyTest extends FuryTestBase {
AtomicReference<Throwable> ex = new AtomicReference<>();
ThreadLocalFury threadLocalFury =
builder().withCodegen(false).withRefCopy(true).buildThreadLocalFury();
+ threadLocalFury.setClassChecker((classResolver, className1) -> true);
+ threadLocalFury.setSerializerFactory((fury1, cls) -> null);
threadLocalFury.register(BeanA.class);
assetEqualsButNotSame(threadLocalFury.copy(beanA));
executor.execute(
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 8c35243b..34fda89a 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
@@ -223,7 +223,6 @@ public class ThreadSafeFuryTest extends FuryTestBase {
public void testClassDuplicateName(StagingType staging) {
ThreadSafeFury fury =
Fury.builder().requireClassRegistration(false).buildThreadSafeFury();
String className = "DuplicateStruct";
-
Class<?> structClass1 = Struct.createStructClass(className, 1);
Object struct1 = Struct.createPOJO(structClass1);
byte[] bytes1 = fury.serialize(struct1);
@@ -257,6 +256,8 @@ public class ThreadSafeFuryTest extends FuryTestBase {
CompletableFuture.runAsync(
() -> {
fury.setClassLoader(structClass1.getClassLoader(), staging);
+ fury.setClassChecker((classResolver, className1) -> true);
+ fury.setSerializerFactory((fury1, cls) -> null);
Assert.assertEquals(fury.deserialize(newBytes1), struct1);
})
.join();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
