Merge pull request #139 from SentryMan/valid

Fix annotations on openapi schema

Author: rbygrave

http-generator-core/src/main/java/io/avaje/http/generator/core/Util.java

@@ -38,7 +38,7 @@ public static String typeDef(TypeMirror typeMirror) {
     }
   }
 
-  static String trimAnnotations(String type) {
+ public static String trimAnnotations(String type) {
     int pos = type.indexOf("@");
     if (pos == -1) {
       return type;

http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/SchemaDocBuilder.java

@@ -1,5 +1,6 @@
 package io.avaje.http.generator.core.openapi;
 
+import io.avaje.http.generator.core.Util;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.media.ArraySchema;
@@ -203,8 +204,9 @@ private Schema<?> buildMapSchema(TypeMirror type) {
   }
 
   private String getObjectSchemaName(TypeMirror type) {
-    String canonicalName = type.toString();
-    int pos = canonicalName.lastIndexOf('.');
+
+    var canonicalName = Util.trimAnnotations(type.toString());
+    final var pos = canonicalName.lastIndexOf('.');
     if (pos > -1) {
       canonicalName = canonicalName.substring(pos + 1);
     }