// BH 2022.06.27 -- 3.3.1-v5 fixes missing method annotations

BobHanson · BobHanson · commit f5c4713c6371 · 2022-06-27T23:48:34.000-05:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20220527103831 
+20220627232852 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp
@@ -1 +1 @@
-20220527103831 
+20220627232852 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java
@@ -25,11 +25,12 @@ public class CorePlugin extends Plugin {
 	 * "net.sf.j2s.core.jar" not "net.sf.j2s.core.3.2.5"
 	 * 
 	 */
-	public static String VERSION = "3.3.1-v4";
+	public static String VERSION = "3.3.1-v5";
 	
 	// if you change the x.x.x number, be sure to also indicate that in 
 	// j2sApplet.js and also (Bob only) update.bat, update-clean.bat
 
+	// BH 2022.06.27 -- 3.3.1-v5 fixes missing method annotations
 	// BH 2022.01.17 -- 3.3.1-v4 fixes default interface methods referencing their own static fields
 	// BH 2021.01.14 -- 3.3.1-v3 fixes missing finals for nested () -> {...}
 	// BH 2021.01.03 -- 3.3.1-v2 adds @j2sAsync adds async for function - experimental
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptCompiler.java
@@ -123,7 +123,7 @@ class Java2ScriptCompiler {
 	private static final String J2S_COMPILER_READ_ANNOTATIONS = "j2s.compiler.read.annotations";
 	private static final String J2S_COMPILER_READ_ANNOTATIONS_DEFAULT = "true";
 	private static final String J2S_COMPILER_IGNORED_ANNOTATIONS = "j2s.compiler.ignored.annotations";
-	private static final String J2S_COMPILER_IGNORED_ANNOTATIONS_DEFAULT = 
+	static final String J2S_COMPILER_IGNORED_ANNOTATIONS_DEFAULT = 
 			"CallerSensitive;"
 			+ "ConstructorProperties;"
 			+ "Deprecated;"
@@ -135,7 +135,8 @@ class Java2ScriptCompiler {
 			+ "Inherited;"
 			+ "Native;"
 			+ "Repeatable;"
-			+ "Retention;";
+			+ "Retention;"
+			+ "Transient;";
 
 	private static final String J2S_COMPILER_NONQUALIFIED_PACKAGES = "j2s.compiler.nonqualified.packages";
 	private static final String J2S_COMPILER_NONQUALIFIED_PACKAGES_DEFAULT = "<none>";
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
@@ -373,8 +373,7 @@ public class Java2ScriptVisitor extends ASTVisitor {
 	 * list of annotations to ignore or null to ignore ALL
 	 * 
 	 */
-	private static String global_ignoredAnnotations = ";" + "CallerSensitive;" + "ConstructorProperties;"
-			+ "Deprecated;" + "Override;" + "SaveVarargs;" + "SuppressWarnings;";
+	private static String global_ignoredAnnotations = Java2ScriptCompiler.J2S_COMPILER_IGNORED_ANNOTATIONS_DEFAULT;
 
 	public static void setDebugging(boolean isDebugging) {
 		global_j2sFlag_isDebugging = isDebugging;
@@ -2457,6 +2456,8 @@ private boolean addClassOrInterface(ASTNode node, ITypeBinding binding, List<?>
 		List<EnumConstantDeclaration> enums = (isEnum ? new ArrayList<>() : null);
 		List<FieldDeclaration> fields = (haveFieldMethodAnnotations || isInterface || isLambda || isEnum ? null
 				: new ArrayList<>());
+		
+
 		List<IMethodBinding> methods = (haveFieldMethodAnnotations || isAnnotation || fields != null ? new ArrayList<>()
 				: null);
 
@@ -6312,9 +6313,9 @@ private boolean checkAnnotations(BodyDeclaration node, int mode) {
 				if (obj instanceof Annotation) {
 					if (!addAnnotation((Annotation) obj, node, mode))
 						return false;
+					}
 				}
 			}
-		}
 		return true;
 	}
 
@@ -7111,7 +7112,7 @@ public static void addClassAnnotations(Java2ScriptVisitor visitor, int accessTyp
 							if (methods.contains(mBinding))
 								methods.remove(mBinding);
 						if (accessType != NOT_JAXB)
-							mBinding = getJAXBGetMethod(mBinding, methods, false);
+							mBinding =getJAXBGetMethod(accessType, mBinding, methods, false);
 						if (mBinding == null)
 							continue;
 						varName = "M:" + mBinding.getName();
@@ -7190,11 +7191,11 @@ private static String annotationNameValue(String name, Object value) {
 			return str;
 		}
 
-		private static IMethodBinding getJAXBGetMethod(IMethodBinding v, List<IMethodBinding> methods,
+		private static IMethodBinding getJAXBGetMethod(int accessType, IMethodBinding v, List<IMethodBinding> methods,
 				boolean returnVar2) {
 			String varName = v.getName();
 			// check for matching get/is and set
-			if (varName.startsWith("create")) {
+			if (accessType == ANNOTATION_TYPE_UNKNOWN || varName.startsWith("create")) {
 				return v;
 			}
 			if (varName.startsWith("set")) {
@@ -7266,7 +7267,7 @@ private static void addImplicitJAXBFieldsAndMethods(int accessType, StringBuffer
 				if (accessType != JAXB_TYPE_FIELD) {
 					for (int i = 0; i < methods.size(); i++) {
 						IMethodBinding m = methods.get(i);
-						IMethodBinding m2 = getJAXBGetMethod(m, methods, true);
+						IMethodBinding m2 = getJAXBGetMethod(-1, m, methods, true);
 						if (m2 == null)
 							continue;
 						boolean isPublic = (Modifier.isPublic(m.getModifiers())
diff --git a/sources/net.sf.j2s.java.core/.j2s b/sources/net.sf.j2s.java.core/.j2s
@@ -7,7 +7,7 @@ j2s.allow.sync.thread=true
 j2s.compiler.read.annotations=true
 
 # customizable list for what annotations to skip
-j2s.compiler.ignored.annotations=CallerSensitive;ConstructorProperties;Deprecated;Override;SaveVarargs;SuppressWarnings;
+j2s.compiler.ignored.annotations=CallerSensitive;ConstructorProperties;Deprecated;Override;SafeVarargs;SuppressWarnings;FunctionalInterface;Documented;Inherited;Native;Repeatable;Retention;Transient;
 
 #j2s.compiler.nonqualified.packages=org.w3c.dom
 
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
@@ -397,11 +397,12 @@ static Map<Class<? extends Annotation>, Annotation> parseAnnotations(String name
 					Annotation a = createAnnotation(qnames[i], atData[i]);
 					if (a != null) {
 						Class<? extends Annotation> klass = a.getClass();
-						if (
+//BH not implementing @retention						if (
 						// AnnotationType.getInstance(klass).retention() == RetentionPolicy.RUNTIME &&
-						result.put(klass, a) != null) {
-							throw new AnnotationFormatError("Duplicate annotation for class: " + klass + ": " + a);
-						}
+						result.put(klass, a);
+//						!= null) {
+//							throw new AnnotationFormatError("Duplicate annotation for class: " + klass + ": " + a);
+//						}
 					}
 				}
 			}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Annotation3.java b/sources/net.sf.j2s.java.core/src/test/Test_Annotation3.java
@@ -0,0 +1,10 @@
+package test;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@interface Test_Annotation3 {
+
+	String name() default "test_annotate";
+	String type();
+}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Annotation_Impl.java b/sources/net.sf.j2s.java.core/src/test/Test_Annotation_Impl.java
@@ -1,5 +1,6 @@
 package test;
 
+import java.beans.Transient;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -8,6 +9,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.bind.annotation.XmlElement;
+
 @Test_Annotation(cl=Test_.class, btest = true, itype = 2, type = "im'pl", iitype = {4,5,6})
 @Test_Annotation.Test_Annotation1
 class Test_Annotation_Impl extends Test_ {
@@ -69,13 +72,27 @@ public String name() {
 	  return "class_impl";
 	};
 	
-	public static void main(String[] args) {
+	  @Test_Annotation3(type = "1")
+	  public void annotated() {}
+
+	  public static void main(String[] args) {
+		
+//	    Method method;
+//		try {
+//			method = Test_Annotation_Impl.class.getMethod("annotated");
+//		    System.out.println(method.getAnnotations());  // contains annotation in java but empty array in js
+//		} catch (NoSuchMethodException | SecurityException e1) {
+//			// TODO Auto-generated catch block
+//			e1.printStackTrace();
+//		}
+
+		
+		
 		System.out.println(Test_Annotation_Impl.class.isAssignableFrom(Test_.class));//false
 		System.out.println(Test_.class.isAssignableFrom(Test_Annotation_Impl.class));//true
 		System.out.println(Test_.class.isAssignableFrom(Test_.class));//true
 		Test_Annotation_Impl impl = new Test_Annotation_Impl();
 		try {
-
 			Test_Annotation a = impl.getClass().getAnnotation(Test_Annotation.class);
 			System.out.println(a.annotationType().getName());
 			processAnnotation(a, "class");
@@ -94,6 +111,7 @@ public static void main(String[] args) {
 			Method[] methods = impl.getClass().getDeclaredMethods();
 			for (int i = 0; i < methods.length; i++) {
 				methods[i].setAccessible(true);
+				System.out.println("annotations:" + methods[i].getName() + " " + methods[i].getAnnotations());
 				if (methods[i].isAnnotationPresent(aclass)) {
 					//minor issue that Method.getName() returns the fully qualified 
 					// JavaScript method name, not the unqualified Java method name. 
@@ -111,7 +129,12 @@ public static void main(String[] args) {
 		}
 
 	}
-
+ 
+	@SafeVarargs
+	@Deprecated
+    @Transient
+	public final void test11(String... test) {}
+	
 	private static void processAnnotation(Annotation a, String name)
 			throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
 		Method[] ma = a.getClass().getMethods();
@@ -133,4 +156,6 @@ private static void processAnnotation(Annotation a, String name)
 		}
 
 	}
+	
+
 }
