Browse Source

Rename variable

Signed-off-by: yongjunhong <yongjunh@apache.org>
pull/35370/head
yongjunhong 4 months ago
parent
commit
7bff887a98
No known key found for this signature in database
GPG Key ID: 2CB7F4B427C9E5B8
  1. 18
      spring-core/src/main/java/org/springframework/core/RelativeOrderProcessor.java

18
spring-core/src/main/java/org/springframework/core/RelativeOrderProcessor.java

@ -67,15 +67,15 @@ public final class RelativeOrderProcessor {
private static Comparator<Object> getComparatorFor(Collection<?> items) { private static Comparator<Object> getComparatorFor(Collection<?> items) {
List<Object> components = new ArrayList<>(items); List<Object> components = new ArrayList<>(items);
Map<Object, Integer> relativeOrderMap = new HashMap<>(); Map<Object, Integer> orderMap = new HashMap<>();
if (!components.isEmpty()) { if (!components.isEmpty()) {
List<Object> sortedRelative = TOPOLOGICAL_ORDER_SOLVER.resolveOrder(components); List<Object> sortedRelative = TOPOLOGICAL_ORDER_SOLVER.resolveOrder(components);
for (int i = 0; i < sortedRelative.size(); i++) { for (int i = 0; i < sortedRelative.size(); i++) {
relativeOrderMap.put(sortedRelative.get(i), i); orderMap.put(sortedRelative.get(i), i);
} }
} }
return new ConfiguredComparator(relativeOrderMap); return new ConfiguredComparator(orderMap);
} }
private static boolean hasRelativeOrderAnnotations(Object obj) { private static boolean hasRelativeOrderAnnotations(Object obj) {
@ -93,11 +93,11 @@ public final class RelativeOrderProcessor {
* components and falls back to AnnotationAwareOrderComparator for everything else. * components and falls back to AnnotationAwareOrderComparator for everything else.
*/ */
private static class ConfiguredComparator implements Comparator<Object> { private static class ConfiguredComparator implements Comparator<Object> {
private final Map<Object, Integer> relativeOrderMap; private final Map<Object, Integer> orderMap;
private final Comparator<Object> fallbackComparator = AnnotationAwareOrderComparator.INSTANCE; private final Comparator<Object> fallbackComparator = AnnotationAwareOrderComparator.INSTANCE;
public ConfiguredComparator(Map<Object, Integer> relativeOrderMap) { public ConfiguredComparator(Map<Object, Integer> orderMap) {
this.relativeOrderMap = relativeOrderMap; this.orderMap = orderMap;
} }
@Override @Override
@ -105,10 +105,10 @@ public final class RelativeOrderProcessor {
boolean o1isRelative = hasRelativeOrderAnnotations(o1); boolean o1isRelative = hasRelativeOrderAnnotations(o1);
boolean o2isRelative = hasRelativeOrderAnnotations(o2); boolean o2isRelative = hasRelativeOrderAnnotations(o2);
// Case 1: Both components have relative order. Compare their topological index. // Case 1: Either components have relative order. Compare their topological index.
if (o1isRelative || o2isRelative) { if (o1isRelative || o2isRelative) {
int order1 = this.relativeOrderMap.getOrDefault(o1, 0); int order1 = this.orderMap.getOrDefault(o1, 0);
int order2 = this.relativeOrderMap.getOrDefault(o2, 0); int order2 = this.orderMap.getOrDefault(o2, 0);
return Integer.compare(order1, order2); return Integer.compare(order1, order2);
} }

Loading…
Cancel
Save