Add @Identifier annotations

Author: mernst

README-typetools.txt

@@ -4,6 +4,8 @@ This is a version of BCEL that is annotated with type annotations for the Checke
 To build this project
 ---------------------
 
+Use a Java 8 JDK.
+
 ```
 mvn -B -Dmaven.test.skip=true package
 ```

pom.xml

@@ -117,7 +117,7 @@
         <configuration>
           <excludes>
             <exclude>README-typetools.txt</exclude>
-            <exclude>TAGS</exclude>
+            <exclude>**/TAGS</exclude>
             <exclude>cfMavenCentral.xml</exclude>
             <exclude>src/test/resources/**</exclude>
             <exclude>docs/*.bib</exclude>

src/main/java/org/apache/bcel/classfile/FieldOrMethod.java

@@ -16,16 +16,17 @@
  */
 package org.apache.bcel.classfile;
 
+import org.checkerframework.checker.index.qual.NonNegative;
+import org.checkerframework.checker.signature.qual.Identifier;
+import org.checkerframework.dataflow.qual.Pure;
+import org.checkerframework.framework.qual.AnnotatedFor;
+
 import java.io.DataInput;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.dataflow.qual.Pure;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 /**
  * Abstract super class for fields and methods.
  */
@@ -212,7 +213,7 @@ public final String getGenericSignature() {
     /**
      * @return Name of object, i.e., method name or field name
      */
-    public final String getName() {
+    public final @Identifier String getName() {
         return constant_pool.getConstantUtf8(name_index).getBytes();
     }
 

src/main/java/org/apache/bcel/generic/FieldGenOrMethodGen.java

@@ -25,6 +25,7 @@
 import org.apache.bcel.classfile.Attribute;
 
 import org.checkerframework.checker.nullness.qual.EnsuresNonNull;
+import org.checkerframework.checker.signature.qual.Identifier;
 import org.checkerframework.dataflow.qual.Pure;
 
 /**
@@ -116,7 +117,7 @@ public ConstantPoolGen getConstantPool() {
      */
     @Override
     @Pure
-    public String getName() {
+    public @Identifier String getName() {
         return name;
     }
 
@@ -164,7 +165,7 @@ public void setConstantPool(final ConstantPoolGen cp) { // TODO could be package
     }
 
     @Override
-    public void setName(final String name) { // TODO could be package-protected?
+    public void setName(final @Identifier String name) { // TODO could be package-protected?
         this.name = name;
     }
 

src/main/java/org/apache/bcel/generic/InvokeInstruction.java

@@ -16,6 +16,11 @@
  */
 package org.apache.bcel.generic;
 
+import org.checkerframework.checker.index.qual.NonNegative;
+import org.checkerframework.checker.signature.qual.ClassGetName;
+import org.checkerframework.checker.signature.qual.Identifier;
+import org.checkerframework.framework.qual.AnnotatedFor;
+
 import java.util.StringTokenizer;
 
 import org.apache.bcel.Const;
@@ -24,10 +29,6 @@
 import org.apache.bcel.classfile.ConstantPool;
 import org.apache.bcel.classfile.Utility;
 
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.checker.signature.qual.ClassGetName;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 /**
  * Super class for the INVOKExxx family of instructions.
  */
@@ -91,7 +92,7 @@ public Type[] getArgumentTypes(final ConstantPoolGen cpg) {
     /**
      * @return name of referenced method.
      */
-    public String getMethodName(final ConstantPoolGen cpg) {
+    public @Identifier String getMethodName(final ConstantPoolGen cpg) {
         return getName(cpg);
     }