From 392176bfc9523e60e7038a4797f1a349511b56ab Mon Sep 17 00:00:00 2001
From: uschindler <uwe@thetaphi.de>
Date: Thu, 17 Apr 2014 20:44:39 +0000
Subject: [PATCH] Fix version number on branch, backport issue #27 and
 workaround for ANT bug

---
 build.xml                                     |  15 +++-
 .../de/thetaphi/forbiddenapis/Checker.java    |  68 +++++++++---------
 .../antunit/Java8Annotations$FooBar.class     | Bin 502 -> 499 bytes
 ...8Annotations$InnerClassWithCtorParam.class | Bin 0 -> 1010 bytes
 src/test/antunit/Java8Annotations.class       | Bin 1303 -> 1399 bytes
 src/test/antunit/Java8Annotations.java        |  11 ++-
 src/test/antunit/TestAnnotations.xml          |   4 +-
 7 files changed, 58 insertions(+), 40 deletions(-)
 create mode 100644 src/test/antunit/Java8Annotations$InnerClassWithCtorParam.class

diff --git a/build.xml b/build.xml
index bbf159ed..e847a4bd 100644
--- a/build.xml
+++ b/build.xml
@@ -45,10 +45,21 @@
   </condition>
   <fail message="Minimum supported Java version is 1.5." unless="build.java.runtime"/>
 
+  <!-- workaround for https://issues.apache.org/bugzilla/show_bug.cgi?id=53347 -->
+  <condition property="build.compiler" value="javac1.7">
+    <and>
+      <equals arg1="${build.java.runtime}" arg2="1.8"/>
+      <or>
+        <antversion exactly="1.8.3" />
+        <antversion exactly="1.8.4" />
+      </or>
+    </and>
+  </condition>
+
   <property file="${user.home}/build.properties" />
   <property file="build.properties" />
 
-  <property name="jdk.version" value="1.5.1-dev"/>
+  <property name="jdk.version" value="1.5"/>
   <property name="maven.version" value="2.2.1"/>
   <property name="maven-plugin-plugin.version" value="3.2"/>
   
@@ -63,7 +74,7 @@
   <!-- define Maven coordinates -->
   <property name="groupId" value="de.thetaphi" />
   <property name="artifactId" value="forbiddenapis" />
-  <property name="version" value="1.5"/>
+  <property name="version" value="1.5.1-dev"/>
 
   <!-- define artifacts' name, which follows the convention of Maven -->
   <property name="pom-file" location="dist/${artifactId}-${version}.pom" />
diff --git a/src/main/java/de/thetaphi/forbiddenapis/Checker.java b/src/main/java/de/thetaphi/forbiddenapis/Checker.java
index 83b200e4..e13ae678 100644
--- a/src/main/java/de/thetaphi/forbiddenapis/Checker.java
+++ b/src/main/java/de/thetaphi/forbiddenapis/Checker.java
@@ -469,14 +469,14 @@ boolean checkDescriptor(String desc) {
         return checkType(Type.getType(desc));
       }
 
-      private void reportClassViolation(boolean violation) {
+      private void reportClassViolation(boolean violation, String where) {
         if (violation) {
           violations[0]++;
           final StringBuilder sb = new StringBuilder("  in ").append(className);
           if (source != null) {
-            new Formatter(sb, Locale.ENGLISH).format(" (%s, class declaration)", source).flush();
+            new Formatter(sb, Locale.ENGLISH).format(" (%s, %s)", source, where).flush();
           } else {
-            sb.append(" (class declaration)");
+            new Formatter(sb, Locale.ENGLISH).format(" (%s)", where).flush();
           }
           logError(sb.toString());
         }
@@ -484,7 +484,7 @@ private void reportClassViolation(boolean violation) {
 
       @Override
       public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
-        reportClassViolation(checkClassDefinition(superName, interfaces));
+        reportClassViolation(checkClassDefinition(superName, interfaces), "class declaration");
       }
 
       @Override
@@ -494,13 +494,13 @@ public void visitSource(String source, String debug) {
       
       @Override
       public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-        reportClassViolation(checkDescriptor(desc));
+        if (visible) reportClassViolation(checkDescriptor(desc), "annotation on class declaration");
         return null;
       }
 
       @Override
       public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) {
-        reportClassViolation(checkDescriptor(desc));
+        if (visible) reportClassViolation(checkDescriptor(desc), "type annotation on class declaration");
         return null;
       }
       
@@ -510,30 +510,30 @@ public FieldVisitor visitField(final int access, final String name, final String
           {
             // only check signature, if field is not synthetic
             if ((access & Opcodes.ACC_SYNTHETIC) == 0) {
-              reportFieldViolation(checkDescriptor(desc));
+              reportFieldViolation(checkDescriptor(desc), "field declaration");
             }
           }
           
           @Override
           public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-            reportFieldViolation(checkDescriptor(desc));
+            if (visible) reportFieldViolation(checkDescriptor(desc), "annotation on field declaration");
             return null;
           }
 
           @Override
           public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) {
-            reportFieldViolation(checkDescriptor(desc));
+            if (visible) reportFieldViolation(checkDescriptor(desc), "type annotation on field declaration");
             return null;
           }
           
