Add Exception Type Parsing

class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/MethodModel.java

@@ -47,6 +47,12 @@ public interface MethodModel extends Member, AnnotatedElement {
      */
     String[] getArgumentTypes();
 
+    /**
+     * @return the checked exception types, or an empty array if the method doesn't
+     *         declare any thrown exceptions
+     */
+    String[] getExceptionTypes();
+
     /**
      * Returns the list of parameter
      *

class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodModelImpl.java

@@ -26,6 +26,7 @@
 public class MethodModelImpl extends AnnotatedElementImpl implements MethodModel {
 
     private List<Parameter> parameters;
+    private List<ParameterizedType> exceptionTypes;
     private ParameterizedType returnType;
     final ExtensibleType<?> owner;
     private final String signature;
@@ -74,6 +75,24 @@ public String[] getArgumentTypes() {
         return stringTypes;
     }
 
+    @Override
+    public String[] getExceptionTypes() {
+        String[] stringTypes;
+        if (exceptionTypes != null) {
+            stringTypes = new String[exceptionTypes.size()];
+            for (int i = 0; i < exceptionTypes.size(); i++) {
+                stringTypes[i] = exceptionTypes.get(i).getTypeName();
+            }
+        } else {
+            stringTypes = new String[0];
+        }
+        return stringTypes;
+    }
+
+    public void setExceptionTypes(List<ParameterizedType> exceptionTypes) {
+        this.exceptionTypes = exceptionTypes;
+    }
+
     @Override
     public List<Parameter> getParameters() {
         return parameters;

class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/MethodSignatureVisitorImpl.java

@@ -36,6 +36,7 @@ public class MethodSignatureVisitorImpl extends SignatureVisitor {
     private final MethodModel methodModel;
 
     private final List<Parameter> parameters = new ArrayList<>();
+    private final List<ParameterizedType> exceptionTypes = new ArrayList<>();
     private final ParameterizedType returnType = new ParameterizedTypeImpl();
     private final ArrayDeque<ParameterizedType> parentType = new ArrayDeque<>();
 
@@ -50,6 +51,10 @@ public List<Parameter> getParameters() {
         return parameters;
     }
 
+    public List<ParameterizedType> getExceptionTypes() {
+        return exceptionTypes;
+    }
+
     public ParameterizedType getReturnType() {
         return returnType;
     }
@@ -62,6 +67,14 @@ public SignatureVisitor visitParameterType() {
         return this;
     }
 
+    @Override
+    public SignatureVisitor visitExceptionType() {
+        ParameterizedTypeImpl exceptionType = new ParameterizedTypeImpl();
+        exceptionTypes.add(exceptionType);
+        parentType.add(exceptionType);
+        return this;
+    }
+
     @Override
     public SignatureVisitor visitReturnType() {
         parentType.add(returnType);

class-model/src/main/java/org/glassfish/hk2/classmodel/reflect/impl/ModelClassVisitor.java

@@ -40,7 +40,7 @@
 public class ModelClassVisitor extends ClassVisitor {
 
     private static Logger logger = Logger.getLogger(ModelClassVisitor.class.getName());
-  
+
     private final ParsingContext ctx;
     private final TypeBuilder typeBuilder;
     private final URI definingURI;
@@ -60,7 +60,7 @@ public class ModelClassVisitor extends ClassVisitor {
     public ModelClassVisitor(ParsingContext ctx, URI definingURI, String entryName,
                              boolean isApplicationClass) {
         super(Opcodes.ASM9);
-        
+
         this.ctx = ctx;
         this.definingURI = definingURI;
         this.entryName = entryName;
@@ -83,7 +83,7 @@ public void visit(int version, int access, String name, String signature, String
             parent = (parentName!=null?typeBuilder.getHolder(parentName, typeType):null);
         }
         if (parent!=null && !parentName.equals(Object.class.getName())) {
-            // put a temporary parent until we eventually visit it. 
+            // put a temporary parent until we eventually visit it.
             TypeImpl parentType = typeBuilder.getType(access, parentName, null);
             parent.set(parentType);
         }
@@ -100,15 +100,15 @@ public void visit(int version, int access, String name, String signature, String
         } catch (URISyntaxException e) {
             e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
         }
-        
+
         if (logger.isLoggable(Level.FINER)) {
           logger.log(Level.FINER, "visiting {0} with classDefURI={1}", new Object[] {entryName, classDefURI});
         }
 
 //        if (!new File(classDefURI).exists()) {
 //          throw new IllegalStateException(entryName + ": " + classDefURI.toString());
 //        }
-        
+
         type = ctx.getTypeBuilder(classDefURI).getType(access, className, parent);
         type.setApplicationClass(isApplicationClass);
         type.getProxy().visited();
@@ -151,7 +151,7 @@ public void visit(int version, int access, String name, String signature, String
                         if (typeProxy.get() == null) {
                             typeProxy.set((InterfaceModel) interfaceModel);
                         }
-                        
+
                         classModel.isImplementing(typeProxy);
                         if (classModel instanceof ClassModel) {
                             typeProxy.addImplementation((ClassModel) classModel);
@@ -180,7 +180,7 @@ public void visitOuterClass(String owner, String name, String desc) {
     @Override
     public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
         desc = unwrap(desc);
-        
+
         final AnnotationTypeImpl at = (AnnotationTypeImpl) typeBuilder.getType(Opcodes.ACC_ANNOTATION, desc, null);
         final AnnotationModelImpl am = new AnnotationModelImpl(type, at);
 
@@ -271,10 +271,11 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
 
         SignatureReader reader = new SignatureReader(signature == null ? desc : signature);
         MethodSignatureVisitorImpl visitor = new MethodSignatureVisitorImpl(typeBuilder, methodModel);
-        reader.accept(visitor);
+        acceptSignatureAndExceptions(reader, exceptions, visitor);
 
         methodModel.setParameters(visitor.getParameters());
         methodModel.setReturnType(visitor.getReturnType());
+        methodModel.setExceptionTypes(visitor.getExceptionTypes());
 
         // fallback for void, primitive data types, java.lang.Object and generic wildcards types
         ParameterizedTypeImpl returnType = (ParameterizedTypeImpl) methodModel.getReturnType();
@@ -291,10 +292,22 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
         return methodVisitor;
     }
 
+    private void acceptSignatureAndExceptions(SignatureReader reader, String[] exceptions, MethodSignatureVisitorImpl visitor) {
+        reader.accept(visitor);
+        // if info about exceptions isn't in the signature and the visitor didn't receive it,
+        // pass this info from the exceptions array
+        if (exceptions != null && visitor.getExceptionTypes().isEmpty()) {
+            for (String exceptionType : exceptions) {
+                visitor.visitExceptionType();
+                visitor.visitClassType(exceptionType);
+            }
+        }
+    }
+
     @Override
     public void visitEnd() {
         type=null;
-    }                                                            
+    }
 
     private String unwrap(String desc) {
         return org.objectweb.asm.Type.getType(desc).getClassName();
@@ -344,7 +357,7 @@ private class ModelMethodVisitor extends MethodVisitor {
 
         private ModelMethodVisitor(MemberVisitingContext context) {
             super(Opcodes.ASM9);
-            
+
             this.context = new MethodVisitingContext(context.modelUnAnnotatedMembers);
         }
 
@@ -358,7 +371,7 @@ public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
                 // probably an annotation method, ignore
                 return null;
             }
-          
+
             AnnotationTypeImpl annotationType = (AnnotationTypeImpl) typeBuilder.getType(Opcodes.ACC_ANNOTATION, unwrap(desc), null);
             AnnotationModelImpl annotationModel = new AnnotationModelImpl(context.method, annotationType);
 
@@ -405,8 +418,8 @@ public AnnotationVisitor visitAnnotationDefault() {
           return defaultAnnotationVisitor;
         }
     }
-    
-    
+
+
     private class ModelDefaultAnnotationVisitor extends AnnotationVisitor {
 
         private final MethodVisitingContext context;

class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/MethodTest.java

@@ -82,6 +82,11 @@ public void simpleTest() throws IOException, InterruptedException {
                         Assert.assertEquals("yellow", gradientColor2.get(0).getValues().get("name"));
                         Assert.assertEquals("orange", gradientColor2.get(1).getValues().get("name"));
 
+                        // Exception types
+                        final String[] exceptionTypes = mm.getExceptionTypes();
+                        Assert.assertEquals(1, exceptionTypes.length);
+                        Assert.assertEquals(IllegalArgumentException.class.getName(), exceptionTypes[0]);
+
                         // Parameter annotations, type and generic types check
                         Assert.assertEquals(5, mm.getParameters().size());
 

class-model/src/test/java/org/glassfish/hk2/classmodel/reflect/test/method/SimpleAnnotatedMethod.java

@@ -44,7 +44,7 @@ public SampleType<Integer, Character, Boolean> setFoo(
             List<String> input,
             SampleType<Double, String, SampleType<Short, Float, Long>> sampleType,
             int count,
-            Object value) {
+            Object value) throws IllegalArgumentException {
         return null;
     }
 }