|
30 | 30 | public final class PainlessLookup {
|
31 | 31 |
|
32 | 32 | public Collection<PainlessClass> getStructs() {
|
33 |
| - return javaClassesToPainlessStructs.values(); |
| 33 | + return classesToPainlessClasses.values(); |
34 | 34 | }
|
35 | 35 |
|
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; |
38 | 38 |
|
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); |
42 | 42 | }
|
43 | 43 |
|
44 | 44 | public Class<?> getClassFromBinaryName(String painlessType) {
|
45 |
| - return painlessTypesToJavaClasses.get(painlessType.replace('$', '.')); |
| 45 | + return canonicalClassNamesToClasses.get(painlessType.replace('$', '.')); |
46 | 46 | }
|
47 | 47 |
|
48 | 48 | public boolean isSimplePainlessType(String painlessType) {
|
49 |
| - return painlessTypesToJavaClasses.containsKey(painlessType); |
| 49 | + return canonicalClassNamesToClasses.containsKey(painlessType); |
50 | 50 | }
|
51 | 51 |
|
52 | 52 | public PainlessClass getPainlessStructFromJavaClass(Class<?> clazz) {
|
53 |
| - return javaClassesToPainlessStructs.get(clazz); |
| 53 | + return classesToPainlessClasses.get(clazz); |
54 | 54 | }
|
55 | 55 |
|
56 | 56 | public Class<?> getJavaClassFromPainlessType(String painlessType) {
|
57 |
| - return PainlessLookupUtility.canonicalTypeNameToType(painlessType, painlessTypesToJavaClasses); |
| 57 | + return PainlessLookupUtility.canonicalTypeNameToType(painlessType, canonicalClassNamesToClasses); |
58 | 58 | }
|
59 | 59 | }
|
0 commit comments