Fixed some ClassCastException.

.gitignore

@@ -12,4 +12,8 @@ nogit/
 RemoteSystemsTempFiles
 /.gradle
 .DS_Store
-pom.xml.versionsBackup
+.classpath
+.settings
+.project
+bin
+.gitignore

jaxrs-to-raml/jaxrs-parser/src/main/java/org/raml/jaxrs/parser/model/JerseyJaxRsEntity.java

@@ -21,6 +21,7 @@
 import org.raml.jaxrs.parser.source.SourceParser;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
 /**
@@ -58,7 +59,6 @@ static JerseyJaxRsEntity create(Parameter input, SourceParser sourceParser) {
     return new JerseyJaxRsEntity(input.getType(), sourceParser);
   }
 
-
   static Optional<JaxRsEntity> create(Type input, SourceParser sourceParser) {
 
     if (input == null) {
@@ -72,6 +72,13 @@ static Optional<JaxRsEntity> create(Type input, SourceParser sourceParser) {
   @Override
   public <T extends Annotation> Optional<T> getAnnotation(Class<T> annotationType) {
 
-    return (Optional<T>) Optional.fromNullable(((Class) input).getAnnotation(annotationType));
+    Type type = input;
+    if (type instanceof ParameterizedType) {
+      ParameterizedType pt = (ParameterizedType) type;
+      type = pt.getRawType();
+    }
+
+    Class c = (Class) type;
+    return (Optional<T>) Optional.fromNullable(((Class) type).getAnnotation(annotationType));
   }
 }

jaxrs-to-raml/raml-generator-api/src/main/java/org/raml/jaxrs/emitters/AnnotationInstanceEmitter.java

@@ -39,11 +39,11 @@
 public class AnnotationInstanceEmitter implements LocalEmitter {
 
   private final IndentedAppendable writer;
-  private final List<RamlSupportedAnnotation> suportedAnnotations;
+  private final List<RamlSupportedAnnotation> supportedAnnotations;
 
   public AnnotationInstanceEmitter(IndentedAppendable writer, List<RamlSupportedAnnotation> supportedAnnotation) {
     this.writer = writer;
-    this.suportedAnnotations = supportedAnnotation;
+    this.supportedAnnotations = supportedAnnotation;
   }
 
   @Override
@@ -65,7 +65,7 @@ public void emit(RamlResourceMethod method) throws IOException {
   }
 
   private void annotate(Annotable annotable) throws IOException {
-    for (RamlSupportedAnnotation suportedAnnotation : suportedAnnotations) {
+    for (RamlSupportedAnnotation suportedAnnotation : supportedAnnotations) {
 
       Optional<Annotation> annotationOptional = suportedAnnotation.getAnnotationInstance(annotable);
       if (annotationOptional.isPresent() == false) {

jaxrs-to-raml/raml-generator-api/src/main/java/org/raml/jaxrs/handlers/SimpleJacksonTypes.java

@@ -32,6 +32,8 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+import java.lang.reflect.ParameterizedType;
 
 /**
  * Created by Jean-Philippe Belanger on 3/26/17. Just potential zeroes and ones
@@ -61,11 +63,19 @@ private void writeBody(TypeRegistry registry, IndentedAppendable writer,
   private static class SimpleJaxbTypeScanner implements TypeScanner {
 
     @Override
-    public void scanType(TypeRegistry typeRegistry, RamlEntity type, RamlType ramlType) {
+    public void scanType(TypeRegistry typeRegistry, RamlEntity ramlEntity, RamlType ramlType) {
+      Type type = ramlEntity.getType();
+      if (type instanceof ParameterizedType) {
+        ParameterizedType pt = (ParameterizedType) type;
+        type = pt.getRawType();
+      };
+      if (type instanceof TypeVariable) {
+        type = (Class) ((TypeVariable) type).getGenericDeclaration();
+      }
 
-      Class c = (Class) type.getType();
-      forFields(typeRegistry, type, ramlType, c);
-      forProperties(typeRegistry, type, ramlType, c);
+      Class c = (Class) type;
+      forFields(typeRegistry, ramlEntity, ramlType, c);
+      forProperties(typeRegistry, ramlEntity, ramlType, c);
     }
 
     private void forProperties(TypeRegistry typeRegistry, RamlEntity type, RamlType ramlType, Class c) {

jaxrs-to-raml/raml-generator-api/src/main/java/org/raml/jaxrs/types/RamlType.java

@@ -21,7 +21,6 @@
 import org.raml.api.Annotable;
 import org.raml.api.RamlData;
 import org.raml.api.ScalarType;
-import org.raml.jaxrs.common.Example;
 import org.raml.jaxrs.emitters.AnnotationInstanceEmitter;
 import org.raml.jaxrs.emitters.Emittable;
 import org.raml.jaxrs.emitters.ExampleEmitter;
@@ -30,6 +29,9 @@
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -71,8 +73,19 @@ public void addProperty(RamlProperty property) {
   }
 
   public void write(AnnotationInstanceEmitter emitter, IndentedAppendable writer) throws IOException {
+    Type ttype = type.getType();
+    if (ttype instanceof ParameterizedType) {
+      ParameterizedType pt = (ParameterizedType) ttype;
+      ttype = pt.getRawType();
+    }
+    if (ttype instanceof TypeVariable) {
+      System.out.println("Ignored type: " + type);
+      System.out.println("emitter: " + emitter);
+      System.out.println("type.getType(): " + ttype);
+      return;
+    }
 
-    Class c = (Class) type.getType();
+    Class c = (Class) ttype;
     writer.appendLine(c.getSimpleName() + ":");
     writer.indent();
 
@@ -110,6 +123,7 @@ public void writeExample(IndentedAppendable writer) throws IOException {
   }
 
 
+  @SuppressWarnings({"rawtypes"})
   public String getTypeName() {
 
     Optional<ScalarType> st = ScalarType.fromType(type.getType());
@@ -120,12 +134,23 @@ public String getTypeName() {
         return st.get().getRamlSyntax();
       }
     } else {
+      Type typeType = type.getType();
+      if (typeType instanceof ParameterizedType) {
+        ParameterizedType pt = (ParameterizedType) typeType;
+        typeType = pt.getRawType();
+      }
+      String name;
+      if (typeType instanceof TypeVariable) {
+        name = ((TypeVariable) typeType).getName();
+      } else {
+        Class c = (Class) typeType;
+        name = c.getSimpleName();
+      }
 
-      Class c = (Class) type.getType();
       if (collection == true) {
-        return c.getSimpleName() + "[]";
+        return name + "[]";
       } else {
-        return c.getSimpleName();
+        return name;
       }
     }
   }