-          private void reportFieldViolation(boolean violation) {
+          private void reportFieldViolation(boolean violation, String where) {
             if (violation) {
               violations[0]++;
               final StringBuilder sb = new StringBuilder("  in ").append(className);
               if (source != null) {
-                new Formatter(sb, Locale.ENGLISH).format(" (%s, field declaration of '%s')", source, name).flush();
+                new Formatter(sb, Locale.ENGLISH).format(" (%s, %s of '%s')", source, where, name).flush();
               } else {
-                new Formatter(sb, Locale.ENGLISH).format(" (field declaration of '%s')", name).flush();
+                new Formatter(sb, Locale.ENGLISH).format(" (%s of '%s')", where, name).flush();
               }
               logError(sb.toString());
             }
@@ -549,7 +549,7 @@ public MethodVisitor visitMethod(final int access, final String name, final Stri
           {
             // only check signature, if method is not synthetic
             if ((access & Opcodes.ACC_SYNTHETIC) == 0) {
-              reportMethodViolation(checkDescriptor(desc));
+              reportMethodViolation(checkDescriptor(desc), "method declaration");
             }
           }
           
@@ -637,72 +637,72 @@ private boolean checkConstant(Object cst) {
 
           @Override
           public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
-            reportMethodViolation(checkMethodAccess(owner, new Method(name, desc)));
+            reportMethodViolation(checkMethodAccess(owner, new Method(name, desc)), "method body");
           }
           
           @Override
           public void visitFieldInsn(int opcode, String owner, String name, String desc) {
-            reportMethodViolation(checkFieldAccess(owner, name));
+            reportMethodViolation(checkFieldAccess(owner, name), "method body");
           }
           
           @Override
           public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
-            reportMethodViolation(checkDescriptor(desc));
+            if (visible) reportMethodViolation(checkDescriptor(desc), "annotation on method declaration");
+            return null;
+          }
+
+          @Override
+          public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) {
+            if (visible) reportMethodViolation(checkDescriptor(desc), "parameter annotation on method declaration");
             return null;
           }
 
           @Override
           public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) {
-            reportMethodViolation(checkDescriptor(desc));
+            if (visible) reportMethodViolation(checkDescriptor(desc), "type annotation on method declaration");
             return null;
           }
 
           @Override
           public AnnotationVisitor visitInsnAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) {
-            reportMethodViolation(checkDescriptor(desc));
+            if (visible) reportMethodViolation(checkDescriptor(desc), "annotation in method body");
             return null;
           }
 
           @Override
           public AnnotationVisitor visitLocalVariableAnnotation(int typeRef, TypePath typePath, Label[] start, Label[] end, int[] index, String desc, boolean visible) {
-            reportMethodViolation(checkDescriptor(desc));
+            if (visible) reportMethodViolation(checkDescriptor(desc), "annotation in method body");
             return null;
           }
           
           @Override
           public AnnotationVisitor visitTryCatchAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) {
-            reportMethodViolation(checkDescriptor(desc));
+            if (visible) reportMethodViolation(checkDescriptor(desc), "annotation in method body");
             return null;
           }
           
-          @Override
-          public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) {
-            reportMethodViolation(checkDescriptor(desc));
-            return null;
-          }
-
           @Override
           public void visitTypeInsn(int opcode, String type) {
             if (opcode == Opcodes.ANEWARRAY) {
-              reportMethodViolation(checkType(Type.getObjectType(type)));
+              reportMethodViolation(checkType(Type.getObjectType(type)), "method body");
             }
           }
           
           @Override
           public void visitMultiANewArrayInsn(String desc, int dims) {
-            reportMethodViolation(checkDescriptor(desc));
+            reportMethodViolation(checkDescriptor(desc), "method body");
           }
           
           @Override
           public void visitLdcInsn(Object cst) {
-            reportMethodViolation(checkConstant(cst));
+            reportMethodViolation(checkConstant(cst), "method body");
           }
           
           @Override
           public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
