Skip to content

Commit ce519fe

Browse files
committed
Painless: Update More Methods to New Naming Scheme (#32305)
This finishes the updating the methods in the PainlessLookupBuilder to the new naming scheme. Mechanical change. Methods include the ones used for copying members in the inheritance hierarchy, calculating shortcuts, and setting the functional interface.
1 parent 4f55a07 commit ce519fe

File tree

2 files changed

+128
-236
lines changed

2 files changed

+128
-236
lines changed

modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookup.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,30 @@
3030
public final class PainlessLookup {
3131

3232
public Collection<PainlessClass> getStructs() {
33-
return javaClassesToPainlessStructs.values();
33+
return classesToPainlessClasses.values();
3434
}
3535

36-
private final Map<String, Class<?>> painlessTypesToJavaClasses;
37-
private final Map<Class<?>, PainlessClass> javaClassesToPainlessStructs;
36+
private final Map<String, Class<?>> canonicalClassNamesToClasses;
37+
private final Map<Class<?>, PainlessClass> classesToPainlessClasses;
3838

39-
PainlessLookup(Map<String, Class<?>> painlessTypesToJavaClasses, Map<Class<?>, PainlessClass> javaClassesToPainlessStructs) {
40-
this.painlessTypesToJavaClasses = Collections.unmodifiableMap(painlessTypesToJavaClasses);
41-
this.javaClassesToPainlessStructs = Collections.unmodifiableMap(javaClassesToPainlessStructs);
39+
PainlessLookup(Map<String, Class<?>> canonicalClassNamesToClasses, Map<Class<?>, PainlessClass> classesToPainlessClasses) {
40+
this.canonicalClassNamesToClasses = Collections.unmodifiableMap(canonicalClassNamesToClasses);
41+
this.classesToPainlessClasses = Collections.unmodifiableMap(classesToPainlessClasses);
4242
}
4343

4444
public Class<?> getClassFromBinaryName(String painlessType) {
45-
return painlessTypesToJavaClasses.get(painlessType.replace('$', '.'));
45+
return canonicalClassNamesToClasses.get(painlessType.replace('$', '.'));
4646
}
4747

4848
public boolean isSimplePainlessType(String painlessType) {
49-
return painlessTypesToJavaClasses.containsKey(painlessType);
49+
return canonicalClassNamesToClasses.containsKey(painlessType);
5050
}
5151

5252
public PainlessClass getPainlessStructFromJavaClass(Class<?> clazz) {
53-
return javaClassesToPainlessStructs.get(clazz);
53+
return classesToPainlessClasses.get(clazz);
5454
}
5555

5656
public Class<?> getJavaClassFromPainlessType(String painlessType) {
57-
return PainlessLookupUtility.canonicalTypeNameToType(painlessType, painlessTypesToJavaClasses);
57+
return PainlessLookupUtility.canonicalTypeNameToType(painlessType, canonicalClassNamesToClasses);
5858
}
5959
}

0 commit comments

Comments
 (0)