rename UserContextResolver to UserContext

apache · May 8, 2024 · 6d86bcf · 6d86bcf
1 parent 5866955
commit 6d86bcf
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 24 deletions.
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
@@ -1410,9 +1410,8 @@ public void writeClassDefs(MemoryBuffer buffer) {
 
   /** write user context by register order. */
   public void writeUserContext(MemoryBuffer buffer) {
-    final Map<String, UserContext> userContextResolvers =
-        fury.getSerializationContext().getUserContextResolvers();
-    for (UserContext userContext : userContextResolvers.values()) {
+    final Map<String, UserContext> userContexts = fury.getSerializationContext().getUserContexts();
+    for (UserContext userContext : userContexts.values()) {
       userContext.write(buffer);
     }
   }
@@ -1457,9 +1456,8 @@ public void readClassDefs(MemoryBuffer buffer) {
 
   /** read user context by register order. */
   public void readUserContext(MemoryBuffer buffer) {
-    final Map<String, UserContext> userContextResolvers =
-        fury.getSerializationContext().getUserContextResolvers();
-    for (UserContext userContext : userContextResolvers.values()) {
+    final Map<String, UserContext> userContexts = fury.getSerializationContext().getUserContexts();
+    for (UserContext userContext : userContexts.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
@@ -33,7 +33,7 @@
 public final class SerializationContext {
   private final IdentityHashMap<Object, Object> objects = new IdentityHashMap<>();
   private MetaContext metaContext;
-  private final Map<String, UserContext> userContextResolvers = new LinkedHashMap<>();
+  private final Map<String, UserContext> userContexts = new LinkedHashMap<>();
 
   /** Return the previous value associated with <tt>key</tt>, or <tt>null</tt>. */
   public Object add(Object key, Object value) {
@@ -62,21 +62,21 @@ public void setMetaContext(MetaContext metaContext) {
     this.metaContext = metaContext;
   }
 
-  public Map<String, UserContext> getUserContextResolvers() {
-    return userContextResolvers;
+  public Map<String, UserContext> getUserContexts() {
+    return userContexts;
   }
 
   public void registerUserContextResolver(String name, UserContext userContext) {
-    Preconditions.checkState(!userContextResolvers.containsKey(name));
-    userContextResolvers.put(name, userContext);
+    Preconditions.checkState(!userContexts.containsKey(name));
+    userContexts.put(name, userContext);
   }
 
   public void reset() {
     if (objects.size() > 0) {
       objects.clear();
     }
     metaContext = null;
-    for (UserContext userContext : userContextResolvers.values()) {
+    for (UserContext userContext : userContexts.values()) {
       userContext.reset();
     }
   }

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
@@ -73,24 +73,24 @@ public FooSerializer(Fury fury, Class<Foo> type) {
 
     @Override
     public void write(MemoryBuffer buffer, Foo value) {
-      final Map<String, UserContext> userContextResolvers =
-          fury.getSerializationContext().getUserContextResolvers();
+      final Map<String, UserContext> userContexts =
+          fury.getSerializationContext().getUserContexts();
       for (int i = 0; i < NUM; i++) {
-        final StringUserContext userContextResolver =
-            (StringUserContext) userContextResolvers.get(String.valueOf(i));
-        userContextResolver.data = getData(i);
+        final StringUserContext userContext =
+            (StringUserContext) userContexts.get(String.valueOf(i));
+        userContext.data = getData(i);
       }
       serializer.write(buffer, value);
     }
 
     @Override
     public Foo read(MemoryBuffer buffer) {
-      final Map<String, UserContext> userContextResolvers =
-          fury.getSerializationContext().getUserContextResolvers();
+      final Map<String, UserContext> userContexts =
+          fury.getSerializationContext().getUserContexts();
       for (int i = 0; i < NUM; i++) {
-        final StringUserContext userContextResolver =
-            (StringUserContext) userContextResolvers.get(String.valueOf(i));
-        Assert.assertEquals(userContextResolver.data, getData(i));
+        final StringUserContext userContext =
+            (StringUserContext) userContexts.get(String.valueOf(i));
+        Assert.assertEquals(userContext.data, getData(i));
       }
       return serializer.read(buffer);
     }
@@ -110,9 +110,9 @@ public void checkShareUserContext() {
     fury.registerSerializer(Foo.class, FooSerializer.class);
     List<StringUserContext> resolvers = new ArrayList<>(NUM);
     for (int i = 0; i < NUM; i++) {
-      final StringUserContext userContextResolver = new StringUserContext(fury);
+      final StringUserContext userContext = new StringUserContext(fury);
       fury.registerUserContext(String.valueOf(i), StringUserContext::new);
-      resolvers.add(userContextResolver);
+      resolvers.add(userContext);
     }
     final Foo o = Foo.create();
     final byte[] bytes = fury.serialize(o);