-            reportMethodViolation(checkHandle(bsm));
+            reportMethodViolation(checkHandle(bsm), "method body");
             for (final Object cst : bsmArgs) {
-              reportMethodViolation(checkConstant(cst));
+              reportMethodViolation(checkConstant(cst), "method body");
             }
           }
           
@@ -719,7 +719,7 @@ private String getHumanReadableMethodSignature() {
             return sb.toString();
           }
 
-          private void reportMethodViolation(boolean violation) {
+          private void reportMethodViolation(boolean violation, String where) {
             if (violation) {
               violations[0]++;
               final StringBuilder sb = new StringBuilder("  in ").append(className);
@@ -727,10 +727,10 @@ private void reportMethodViolation(boolean violation) {
                 if (lineNo >= 0) {
                   new Formatter(sb, Locale.ENGLISH).format(" (%s:%d)", source, lineNo).flush();
                 } else {
-                  new Formatter(sb, Locale.ENGLISH).format(" (%s, method declaration of '%s')", source, getHumanReadableMethodSignature()).flush();
+                  new Formatter(sb, Locale.ENGLISH).format(" (%s, %s of '%s')", source, where, getHumanReadableMethodSignature()).flush();
                 }
               } else {
-                new Formatter(sb, Locale.ENGLISH).format(" (method declaration of '%s')", getHumanReadableMethodSignature()).flush();
+                new Formatter(sb, Locale.ENGLISH).format(" (%s of '%s')", where, getHumanReadableMethodSignature()).flush();
               }
               logError(sb.toString());
             }
diff --git a/src/test/antunit/Java8Annotations$FooBar.class b/src/test/antunit/Java8Annotations$FooBar.class
index 9c8884f751b473c05bcc5781a9aa1b0f3bab30db..4e7b6eaf4dd7e9cd99da6e85ab39ab2a888a14b4 100644
GIT binary patch
delta 24
gcmeyy{F!;eDh~FbP`?mQU)PBnf*3g`b1=RG0CC|6ga7~l

delta 27
jcmey&{Ed0SDmGSUAIIR}iJOAh_(CEBT;nIRGQI-<i^B<g

diff --git a/src/test/antunit/Java8Annotations$InnerClassWithCtorParam.class b/src/test/antunit/Java8Annotations$InnerClassWithCtorParam.class
new file mode 100644
index 0000000000000000000000000000000000000000..e1ca1e4f31cdcb36a9bbca896afec17c07060b6f
GIT binary patch
literal 1010
zcmZ`&U279T6g`tov)#D1acdK+R%;vEZPF%Dd=OF!8Yn11iz%_MlQ^_flG!jj5&GhP
zQc%GMe}F$qytA=1$x@ct`!(mD`@#JA`|CG=7kKVr0ULSb@WjI=w(=<Bsf!&KAw$lb
z%edTN2-<J?Xa4e)Qjy_CMk;Pn^gt?U4jFdBbhv#%fck)|v-<nqh3K2+ZkHk3iarU3
z<+fDf-FVm&`h@oe<O$kQpAWiROKbmkW-UEK>5WoCw+1|pKT31nGLb&!nhzQL>xiI>
zl~ft!>kBhbs(xWK$q}S0Whl;;b2+*ysh*-ZI5}+|)^6r;D9+$@<eB1Ttf|*rNG>~#
z^$%lZ<WO{FEN$0BGc{osyL9&`ie7Wgu$Ce&PePP@b2d*h9ASi>O2&}yL}T3-N79aa
zb$*>SyDlFt7JYcAxTyNr!@i4}k2)GIo-u^;pqr-4P?+C7Z83$uYRw7lFs2}#%h(87
zuM>?8)jC;_jOxc)D$_Aq@F8`*l5otr8QhV*G*E;K)0<6*<_kfCo<NRX11l8l1gu7%
zhdi>lMb;N&;E=pmseT8m{6yv(oazr`N$ipMN-+mM{R2V(6~b0gpaGV!kK5$gnBcL5
zJ7iI&goh<sfECJrm-He@8(YFENvj2kuS9x=tTmDzSdqj-I_q>?Td6fNc$EAf6R)i!
QLp^O{nXLOHA8arF1KR!j#Q*>R

literal 0
HcmV?d00001

diff --git a/src/test/antunit/Java8Annotations.class b/src/test/antunit/Java8Annotations.class
index 46327604a8881dbfc4509381d7d696df0ebc917c..c16741746f6154190c8776232fd7da592a623e23 100644
GIT binary patch
delta 647
zcmZ`#OHUI~7(Mse_O{chmbb-LN_jskDsL2Mg#^>2#01^AnUV<%DKp8;z?NSi3CzOZ
z;F1-Ag+D+y{u_73a|=XF^d{e&bI*MD<b2;}<EP<#`*r;lz)MsO7?@I+HXt#jKV^ky
zDa_!x!V7~Pvj*lcudpDH*z~-L<qMcwu50_%rWFKsps*;=^GEsMg!|Rd^S3SEIy|d2
zQiXR%Zs;7^?=P-$VxV+)a{{N)v|C+vX#4A~>xEY6cy18=5Fg_vdhj@^%dSKb{Q~*u
zlgK9(mP{;TB|4S)+A9;Uv8u3UVjUHM?16P`m7A8kSFSe>?A=gc^ev@@d)9;h$r*i@
zUrrt&%LTM?F+e*j0f7#pKqvnQbde_^D0P!b79&#6k!=tKF+P3?aY6C`z5MEp0tLjl
z#3y9tO%w9efTw>cnLb{V;JAn*cOIJ)z0rKE??k^V(yt9^lrTW19S0dnp8|$3OxF=|
z1-Y#dPq&h`L%z`s%v!m{f6S(5;?#N|RyRk`bd;5mbme8|2DptesuJUvXyN2NH$A3)
ar?;gYQ+&gtC6mP{Ivdi%No0r*k^K$!XIpOo

delta 574
zcmZut$xZ@66s&HPfniWY#T69<7hG`PS6mVjjmD$5!A#5;9HN6<IeRp7@Eg48$;5*n
z;MsriW~?4fjES9ezj|B0s`sJa>j!V2FRuXRu%$!Cn1*p35@YI_&@dTB9#a~ob<AK^
zXW6`l1%cpxrBX1j1&pHOSl2sc({(NP&MrmzPi~y5eQ6b)+S7ZN@Z$1xP@v~GYP)u+
zY;8MErD|5~isKq+N5Z?3?SVe@d$%$bTr{wRW$#h;rdABBVok%kfema5#4gO5nJ=5p
zdH$$$VVzaI&cH)GiYD@HrVb#+8-zd$tw5X^fmY%W1Wg-}<mE`lJBapZ1#M&Q8RCf`
zfKI+@0YDNBTtF9*@m+*&^w8`56Nx72hCuo(@9+*A7V7GYZt?)q%nTxmAu`L5RhG@e
z{+9zB)q)5HkRnpU(qyYnk{uZi%o1ym#~K<VzKA&Ft}396!jJt&b}LG14>IvxnV>wS
kTO$Xhei$RZ9sQ>@$Bf#Zs#jYJ`?7u4psUj*Aw-5kU#&7ek^lez

diff --git a/src/test/antunit/Java8Annotations.java b/src/test/antunit/Java8Annotations.java
index 365a4dcc..404004e2 100644
--- a/src/test/antunit/Java8Annotations.java
+++ b/src/test/antunit/Java8Annotations.java
@@ -38,13 +38,20 @@ static void test(@FooBar int param1, @FooBar long param2) {
     }
   }
   
+  final class InnerClassWithCtorParam {
+    public InnerClassWithCtorParam(@FooBar X param) {
+      System.out.println(Java8Annotations.this);
+      System.out.println(param);
+    }
+  }
+  
   @Deprecated
   public int testField1;
   
   @FooBar
   public int testField2;
   
-  @Retention(value=RetentionPolicy.CLASS)
-  @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER, ElementType.METHOD, ElementType.TYPE})
+  @Retention(value=RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE, ElementType.PARAMETER, ElementType.METHOD, ElementType.TYPE})
   static @interface FooBar {}
 }
diff --git a/src/test/antunit/TestAnnotations.xml b/src/test/antunit/TestAnnotations.xml
index 589efec7..1af7d4d0 100644
--- a/src/test/antunit/TestAnnotations.xml
+++ b/src/test/antunit/TestAnnotations.xml
@@ -19,14 +19,14 @@
   <target name="testAnnotations">
     <au:expectfailure expectedMessage="Check for forbidden API calls failed, see log">
       <forbiddenapis failOnMissingClasses="true" classpath="${basedir}">
-        <fileset file="Java8Annotations.class"/>
+        <fileset file="Java8Annotations*.class"/>
         Java8Annotations$FooBar @ Forbidden annotation
         java.lang.Deprecated @ Deprecated annotation
       </forbiddenapis>
     </au:expectfailure>
     <au:assertLogContains level="error" text="Java8Annotations$FooBar [Forbidden annotation]"/> 
     <au:assertLogContains level="error" text="java.lang.Deprecated [Deprecated annotation]"/> 
-    <au:assertLogContains level="error" text=" 11 error(s)"/> 
+    <au:assertLogContains level="error" text=" 15 error(s)"/> 
   </target>
   
 </project>
\ No newline at end of file