Put java names directly in maps instead of transformation yaml to java each time

Author: snuyanzin

src/main/java/net/datafaker/service/FakeValues.java

@@ -7,10 +7,12 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -98,9 +100,11 @@ private Map<String, Object> loadValues() {
             try (InputStream stream = getClass().getResourceAsStream(path)) {
                 if (stream != null) {
                     result = readFromStream(stream);
+                    enrichMapWithJavaNames(result);
                 } else {
                     try (InputStream stream2 = getClass().getClassLoader().getResourceAsStream(path)) {
                         result = readFromStream(stream2);
+                        enrichMapWithJavaNames(result);
                     } catch (Exception e) {
                         LOG.log(Level.SEVERE, "Exception: ", e);
                     }
@@ -116,6 +120,40 @@ private Map<String, Object> loadValues() {
         return null;
     }
 
+    private void enrichMapWithJavaNames(Map<String, Object> result) {
+        if (result != null) {
+            Set<String> set = new HashSet<>();
+            for (Map.Entry<String, Object> entry : result.entrySet()) {
+                final String key = entry.getKey();
+                if (key.indexOf('_') != -1) {
+                    set.add(key);
+                }
+            }
+            for (String str: set) {
+                result.put(toJavaNames(str), result.get(str));
+            }
+        }
+    }
+
+    private static String toJavaNames(String string) {
+        if (string == null || string.isEmpty()) {
+            return string;
+        }
+        StringBuilder res = new StringBuilder(string.length());
+        for (int i = 0; i < string.length(); i++) {
+            char c = string.charAt(i);
+            if (i == 0 && Character.isLetter(c)) {
+                res.append(Character.toUpperCase(c));
+            } else if (c == '_' && i < string.length() + 1 && Character.isLetter(string.charAt(i + 1))) {
+                res.append(Character.toUpperCase(string.charAt(i + 1)));
+                i++;
+            } else {
+                res.append(c);
+            }
+        }
+        return res.toString();
+    }
+
     private Map<String, Object> readFromStream(InputStream stream) {
         if (stream == null) return null;
         final Map<String, Object> valuesMap = new Yaml().loadAs(stream, Map.class);

src/main/java/net/datafaker/service/FakeValuesService.java

@@ -630,14 +630,15 @@ private static List<String> splitExpressions(String expression) {
     private Object resolveExpression(String directive, String[] args, Object current, Faker root) {
         // name.name (resolve locally)
         // Name.first_name (resolve to faker.name().firstName())
-        final String simpleDirective = (isDotDirective(directive) || current == null)
+        final boolean dotDirective = isDotDirective(directive);
+        final String simpleDirective = (dotDirective || current == null)
             ? directive
             : classNameToYamlName(current) + "." + directive;
 
         Object resolved;
         // resolve method references on CURRENT object like #{number_between '1','10'} on Number or
         // #{ssn_valid} on IdNumber
-        if (!isDotDirective(directive)) {
+        if (!dotDirective) {
             Supplier<Object> supplier = resolveFromMethodOn(current, directive, args);
             if (supplier != null && (resolved = supplier.get()) != null) {
                 //expression2function.put(expression, supplier);
@@ -656,7 +657,7 @@ private Object resolveExpression(String directive, String[] args, Object current
         }
 
         // resolve method references on faker object like #{regexify '[a-z]'}
-        if (!isDotDirective(directive)) {
+        if (!dotDirective) {
             supplier = resolveFromMethodOn(root, directive, args);
             if (supplier != null && (resolved = supplier.get()) != null) {
                 //       expression2function.put(expression, supplier);
@@ -665,7 +666,7 @@ private Object resolveExpression(String directive, String[] args, Object current
         }
 
         // Resolve Faker Object method references like #{ClassName.method_name}
-        if (isDotDirective(directive)) {
+        if (dotDirective) {
             supplier = resolveFakerObjectAndMethod(root, directive, args);
             if (supplier != null && (resolved = supplier.get()) != null) {
                 // expression2function.put(expression, supplier);
@@ -678,8 +679,8 @@ private Object resolveExpression(String directive, String[] args, Object current
         // thru the normal resolution above, but if we will can't resolve it, we once again do a 'safeFetch' as we
         // did first but FIRST we change the Object reference Class.method_name with a yml style internal reference ->
         // class.method_name (lowercase)
-        if (isDotDirective(directive)) {
-            supplier = () -> safeFetch(javaNameToYamlName(simpleDirective), null);
+        if (dotDirective) {
+            supplier = () -> safeFetch(directive, null);
             resolved = supplier.get();
         }
 
@@ -706,7 +707,7 @@ private String trimRegexSlashes(String slashDelimitedRegex) {
     }
 
     private boolean isDotDirective(String directive) {
-        return directive.contains(".");
+        return directive.indexOf('.') != -1;
     }
 
     /**
@@ -853,19 +854,23 @@ private Object invokeAndToString(MethodAndCoercedArgs accessor, Object objectWit
      * Find an accessor by name ignoring case.
      */
     private MethodAndCoercedArgs accessor(Class<?> clazz, String name, String[] args) {
-        LOG.log(Level.FINE, () -> "Find accessor named " + name + " on " + clazz.getSimpleName() + " with args " + Arrays.toString(args));
-
-        if (!class2methodsCache.containsKey(clazz)) {
-            Map<String, Collection<Method>> methodMap = new HashMap<>();
-            for (Method m : clazz.getMethods()) {
+        final String finalName = name;
+        LOG.log(Level.FINE, () -> "Find accessor named " + finalName + " on " + clazz.getSimpleName() + " with args " + Arrays.toString(args));
+        name = removeUnderscoreChars(name);
+        final Collection<Method> methods;
+        if (class2methodsCache.containsKey(clazz)) {
+            methods = class2methodsCache.get(clazz).getOrDefault(name.toLowerCase(Locale.ROOT), Collections.emptyList());
+        } else {
+            Method[] classMethods = clazz.getMethods();
+            Map<String, Collection<Method>> methodMap = new HashMap<>(classMethods.length);
+            for (Method m : classMethods) {
                 final String key = m.getName().toLowerCase(Locale.ROOT);
                 methodMap.computeIfAbsent(key, k -> new ArrayList<>());
                 methodMap.get(key).add(m);
             }
             class2methodsCache.put(clazz, methodMap);
+            methods = methodMap.get(name.toLowerCase(Locale.ROOT));
         }
-        final Collection<Method> methods =
-            class2methodsCache.get(clazz).getOrDefault(name.toLowerCase(Locale.ROOT), Collections.emptyList());
         for (Method m : methods) {
             if (m.getParameterTypes().length == args.length || m.getParameterTypes().length < args.length && m.isVarArgs()) {
                 final Object[] coercedArguments = coerceArguments(m, args);
@@ -874,10 +879,6 @@ private MethodAndCoercedArgs accessor(Class<?> clazz, String name, String[] args
                 }
             }
         }
-
-        if (name.contains("_")) {
-            return accessor(clazz, removeUnderscoreChars(name), args);
-        }
         return null;
     }