Small refactoring: move utility method

Author: max-kammerer

src/main/java/one/nio/gen/BytecodeGenerator.java

@@ -263,6 +263,30 @@ public static void emitUnboxing(MethodVisitor mv, Class type) {
         }
     }
 
+    public static void loadPrimitiveType(MethodVisitor mv, Class<?> clazz) {
+        if (clazz == int.class) {
+            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Integer", "TYPE", "Ljava/lang/Class;");
+        } else if (clazz == boolean.class) {
+            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Boolean", "TYPE", "Ljava/lang/Class;");
+        } else if (clazz == byte.class) {
+            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Byte", "TYPE", "Ljava/lang/Class;");
+        } else if (clazz == char.class) {
+            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Character", "TYPE", "Ljava/lang/Class;");
+        } else if (clazz == short.class) {
+            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Short", "TYPE", "Ljava/lang/Class;");
+        } else if (clazz == float.class) {
+            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Float", "TYPE", "Ljava/lang/Class;");
+        } else if (clazz == long.class) {
+            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Long", "TYPE", "Ljava/lang/Class;");
+        } else if (clazz == double.class) {
+            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Double", "TYPE", "Ljava/lang/Class;");
+        } else if (clazz == void.class) {
+            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Void", "TYPE", "Ljava/lang/Class;");
+        } else {
+            throw new AssertionError("Not supported primitive type: " + clazz);
+        }
+    }
+
     public static void generateDefault(MethodVisitor mv, Field field) {
         mv.visitInsn(defaultValueOpcode(Type.getType(field.getType())));
     }

src/main/java/one/nio/serial/gen/GenerationStrategy.java

@@ -16,6 +16,7 @@
 
 package one.nio.serial.gen;
 
+import one.nio.gen.BytecodeGenerator;
 import one.nio.serial.FieldDescriptor;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.MethodVisitor;
@@ -26,7 +27,6 @@
 import java.lang.reflect.Field;
 import java.util.function.Consumer;
 
-import static one.nio.serial.gen.HandlesStrategy.loadPrimitiveType;
 import static org.objectweb.asm.Opcodes.CHECKCAST;
 
 public abstract class GenerationStrategy {
@@ -51,7 +51,7 @@ public void generateCast(MethodVisitor mv, Class dst) {
 
     public void loadClassSafe(MethodVisitor mv, Class clazz) {
         if (clazz.isPrimitive()) {
-            loadPrimitiveType(mv, clazz);
+            BytecodeGenerator.loadPrimitiveType(mv, clazz);
         } else {
             mv.visitLdcInsn(Type.getType(clazz));;
         }

src/main/java/one/nio/serial/gen/HandlesStrategy.java

@@ -339,30 +339,6 @@ public static String getVarHandleAccessorName(Field fd, boolean isGetter) {
         return "$" + ((isGetter) ? "get" : "set")  + "_" + getVarHandleName(fd);
     }
 
-    public static void loadPrimitiveType(MethodVisitor mv, Class<?> clazz) {
-        if (clazz == int.class) {
-            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Integer", "TYPE", "Ljava/lang/Class;");
-        } else if (clazz == boolean.class) {
-            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Boolean", "TYPE", "Ljava/lang/Class;");
-        } else if (clazz == byte.class) {
-            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Byte", "TYPE", "Ljava/lang/Class;");
-        } else if (clazz == char.class) {
-            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Character", "TYPE", "Ljava/lang/Class;");
-        } else if (clazz == short.class) {
-            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Short", "TYPE", "Ljava/lang/Class;");
-        } else if (clazz == float.class) {
-            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Float", "TYPE", "Ljava/lang/Class;");
-        } else if (clazz == long.class) {
-            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Long", "TYPE", "Ljava/lang/Class;");
-        } else if (clazz == double.class) {
-            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Double", "TYPE", "Ljava/lang/Class;");
-        } else if (clazz == void.class) {
-            mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/Void", "TYPE", "Ljava/lang/Class;");
-        } else {
-            throw new AssertionError("Not supported primitive type: " + clazz);
-        }
-    }
-
     @Override
     public void emitWriteObjectCall(MethodVisitor mv, String className, MethodHandleInfo methodType) {
         emitWriteObjectHandler = true;