Reduce minimal JDK version of ASMX provider to 1.6

Author: vsilaev

net.tascalate.javaflow.providers.asmx/pom.xml

@@ -40,10 +40,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.moditect</groupId>

net.tascalate.javaflow.providers.asmx/src/main/java/org/apache/commons/javaflow/providers/asmx/CallSiteFinder.java

@@ -65,7 +65,7 @@ public String toString() {
     }
 
     List<Result> findMatchingCallSites(InsnList instructions, List<LocalVariableAnnotationNode> varAnnotations, Map<Integer, List<AnnotationNode>> paramAnnotations) {
-        List<Result> result = new ArrayList<>();
+        List<Result> result = new ArrayList<Result>();
         for (Iterator<AbstractInsnNode> i = instructions.iterator(); i.hasNext(); ) {
             AbstractInsnNode ins = i.next();
             if (ins instanceof MethodInsnNode) {
@@ -82,14 +82,14 @@ List<Result> findMatchingCallSites(InsnList instructions, List<LocalVariableAnno
 
     @SuppressWarnings("unchecked")
     static List<LocalVariableAnnotationNode> annotationsList(List<?> v) {
-        return null == v ? Collections.emptyList() : (List<LocalVariableAnnotationNode>)v;
+        return null == v ? Collections.<LocalVariableAnnotationNode>emptyList() : (List<LocalVariableAnnotationNode>)v;
     }
 
     static Map<Integer, List<AnnotationNode>> annotationsList(List<?>[] v) {
         if (v == null) {
             return Collections.emptyMap();
         }
-        Map<Integer, List<AnnotationNode>> result = new HashMap<>();
+        Map<Integer, List<AnnotationNode>> result = new HashMap<Integer, List<AnnotationNode>>();
         int i = 0;
         for (List<?> list : v) {
             @SuppressWarnings("unchecked")
@@ -126,7 +126,7 @@ private Result findMatchingCallSite(MethodInsnNode m, List<LocalVariableAnnotati
                     return new Result(v, m, annotations);
                 } else if (n instanceof FieldInsnNode) {
                     // static/instance field
-                    return new Result(n, m, Collections.emptySet());
+                    return new Result(n, m, Collections.<String>emptySet());
                 } else {
                     // Not interested in other types like directly reused return value from chained calls
                     break;
@@ -139,7 +139,7 @@ private Result findMatchingCallSite(MethodInsnNode m, List<LocalVariableAnnotati
     }
 
     private Set<String> getVarAnnotations(List<LocalVariableAnnotationNode> varAnnotations, VarInsnNode v) {
-        Set<String> result = new TreeSet<>();
+        Set<String> result = new TreeSet<String>();
         for (LocalVariableAnnotationNode n : varAnnotations) {
             int idx = n.index.indexOf(v.var);
             if (idx < 0) {
@@ -173,7 +173,7 @@ private boolean isVarBetweenBounds(AbstractInsnNode var, LabelNode lo, LabelNode
     }
 
     private Set<String> getParamAnnotations(Map<Integer, List<AnnotationNode>> paramAnnotations, int varIdx) {
-        Set<String> result = new TreeSet<>();
+        Set<String> result = new TreeSet<String>();
         List<AnnotationNode> annos = paramAnnotations.get(varIdx);
         if (null != annos) {
             for (AnnotationNode n : annos) {

net.tascalate.javaflow.providers.asmx/src/main/java/org/apache/commons/javaflow/providers/asmx/ClassNameResolver.java

@@ -42,7 +42,7 @@ public static Result resolveClassName(String className, Class<?> classBeingRedef
         String resolvedClassName = className != null ? className :
             classBeingRedefined != null ? classBeingRedefined.getName().replace('.', '/') : null;
 
-        String[] classNameFromBytes = {null}; 
+        final String[] classNameFromBytes = {null}; 
         if (null == resolvedClassName) {
             try {
                 ClassReader cv = new ClassReader(classfileBuffer);

net.tascalate.javaflow.providers.asmx/src/main/java/org/apache/commons/javaflow/providers/asmx/ContinuableMethodNode.java

@@ -149,7 +149,7 @@ public void visitEnd() {
             analyzer = new Analyzer<BasicValue>(new FastClassVerifier(inheritanceLookup)) {
                 @Override
                 protected Frame<BasicValue> newFrame(int nLocals, int nStack) {
-                    return new MonitoringFrame<>(nLocals, nStack);
+                    return new MonitoringFrame<BasicValue>(nLocals, nStack);
                 }
 
                 @Override
@@ -167,8 +167,8 @@ protected Frame<BasicValue> newFrame(Frame<? extends BasicValue> src) {
     }
 
     private void checkCallSites() {
-        List<LocalVariableAnnotationNode> varAnnotations = new ArrayList<>();
-        Map<Integer, List<AnnotationNode>> paramAnnotations = new HashMap<>();
+        List<LocalVariableAnnotationNode> varAnnotations = new ArrayList<LocalVariableAnnotationNode>();
+        Map<Integer, List<AnnotationNode>> paramAnnotations = new HashMap<Integer, List<AnnotationNode>>();
 
         varAnnotations.addAll(CallSiteFinder.annotationsList(visibleLocalVariableAnnotations));
         varAnnotations.addAll(CallSiteFinder.annotationsList(invisibleLocalVariableAnnotations));
@@ -215,7 +215,7 @@ private int findCallSiteInvocationInsertionIndex(MethodInsnNode mnode) {
 
     private void moveNew() throws AnalyzerException {
         SourceInterpreter i = new SourceInterpreter();
-        Analyzer<SourceValue> a = new Analyzer<>(i);
+        Analyzer<SourceValue> a = new Analyzer<SourceValue>(i);
         a.analyze(className, this);
 
         HashMap<AbstractInsnNode, MethodInsnNode> movable = new HashMap<AbstractInsnNode, MethodInsnNode>();

net.tascalate.javaflow.providers.asmx/src/main/java/org/apache/commons/javaflow/providers/asmx/MaybeContinuableClassVisitor.java

@@ -74,16 +74,16 @@ public void visitOuterClass(String owner, String name, String desc) {
     }
 
     @Override
-    public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+    public MethodVisitor visitMethod(int access, final String name, final String desc, String signature, String[] exceptions) {
         if (isAnnotation) {
             return null;
         }
 
         boolean isSynthetic = (access & Opcodes.ACC_SYNTHETIC) != 0;
         boolean isPackagePrivate = (access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PUBLIC | Opcodes.ACC_PROTECTED)) == 0;
         if (isSynthetic) {
-            boolean isAccessor = isPackagePrivate && name.startsWith("access$") && (access & Opcodes.ACC_STATIC) != 0;
-            boolean isBridge = (access & Opcodes.ACC_BRIDGE) != 0;
+            final boolean isAccessor = isPackagePrivate && name.startsWith("access$") && (access & Opcodes.ACC_STATIC) != 0;
+            final boolean isBridge = (access & Opcodes.ACC_BRIDGE) != 0;
             if (isAccessor || isBridge) {
                 return new MethodVisitor(this.api) {
                     @Override