add support to generate class annotations

Author: Mihail Slavchev

binding-generator/src/main/java/com/tns/bindings/AnnotationDescriptor.java

@@ -0,0 +1,54 @@
+package com.tns.bindings;
+
+import java.util.ArrayList;
+
+public class AnnotationDescriptor
+{
+    public static class Parameter
+    {
+        private final String name;
+        private final Object value;
+
+        public Parameter(String name, Object value)
+        {
+            this.name = name;
+            this.value = value;
+        }
+
+        public String getName()
+        {
+            return this.name;
+        }
+
+        public Object getValue()
+        {
+            return this.value;
+        }
+    }
+
+    public AnnotationDescriptor(String classname, Parameter[] parameters, boolean isRuntimeVisible)
+    {
+        this.classname = classname;
+        this.parameters = parameters;
+        this.isRuntimeVisible = isRuntimeVisible;
+    }
+
+    public String getAnnotationClassname()
+    {
+        return classname;
+    }
+
+    public boolean isRuntimeVisible()
+    {
+        return isRuntimeVisible;
+    }
+
+    public Parameter[] getParams()
+    {
+        return parameters;
+    }
+
+    private final String classname;
+    private final Parameter[] parameters;
+    private final boolean isRuntimeVisible;
+}

binding-generator/src/main/java/com/tns/bindings/Dump.java

@@ -198,33 +198,10 @@ public void generateProxy(ApplicationWriter aw, String proxyName, ClassDescripto
 			methodOverridesSet.add(methodOverride);
 		}
 
-    	generateProxy(aw, proxyName, classTo, methodOverridesSet, null);
+    	generateProxy(aw, proxyName, classTo, methodOverridesSet, null, null);
     }
 
