Annotation type fix for primitive return values

BobHanson · BobHanson · commit 4798d304b5d9 · 2020-01-01T11:28:22.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/sun/reflect/annotation/AnnotationParser.java b/sources/net.sf.j2s.java.core/src/sun/reflect/annotation/AnnotationParser.java
@@ -277,6 +277,7 @@ private static Object setLocalAnnotationValue(Annotation a, String key, Object o
 				val = Enum.valueOf((Class<Enum>) type, (String) val);
 			} else if (type.isPrimitive()) {
 				val = boxValue(val, type);
+				/** @j2sNative val = val.valueOf(); */
 			} else if (type == Class.class) {
 				val = Class.forName(((String) val).replace(".class", ""));
 			} else {
diff --git a/sources/net.sf.j2s.java.core/src/sun/reflect/annotation/AnnotationType.java b/sources/net.sf.j2s.java.core/src/sun/reflect/annotation/AnnotationType.java
@@ -105,7 +105,7 @@ private AnnotationType(final Class<? extends Annotation> annotationClass) {
         for (Method method :  methods) {
             String name = method.getName();
             Class<?> type = method.getReturnType();
-            memberTypes.put(name, invocationHandlerReturnType(type));
+            memberTypes.put(name, type);//invocationHandlerReturnType(type));
             members.put(name, method);
 
             Object defaultValue = method.getDefaultValue();
@@ -142,23 +142,24 @@ private AnnotationType(final Class<? extends Annotation> annotationClass) {
      * for an annotation).
      */
     public static Class<?> invocationHandlerReturnType(Class<?> type) {
+    	// No! That is not how it works.
         // Translate primitives to wrappers
-        if (type == byte.class)
-            return Byte.class;
-        if (type == char.class)
-            return Character.class;
-        if (type == double.class)
-            return Double.class;
-        if (type == float.class)
-            return Float.class;
-        if (type == int.class)
-            return Integer.class;
-        if (type == long.class)
-            return Long.class;
-        if (type == short.class)
-            return Short.class;
-        if (type == boolean.class)
-            return Boolean.class;
+//        if (type == byte.class)
+//            return Byte.class;
+//        if (type == char.class)
+//            return Character.class;
+//        if (type == double.class)
+//            return Double.class;
+//        if (type == float.class)
+//            return Float.class;
+//        if (type == int.class)
+//            return Integer.class;
+//        if (type == long.class)
+//            return Long.class;
+//        if (type == short.class)
+//            return Short.class;
+//        if (type == boolean.class)
+//            return Boolean.class;
 
         // Otherwise, just return declared type
         return type;
