rename UserContextResolver to UserContext

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<Fury, UserContextResolver> userContextResolverCtr) {
+  public void registerUserContext(String name, Function<Fury, UserContext> userContextResolverCtr) {
     processCallback(fury -> fury.registerUserContext(name, userContextResolverCtr));
   }
 

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<Fury, UserContextResolver> userContextResolverCtr);
+  void registerUserContext(String name, Function<Fury, UserContext> userContextResolverCtr);
 
   /** Return serialized <code>obj</code> as a byte array. */
   byte[] serialize(Object obj);

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<Fury, UserContextResolver> userContextResolverCtr) {
+  public void registerUserContext(String name, Function<Fury, UserContext> userContextResolverCtr) {
     serializationContext.registerUserContextResolver(name, userContextResolverCtr.apply(this));
   }
 

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<String, UserContextResolver> userContextResolvers =
+    final Map<String, UserContext> 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<String, UserContextResolver> userContextResolvers =
+    final Map<String, UserContext> userContextResolvers =
         fury.getSerializationContext().getUserContextResolvers();
-    for (UserContextResolver userContextResolver : userContextResolvers.values()) {
-      userContextResolver.read(buffer);
+    for (UserContext userContext : userContextResolvers.values()) {
+      userContext.read(buffer);
     }
   }
 

java/fury-core/src/main/java/org/apache/fury/resolver/SerializationContext.java

@@ -33,7 +33,7 @@
 public final class SerializationContext {
   private final IdentityHashMap<Object, Object> objects = new IdentityHashMap<>();
   private MetaContext metaContext;
-  private final Map<String, UserContextResolver> userContextResolvers = new LinkedHashMap<>();
+  private final Map<String, UserContext> userContextResolvers = new LinkedHashMap<>();
 
   /** Return the previous value associated with <tt>key</tt>, or <tt>null</tt>. */
   public Object add(Object key, Object value) {
@@ -62,22 +62,22 @@ public void setMetaContext(MetaContext metaContext) {
     this.metaContext = metaContext;
   }
 
-  public Map<String, UserContextResolver> getUserContextResolvers() {
+  public Map<String, UserContext> 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() {
     if (objects.size() > 0) {
       objects.clear();
     }
     metaContext = null;
-    for (UserContextResolver userContextResolver : userContextResolvers.values()) {
-      userContextResolver.reset();
+    for (UserContext userContext : userContextResolvers.values()) {
+      userContext.reset();
     }
   }
 }

java/fury-core/src/main/java/org/apache/fury/resolver/UserContextResolver.java → 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;
   }
 

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,23 +73,23 @@ public FooSerializer(Fury fury, Class<Foo> type) {
 
     @Override
     public void write(MemoryBuffer buffer, Foo value) {
-      final Map<String, UserContextResolver> userContextResolvers =
+      final Map<String, UserContext> 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);
     }
 
     @Override
     public Foo read(MemoryBuffer buffer) {
-      final Map<String, UserContextResolver> userContextResolvers =
+      final Map<String, UserContext> 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<StringUserContextResolver> resolvers = new ArrayList<>(NUM);
+    List<StringUserContext> 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<StringUserContextResolver> getResolver(Fury fury, int num, boolean empty) {
+  private List<StringUserContext> 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);
               }