Skip to content

Commit 6d86bcf

Browse files
committed
rename UserContextResolver to UserContext
1 parent 5866955 commit 6d86bcf

File tree

3 files changed

+22
-24
lines changed

3 files changed

+22
-24
lines changed

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -1410,9 +1410,8 @@ public void writeClassDefs(MemoryBuffer buffer) {
14101410

14111411
/** write user context by register order. */
14121412
public void writeUserContext(MemoryBuffer buffer) {
1413-
final Map<String, UserContext> userContextResolvers =
1414-
fury.getSerializationContext().getUserContextResolvers();
1415-
for (UserContext userContext : userContextResolvers.values()) {
1413+
final Map<String, UserContext> userContexts = fury.getSerializationContext().getUserContexts();
1414+
for (UserContext userContext : userContexts.values()) {
14161415
userContext.write(buffer);
14171416
}
14181417
}
@@ -1457,9 +1456,8 @@ public void readClassDefs(MemoryBuffer buffer) {
14571456

14581457
/** read user context by register order. */
14591458
public void readUserContext(MemoryBuffer buffer) {
1460-
final Map<String, UserContext> userContextResolvers =
1461-
fury.getSerializationContext().getUserContextResolvers();
1462-
for (UserContext userContext : userContextResolvers.values()) {
1459+
final Map<String, UserContext> userContexts = fury.getSerializationContext().getUserContexts();
1460+
for (UserContext userContext : userContexts.values()) {
14631461
userContext.read(buffer);
14641462
}
14651463
}

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
public final class SerializationContext {
3434
private final IdentityHashMap<Object, Object> objects = new IdentityHashMap<>();
3535
private MetaContext metaContext;
36-
private final Map<String, UserContext> userContextResolvers = new LinkedHashMap<>();
36+
private final Map<String, UserContext> userContexts = new LinkedHashMap<>();
3737

3838
/** Return the previous value associated with <tt>key</tt>, or <tt>null</tt>. */
3939
public Object add(Object key, Object value) {
@@ -62,21 +62,21 @@ public void setMetaContext(MetaContext metaContext) {
6262
this.metaContext = metaContext;
6363
}
6464

65-
public Map<String, UserContext> getUserContextResolvers() {
66-
return userContextResolvers;
65+
public Map<String, UserContext> getUserContexts() {
66+
return userContexts;
6767
}
6868

6969
public void registerUserContextResolver(String name, UserContext userContext) {
70-
Preconditions.checkState(!userContextResolvers.containsKey(name));
71-
userContextResolvers.put(name, userContext);
70+
Preconditions.checkState(!userContexts.containsKey(name));
71+
userContexts.put(name, userContext);
7272
}
7373

7474
public void reset() {
7575
if (objects.size() > 0) {
7676
objects.clear();
7777
}
7878
metaContext = null;
79-
for (UserContext userContext : userContextResolvers.values()) {
79+
for (UserContext userContext : userContexts.values()) {
8080
userContext.reset();
8181
}
8282
}

java/fury-core/src/test/java/org/apache/fury/resolver/UserContextTest.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -73,24 +73,24 @@ public FooSerializer(Fury fury, Class<Foo> type) {
7373

7474
@Override
7575
public void write(MemoryBuffer buffer, Foo value) {
76-
final Map<String, UserContext> userContextResolvers =
77-
fury.getSerializationContext().getUserContextResolvers();
76+
final Map<String, UserContext> userContexts =
77+
fury.getSerializationContext().getUserContexts();
7878
for (int i = 0; i < NUM; i++) {
79-
final StringUserContext userContextResolver =
80-
(StringUserContext) userContextResolvers.get(String.valueOf(i));
81-
userContextResolver.data = getData(i);
79+
final StringUserContext userContext =
80+
(StringUserContext) userContexts.get(String.valueOf(i));
81+
userContext.data = getData(i);
8282
}
8383
serializer.write(buffer, value);
8484
}
8585

8686
@Override
8787
public Foo read(MemoryBuffer buffer) {
88-
final Map<String, UserContext> userContextResolvers =
89-
fury.getSerializationContext().getUserContextResolvers();
88+
final Map<String, UserContext> userContexts =
89+
fury.getSerializationContext().getUserContexts();
9090
for (int i = 0; i < NUM; i++) {
91-
final StringUserContext userContextResolver =
92-
(StringUserContext) userContextResolvers.get(String.valueOf(i));
93-
Assert.assertEquals(userContextResolver.data, getData(i));
91+
final StringUserContext userContext =
92+
(StringUserContext) userContexts.get(String.valueOf(i));
93+
Assert.assertEquals(userContext.data, getData(i));
9494
}
9595
return serializer.read(buffer);
9696
}
@@ -110,9 +110,9 @@ public void checkShareUserContext() {
110110
fury.registerSerializer(Foo.class, FooSerializer.class);
111111
List<StringUserContext> resolvers = new ArrayList<>(NUM);
112112
for (int i = 0; i < NUM; i++) {
113-
final StringUserContext userContextResolver = new StringUserContext(fury);
113+
final StringUserContext userContext = new StringUserContext(fury);
114114
fury.registerUserContext(String.valueOf(i), StringUserContext::new);
115-
resolvers.add(userContextResolver);
115+
resolvers.add(userContext);
116116
}
117117
final Foo o = Foo.create();
118118
final byte[] bytes = fury.serialize(o);

0 commit comments

Comments
 (0)