From 5866955d70c3e03f8aeeff44242cad82c6c049fa Mon Sep 17 00:00:00 2001 From: MrChang0 Date: Tue, 7 May 2024 12:55:51 +0800 Subject: [PATCH] rename UserContextResolver to UserContext --- .../apache/fury/AbstractThreadSafeFury.java | 5 ++-- .../main/java/org/apache/fury/BaseFury.java | 4 +-- .../src/main/java/org/apache/fury/Fury.java | 5 ++-- .../apache/fury/resolver/ClassResolver.java | 12 ++++----- .../fury/resolver/SerializationContext.java | 12 ++++----- ...rContextResolver.java => UserContext.java} | 4 +-- .../apache/fury/resolver/UserContextTest.java | 27 +++++++++---------- 7 files changed, 33 insertions(+), 36 deletions(-) rename java/fury-core/src/main/java/org/apache/fury/resolver/{UserContextResolver.java => UserContext.java} (93%) 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 360928bf1a..150ee11e36 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,7 +21,7 @@ import java.util.function.Consumer; import java.util.function.Function; -import org.apache.fury.resolver.UserContextResolver; +import org.apache.fury.resolver.UserContext; import org.apache.fury.serializer.Serializer; import org.apache.fury.serializer.SerializerFactory; @@ -62,8 +62,7 @@ public void setSerializerFactory(SerializerFactory serializerFactory) { } @Override - public void registerUserContext( - String name, Function userContextResolverCtr) { + public void registerUserContext(String name, Function userContextResolverCtr) { processCallback(fury -> fury.registerUserContext(name, userContextResolverCtr)); } diff --git a/java/fury-core/src/main/java/org/apache/fury/BaseFury.java b/java/fury-core/src/main/java/org/apache/fury/BaseFury.java index 0fa9a3feb6..fc38fd0fea 100644 --- a/java/fury-core/src/main/java/org/apache/fury/BaseFury.java +++ b/java/fury-core/src/main/java/org/apache/fury/BaseFury.java @@ -24,7 +24,7 @@ import org.apache.fury.io.FuryInputStream; import org.apache.fury.io.FuryReadableChannel; import org.apache.fury.memory.MemoryBuffer; -import org.apache.fury.resolver.UserContextResolver; +import org.apache.fury.resolver.UserContext; import org.apache.fury.serializer.BufferCallback; import org.apache.fury.serializer.Serializer; import org.apache.fury.serializer.SerializerFactory; @@ -81,7 +81,7 @@ public interface BaseFury { * @param name user context name to register * @param userContextResolverCtr constructor for usr context */ - void registerUserContext(String name, Function userContextResolverCtr); + void registerUserContext(String name, Function userContextResolverCtr); /** Return serialized obj as a byte array. */ byte[] serialize(Object obj); 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 76f295262c..9a9dec08ba 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 @@ -53,7 +53,7 @@ import org.apache.fury.resolver.NoRefResolver; import org.apache.fury.resolver.RefResolver; import org.apache.fury.resolver.SerializationContext; -import org.apache.fury.resolver.UserContextResolver; +import org.apache.fury.resolver.UserContext; import org.apache.fury.serializer.ArraySerializers; import org.apache.fury.serializer.BufferCallback; import org.apache.fury.serializer.BufferObject; @@ -187,8 +187,7 @@ public void setSerializerFactory(SerializerFactory serializerFactory) { } @Override - public void registerUserContext( - String name, Function userContextResolverCtr) { + public void registerUserContext(String name, Function userContextResolverCtr) { serializationContext.registerUserContextResolver(name, userContextResolverCtr.apply(this)); } 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 eee0b7d162..178e47dea3 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 @@ -1410,10 +1410,10 @@ public void writeClassDefs(MemoryBuffer buffer) { /** write user context by register order. */ public void writeUserContext(MemoryBuffer buffer) { - final Map userContextResolvers = + final Map userContextResolvers = fury.getSerializationContext().getUserContextResolvers(); - for (UserContextResolver userContextResolver : userContextResolvers.values()) { - userContextResolver.write(buffer); + for (UserContext userContext : userContextResolvers.values()) { + userContext.write(buffer); } } @@ -1457,10 +1457,10 @@ public void readClassDefs(MemoryBuffer buffer) { /** read user context by register order. */ public void readUserContext(MemoryBuffer buffer) { - final Map userContextResolvers = + final Map userContextResolvers = fury.getSerializationContext().getUserContextResolvers(); - for (UserContextResolver userContextResolver : userContextResolvers.values()) { - userContextResolver.read(buffer); + for (UserContext userContext : userContextResolvers.values()) { + userContext.read(buffer); } } 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 fe012592c8..8a006c1d05 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 @@ -33,7 +33,7 @@ public final class SerializationContext { private final IdentityHashMap objects = new IdentityHashMap<>(); private MetaContext metaContext; - private final Map userContextResolvers = new LinkedHashMap<>(); + private final Map userContextResolvers = new LinkedHashMap<>(); /** Return the previous value associated with key, or null. */ public Object add(Object key, Object value) { @@ -62,13 +62,13 @@ public void setMetaContext(MetaContext metaContext) { this.metaContext = metaContext; } - public Map getUserContextResolvers() { + public Map getUserContextResolvers() { return userContextResolvers; } - public void registerUserContextResolver(String name, UserContextResolver userContextResolver) { + public void registerUserContextResolver(String name, UserContext userContext) { Preconditions.checkState(!userContextResolvers.containsKey(name)); - userContextResolvers.put(name, userContextResolver); + userContextResolvers.put(name, userContext); } public void reset() { @@ -76,8 +76,8 @@ public void reset() { objects.clear(); } metaContext = null; - for (UserContextResolver userContextResolver : userContextResolvers.values()) { - userContextResolver.reset(); + for (UserContext userContext : userContextResolvers.values()) { + userContext.reset(); } } } diff --git a/java/fury-core/src/main/java/org/apache/fury/resolver/UserContextResolver.java b/java/fury-core/src/main/java/org/apache/fury/resolver/UserContext.java similarity index 93% rename from java/fury-core/src/main/java/org/apache/fury/resolver/UserContextResolver.java rename to java/fury-core/src/main/java/org/apache/fury/resolver/UserContext.java index 53d7e7c855..989e78a2fe 100644 --- a/java/fury-core/src/main/java/org/apache/fury/resolver/UserContextResolver.java +++ b/java/fury-core/src/main/java/org/apache/fury/resolver/UserContext.java @@ -23,11 +23,11 @@ import org.apache.fury.memory.MemoryBuffer; /** write/read user custom global data after metaContext data. */ -public abstract class UserContextResolver { +public abstract class UserContext { protected final Fury fury; - public UserContextResolver(Fury fury) { + public UserContext(Fury fury) { this.fury = fury; } diff --git a/java/fury-core/src/test/java/org/apache/fury/resolver/UserContextTest.java b/java/fury-core/src/test/java/org/apache/fury/resolver/UserContextTest.java index 101189219b..ef20f333b4 100644 --- a/java/fury-core/src/test/java/org/apache/fury/resolver/UserContextTest.java +++ b/java/fury-core/src/test/java/org/apache/fury/resolver/UserContextTest.java @@ -38,11 +38,11 @@ public class UserContextTest extends FuryTestBase { private static final int NUM = 10; - public static class StringUserContextResolver extends UserContextResolver { + public static class StringUserContext extends UserContext { public String data; - public StringUserContextResolver(Fury fury) { + public StringUserContext(Fury fury) { super(fury); } @@ -73,11 +73,11 @@ public FooSerializer(Fury fury, Class type) { @Override public void write(MemoryBuffer buffer, Foo value) { - final Map userContextResolvers = + final Map userContextResolvers = fury.getSerializationContext().getUserContextResolvers(); for (int i = 0; i < NUM; i++) { - final StringUserContextResolver userContextResolver = - (StringUserContextResolver) userContextResolvers.get(String.valueOf(i)); + final StringUserContext userContextResolver = + (StringUserContext) userContextResolvers.get(String.valueOf(i)); userContextResolver.data = getData(i); } serializer.write(buffer, value); @@ -85,11 +85,11 @@ public void write(MemoryBuffer buffer, Foo value) { @Override public Foo read(MemoryBuffer buffer) { - final Map userContextResolvers = + final Map userContextResolvers = fury.getSerializationContext().getUserContextResolvers(); for (int i = 0; i < NUM; i++) { - final StringUserContextResolver userContextResolver = - (StringUserContextResolver) userContextResolvers.get(String.valueOf(i)); + final StringUserContext userContextResolver = + (StringUserContext) userContextResolvers.get(String.valueOf(i)); Assert.assertEquals(userContextResolver.data, getData(i)); } return serializer.read(buffer); @@ -108,10 +108,10 @@ private Fury buildFury() { public void checkShareUserContext() { Fury fury = buildFury(); fury.registerSerializer(Foo.class, FooSerializer.class); - List resolvers = new ArrayList<>(NUM); + List resolvers = new ArrayList<>(NUM); for (int i = 0; i < NUM; i++) { - final StringUserContextResolver userContextResolver = new StringUserContextResolver(fury); - fury.registerUserContext(String.valueOf(i), StringUserContextResolver::new); + final StringUserContext userContextResolver = new StringUserContext(fury); + fury.registerUserContext(String.valueOf(i), StringUserContext::new); resolvers.add(userContextResolver); } final Foo o = Foo.create(); @@ -125,12 +125,11 @@ public void checkShareUserContext() { } } - private List getResolver(Fury fury, int num, boolean empty) { + private List getResolver(Fury fury, int num, boolean empty) { return IntStream.range(0, num) .mapToObj( idx -> { - final StringUserContextResolver userContextResolver = - new StringUserContextResolver(fury); + final StringUserContext userContextResolver = new StringUserContext(fury); if (!empty) { userContextResolver.data = getData(idx); }