Move classNameToJLSName to JVMUtil

Author: LunNova

src/main/java/me/nallar/javatransformer/internal/ResolutionContext.java

@@ -10,14 +10,11 @@
 import lombok.val;
 import me.nallar.javatransformer.api.Type;
 import me.nallar.javatransformer.internal.util.JVMUtil;
-import me.nallar.javatransformer.internal.util.Joiner;
 import me.nallar.javatransformer.internal.util.NodeUtil;
-import me.nallar.javatransformer.internal.util.Splitter;
 
 import java.util.*;
 
 public class ResolutionContext {
-	private static final Splitter dotSplitter = Splitter.on('.');
 	@NonNull
 	private final String packageName;
 	@NonNull
@@ -51,25 +48,7 @@ static boolean hasPackages(String name) {
 	static String classNameToDescriptor(String className) {
 		// TODO: 23/01/2016 Handle inner classes properly? currently depend on following naming standards
 		// depends on: lower case package names, uppercase first letter of class name
-		List<String> parts = new ArrayList<>();
-		dotSplitter.split(className).forEach(parts::add);
-
-		boolean possibleClass = true;
-		for (int i = parts.size() - 1, size = i; i >= 0; i--) {
-			String part = parts.get(i);
-
-			boolean last = i == size;
-
-			if (!last && !Character.isUpperCase(part.charAt(0))) {
-				possibleClass = false;
-			}
-
-			if (!last) {
-				parts.set(i, part + (possibleClass ? '$' : '/'));
-			}
-		}
-
-		return "L" + Joiner.on().join(parts) + ";";
+		return 'L' + JVMUtil.classNameToJLSName(className) + ';';
 	}
 
 	public Type resolve(com.github.javaparser.ast.type.Type type) {

src/main/java/me/nallar/javatransformer/internal/util/JVMUtil.java

@@ -8,6 +8,8 @@
 
 @UtilityClass
 public class JVMUtil {
+	private static final Splitter dotSplitter = Splitter.on('.');
+
 	public static String getDescriptor(Class<?> clazz) {
 		if (clazz.isPrimitive()) {
 			return descriptorToPrimitiveType(clazz.getSimpleName());
@@ -173,4 +175,26 @@ public static int makeAtLeastProtected(int access) {
 		// change to public - protected doesn't include package-local.
 		return access | AccessFlags.ACC_PUBLIC;
 	}
+
+	public static String classNameToJLSName(String className) {
+		List<String> parts = new ArrayList<>();
+		dotSplitter.split(className).forEach(parts::add);
+
+		boolean possibleClass = true;
+		for (int i = parts.size() - 1, size = i; i >= 0; i--) {
+			String part = parts.get(i);
+
+			boolean last = i == size;
+
+			if (!last && !Character.isUpperCase(part.charAt(0))) {
+				possibleClass = false;
+			}
+
+			if (!last) {
+				parts.set(i, part + (possibleClass ? '$' : '/'));
+			}
+		}
+
+		return Joiner.on().join(parts);
+	}
 }