Exceptions support, plug in Signature processing. Prep for type annot…

…ations
smallrye · Sep 27, 2014 · 8ef4d7a · 8ef4d7a
1 parent 41d0223
commit 8ef4d7a
Show file tree

Hide file tree

Showing 16 changed files with 350 additions and 48 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <jandexVersion>1.2.1.Final</jandexVersion>
+        <jandexVersion>2.0.0.Alpha1</jandexVersion>
     </properties>
 
     <parent>
@@ -37,25 +37,18 @@
                     <showWarnings>true</showWarnings>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                <archive>
-                    <index>true</index>
-                    <manifest>
-                        <mainClass>org.jboss.jandex.Main</mainClass>
-                    </manifest>
-                </archive>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <version>2.3.7</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <archive>
+                        <index>true</index>
+                        <manifest>
+                            <mainClass>org.jboss.jandex.Main</mainClass>
+                        </manifest>
+                    </archive>
                     <instructions>
                         <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${jandexVersion}</Bundle-Version>

diff --git a/src/main/java/org/jboss/jandex/ArrayType.java b/src/main/java/org/jboss/jandex/ArrayType.java
@@ -67,6 +67,11 @@ public Kind kind() {
         return Kind.ARRAY;
     }
 
+    @Override
+    public ArrayType asArrayType() {
+        return this;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

diff --git a/src/main/java/org/jboss/jandex/ClassInfo.java b/src/main/java/org/jboss/jandex/ClassInfo.java
@@ -18,6 +18,7 @@
 
 package org.jboss.jandex;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -49,6 +50,11 @@ public final class ClassInfo implements AnnotationTarget {
     private final DotName superName;
     private final DotName[] interfaces;
     private final Map<DotName, List<AnnotationInstance>> annotations;
+    private Collection<Type> interfaceTypes;
+    private Type superClassType;
+    private List<Type> typeParameters;
+    private Collection<MethodInfo> methods;
+    private Collection<FieldInfo> fields;
 
     // Not final to allow lazy initialization, immutable once published
     private boolean hasNoArgsConstructor;
@@ -105,6 +111,26 @@ public final Map<DotName, List<AnnotationInstance>> annotations() {
         return annotations;
     }
 
+    public final Collection<MethodInfo> methods() {
+        return methods;
+    }
+
+    public final Collection<FieldInfo> fields() {
+        return fields;
+    }
+
+    public final Collection<Type> interfaceTypes() {
+        return interfaceTypes;
+    }
+
+    public final Type superClassType() {
+        return superClassType;
+    }
+
+    public final List<Type> typeParameters() {
+        return typeParameters;
+    }
+
     /**
      * Returns a boolean indicating the presence of a no-arg constructor, if supported by the underlying index store.
      * This information is available in indexes produced by Jandex 1.2.0 and later.
@@ -121,4 +147,24 @@ public final boolean hasNoArgsConstructor() {
     void setHasNoArgsConstructor(boolean hasNoArgsConstructor) {
         this.hasNoArgsConstructor = hasNoArgsConstructor;
     }
+
+    void setFields(List<FieldInfo> fields) {
+        this.fields = fields;
+    }
+
+    void setMethods(List<MethodInfo> methods) {
+        this.methods = methods;
+    }
+
+    void setSuperClassType(Type superClassType) {
+        this.superClassType = superClassType;
+    }
+
+    void setInterfaceTypes(Collection<Type> interfaceTypes) {
+        this.interfaceTypes = interfaceTypes;
+    }
+
+    void setTypeParameters(List<Type> typeParameters) {
+        this.typeParameters = typeParameters;
+    }
 }
diff --git a/src/main/java/org/jboss/jandex/ClassType.java b/src/main/java/org/jboss/jandex/ClassType.java
@@ -29,4 +29,9 @@ public final class ClassType extends Type {
     public Kind kind() {
         return Kind.CLASS;
     }
+
+    @Override
+    public ClassType asClassType() {
+        return this;
+    }
 }
diff --git a/src/main/java/org/jboss/jandex/FieldInfo.java b/src/main/java/org/jboss/jandex/FieldInfo.java
@@ -31,7 +31,7 @@
  */
 public final class FieldInfo implements AnnotationTarget {
     private final String name;
-    private final Type type;
+    private Type type;
     private final short flags;
     private final ClassInfo clazz;
 
@@ -101,4 +101,8 @@ public final short flags() {
     public String toString() {
         return type + " " + clazz.name() + "." + name;
     }
+
+    void setType(Type type) {
+        this.type = type;
+    }
 }
diff --git a/src/main/java/org/jboss/jandex/GenericSignatureParser.java b/src/main/java/org/jboss/jandex/GenericSignatureParser.java
@@ -1,11 +1,8 @@
 package org.jboss.jandex;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -102,7 +99,7 @@ class GenericSignatureParser {
     private int pos;
     private NameTable names;
     private Map<String, TypeVariable> typeParameters;
-    private Map<String, TypeVariable> methodTypeParameters = new HashMap<String, TypeVariable>();
+    private Map<String, TypeVariable> elementTypeParameters = new HashMap<String, TypeVariable>();
     private Map<String, TypeVariable> classTypeParameteres = new HashMap<String, TypeVariable>();
 
     GenericSignatureParser() {
@@ -246,10 +243,19 @@ private void expect(char c) {
          }
      }
 
+    Type parseFieldSignature(String signature) {
+        this.signature = signature;
+        this.typeParameters = this.elementTypeParameters;
+        this.typeParameters.clear();
+        this.pos = 0;
+
+        return parseReferenceType();
+    }
+
 
     MethodSignature parseMethodSignature(String signature) {
         this.signature = signature;
-        this.typeParameters = this.methodTypeParameters;
+        this.typeParameters = this.elementTypeParameters;
         this.typeParameters.clear();
         this.pos = 0;
 
@@ -430,7 +436,7 @@ private Type parseArrayType() {
 
     private Type parseTypeVariable() {
         String name = names.intern(signature.substring(pos + 1, advancePast(';')));
-        Type type = typeParameters.get(name);
+        Type type = resolveType(name);
         return type == null ? new UnresolvedTypeVariable(name) : type;
     }
 
@@ -453,7 +459,7 @@ private Type resolveType(Type type) {
     }
 
     private Type resolveType(String identifier) {
-        Type ret = methodTypeParameters.get(identifier);
+        Type ret = elementTypeParameters.get(identifier);
         return ret == null ? classTypeParameteres.get(identifier) : ret;
     }