Specialising some types

speedment · Aug 21, 2018 · 2e5947b · 2e5947b
1 parent 93cd6db
commit 2e5947b
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 71 deletions.
diff --git a/...rc/main/java/com/speedment/generator/translator/internal/namer/JavaLanguageNamerImpl.java b/...rc/main/java/com/speedment/generator/translator/internal/namer/JavaLanguageNamerImpl.java
@@ -17,6 +17,7 @@
 package com.speedment.generator.translator.internal.namer;
 
 import com.speedment.common.codegen.util.Formatting;
+import com.speedment.common.function.CharUnaryOperator;
 import com.speedment.generator.translator.namer.JavaLanguageNamer;
 
 import java.util.function.Function;
@@ -58,7 +59,7 @@ public String javaPackageName(final String externalName) {
     }
 
     @Override
-    public String javaName(final String externalName, Function<Character, Character> mutator) {
+    public String javaName(final String externalName, CharUnaryOperator mutator) {
 
         final StringBuilder sb = new StringBuilder(javaNameFromExternal(externalName));
 
@@ -72,7 +73,7 @@ public String javaName(final String externalName, Function<Character, Character>
         }
 
         if (sb.length() > startIndex) {
-            sb.replace(startIndex, startIndex + 1, String.valueOf(mutator.apply(sb.charAt(startIndex))));
+            sb.replace(startIndex, startIndex + 1, String.valueOf(mutator.applyAsChar(sb.charAt(startIndex))));
         }
         return sb.toString();
     }

diff --git a/...-translator/src/main/java/com/speedment/generator/translator/namer/JavaLanguageNamer.java b/...-translator/src/main/java/com/speedment/generator/translator/namer/JavaLanguageNamer.java
@@ -17,6 +17,8 @@
 package com.speedment.generator.translator.namer;
 
 import static com.speedment.common.codegen.util.Formatting.ucfirst;
+
+import com.speedment.common.function.CharUnaryOperator;
 import com.speedment.common.injector.annotation.InjectKey;
 import static com.speedment.runtime.core.internal.util.sql.SqlUtil.unQuote;
 import static java.util.Objects.requireNonNull;
@@ -77,7 +79,7 @@ public interface JavaLanguageNamer {
      * {@link #javaNameFromExternal(java.lang.String) } method and then applying
      * the given mutator on the first character (if any)
      */
-    String javaName(final String externalName, Function<Character, Character> mutator);
+    String javaName(final String externalName, CharUnaryOperator mutator);
 
     /**
      * Returns the java name (e.g. "someName") by applying the