-    public void generateProxy(ApplicationWriter aw, ClassDescriptor classTo, String[] methodOverrides, int ignored)
-    {
-    	HashSet<String> methodOverridesSet = new HashSet<String>();
-
-		for (int i = 0; i < methodOverrides.length; i++)
-		{
-			String methodOverride = methodOverrides[i];
-			methodOverridesSet.add(methodOverride);
-		}
-
-		generateProxy(aw, "0", classTo, methodOverridesSet, null);
-	}
-
-	public void generateProxy(ApplicationWriter aw, String proxyName, ClassDescriptor classTo)
-	{
-		generateProxy(aw, proxyName, classTo, null, null);
-	}
-
-	public void generateProxy(ApplicationWriter aw, ClassDescriptor classTo)
-	{
-    	generateProxy(aw, "0", classTo, null, null);
-    }
-
-    public void generateProxy(ApplicationWriter aw, String proxyName, ClassDescriptor classTo, HashSet<String> methodOverrides, HashSet<ClassDescriptor> implementedInterfaces)
+    public void generateProxy(ApplicationWriter aw, String proxyName, ClassDescriptor classTo, HashSet<String> methodOverrides, HashSet<ClassDescriptor> implementedInterfaces, AnnotationDescriptor[] annotations)
 	{
 		String classSignature = getAsmDescriptor(classTo);
 
@@ -237,7 +214,7 @@ public void generateProxy(ApplicationWriter aw, String proxyName, ClassDescripto
 
 		tnsClassSignature += ";";
 
-		ClassVisitor cv = generateClass(aw, classTo, classSignature, tnsClassSignature, implementedInterfaces);
+		ClassVisitor cv = generateClass(aw, classTo, classSignature, tnsClassSignature, implementedInterfaces, annotations);
 		MethodDescriptor[] methods = getSupportedMethods(classTo, methodOverrides, implementedInterfaces);
 
 		methods = groupMethodsByNameAndSignature(methods);
@@ -926,7 +903,7 @@ private void generateInitializedField(ClassVisitor cv)
 	static final String[] classImplentedInterfaces = new String[] { "Lcom/tns/NativeScriptHashCodeProvider;" };
 	static final String[] interfaceImplementedInterfaces = new String[] { "Lcom/tns/NativeScriptHashCodeProvider;", "" };
 
-	private ClassVisitor generateClass(ApplicationWriter aw, ClassDescriptor classTo, String classSignature, String tnsClassSignature, HashSet<ClassDescriptor> implementedInterfaces)
+	private ClassVisitor generateClass(ApplicationWriter aw, ClassDescriptor classTo, String classSignature, String tnsClassSignature, HashSet<ClassDescriptor> implementedInterfaces, AnnotationDescriptor[] annotations)
 	{
 		ClassVisitor cv;
 
@@ -958,10 +935,28 @@ private ClassVisitor generateClass(ApplicationWriter aw, ClassDescriptor classTo
 
 		cv = aw.visitClass(classModifiers, tnsClassSignature, null, classSignature, interfacesToImplementArr);
 		cv.visit(0, classModifiers, tnsClassSignature, null, classSignature, interfacesToImplementArr);
+		if ((annotations !=  null) && (annotations.length > 0)) {
+			for (AnnotationDescriptor ad: annotations) {
+				String annotationClassname = ad.getAnnotationClassname();
+				boolean isVisible = ad.isRuntimeVisible();
+				AnnotationVisitor av = cv.visitAnnotation(annotationClassname, isVisible);
+				setAnnotationFields(av, ad);
+				av.visitEnd();
+			}
+		}
 		cv.visitSource(classTo.getName() +  ".java", null);
 		return cv;
 	}
 
+	private void setAnnotationFields(AnnotationVisitor av, AnnotationDescriptor ad) {
+		AnnotationDescriptor.Parameter[] params = ad.getParams();
+		if (params.length > 0) {
+			for (AnnotationDescriptor.Parameter p: params) {
+				av.visit(p.getName(), p.getValue());
+			}
+		}
+	}
+
 	private int getDexModifiers(Descriptor descriptor)
 	{
 		if (descriptor.isPublic())

binding-generator/src/main/java/com/tns/bindings/ProxyGenerator.java

@@ -29,7 +29,7 @@ public void setProxyThumb(String proxyThumb)
 	}
 
 
-	public String generateProxy(String proxyName, ClassDescriptor classToProxy, String[] methodOverrides, boolean isInterface) throws IOException
+	public String generateProxy(String proxyName, ClassDescriptor classToProxy, String[] methodOverrides, boolean isInterface, AnnotationDescriptor[] annotations) throws IOException
 	{
 		HashSet<String> methodOverridesSet = null;
 
@@ -43,15 +43,15 @@ public String generateProxy(String proxyName, ClassDescriptor classToProxy, Stri
 			}
 		}
 
-		return generateProxy(proxyName, classToProxy, methodOverridesSet, null, isInterface);
+		return generateProxy(proxyName, classToProxy, methodOverridesSet, new HashSet<ClassDescriptor>(), isInterface, annotations);
 	}
 
-	public String generateProxy(String proxyName, ClassDescriptor classToProxy, HashSet<String> methodOverrides, HashSet<ClassDescriptor> implementedInterfaces, boolean isInterface) throws IOException
+	public String generateProxy(String proxyName, ClassDescriptor classToProxy, HashSet<String> methodOverrides, HashSet<ClassDescriptor> implementedInterfaces, boolean isInterface, AnnotationDescriptor[] annotations) throws IOException
 	{
 		ApplicationWriter aw = new ApplicationWriter();
 		aw.visit();
 
-		dump.generateProxy(aw, proxyName, classToProxy, methodOverrides, implementedInterfaces);
+		dump.generateProxy(aw, proxyName, classToProxy, methodOverrides, implementedInterfaces, annotations);
 
 		aw.visitEnd();
 		byte[] generatedBytes = aw.toByteArray();

runtime/src/main/java/com/tns/DexFactory.java

@@ -15,6 +15,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import com.tns.bindings.AnnotationDescriptor;
 import com.tns.bindings.ProxyGenerator;
 import com.tns.bindings.desc.ClassDescriptor;
 import com.tns.bindings.desc.reflection.ClassInfo;
@@ -282,7 +283,8 @@ private String generateDex(String proxyName, String className, String[] methodOv
 			}
 		}
 
-		return proxyGenerator.generateProxy(proxyName, new ClassInfo(classToProxy) , methodOverridesSet, implementedInterfacesSet, isInterface);
+		AnnotationDescriptor[] annotations = null;
+		return proxyGenerator.generateProxy(proxyName, new ClassInfo(classToProxy) , methodOverridesSet, implementedInterfacesSet, isInterface, annotations);
 	}
 
 	private void updateDexThumbAndPurgeCache()