No effective change, format only

rbygrave · rbygrave · commit f7909d939826 · 2023-01-06T13:28:02.000+13:00
diff --git a/http-generator-client/src/main/java/io/avaje/http/generator/client/ClientMethodWriter.java b/http-generator-client/src/main/java/io/avaje/http/generator/client/ClientMethodWriter.java
@@ -152,14 +152,11 @@ void writeGeneric(UType type) {
                   .map(Util::shortName)
                   .collect(Collectors.joining(".class, "));
 
-      writer.append(
-          "Types.newParameterizedType(%s.class, %s.class)", Util.shortName(type.mainType()), params);
+      writer.append("Types.newParameterizedType(%s.class, %s.class)", Util.shortName(type.mainType()), params);
     } else {
       writer.append("%s.class", Util.shortName(type.mainType()));
     }
-    writer.append(");");
-
-    writer.eol();
+    writer.append(");").eol();
   }
 
   private void writeWithHandler() {
@@ -283,4 +280,4 @@ private boolean isHttpResponse(String type0) {
     return type0.equals("java.net.http.HttpResponse");
   }
 
-}
+}
diff --git a/http-generator-client/src/main/java/io/avaje/http/generator/client/ClientProcessor.java b/http-generator-client/src/main/java/io/avaje/http/generator/client/ClientProcessor.java
@@ -35,6 +35,7 @@ public ClientProcessor() {
       Class.forName("io.avaje.jsonb.Jsonb");
       jsonBOnClassPath = true;
     } catch (final ClassNotFoundException e) {
+      // intentionally ignored
     }
     useJsonB = jsonBOnClassPath;
   }
diff --git a/http-generator-core/src/main/java/io/avaje/http/generator/core/JsonBUtil.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/JsonBUtil.java
@@ -38,7 +38,6 @@ private static void addJsonBodyType(MethodReader methodReader, Consumer<UType> a
   }
 
   public static void writeJsonbType(UType type, Append writer) {
-
     writer.append("    this.%sJsonType = jsonB.type(", type.shortName());
     if (!type.isGeneric()) {
       writer.append("%s.class)", Util.shortName(PrimitiveUtil.wrap(type.full())));
@@ -56,13 +55,12 @@ public static void writeJsonbType(UType type, Append writer) {
           writeType(type.paramRaw(), writer);
           writer.append(".map()");
           break;
-        default:
-          {
-            if (type.mainType().contains("java.util"))
-              throw new UnsupportedOperationException(
-                  "Only java.util Map, Set and List are supported JsonB Controller Collection Types");
-            writeType(type, writer);
+        default: {
+          if (type.mainType().contains("java.util")) {
+            throw new UnsupportedOperationException("Only java.util Map, Set and List are supported JsonB Controller Collection Types");
           }
+          writeType(type, writer);
+        }
       }
     }
     writer.append(";").eol();
@@ -76,9 +74,7 @@ static void writeType(UType type, Append writer) {
               .map(Util::shortName)
               .collect(Collectors.joining(".class, "));
 
-      writer.append(
-          "Types.newParameterizedType(%s.class, %s.class))",
-          Util.shortName(type.mainType()), params);
+      writer.append("Types.newParameterizedType(%s.class, %s.class))", Util.shortName(type.mainType()), params);
     } else {
       writer.append("%s.class)", Util.shortName(type.mainType()));
     }
diff --git a/http-generator-core/src/main/java/io/avaje/http/generator/core/UType.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/UType.java
@@ -11,7 +11,10 @@ public interface UType {
   static UType parse(TypeMirror type) {
     return Util.parseType(type);
   }
-  /** Create the UType from the given String. */
+
+  /**
+   * Create the UType from the given String.
+   */
   static UType parse(String type) {
     return Util.parse(type);
   }
@@ -52,12 +55,16 @@ default String param1() {
     return null;
   }
 
-  /** Return the raw generic parameter if this UType is a Collection. */
+  /**
+   * Return the raw generic parameter if this UType is a Collection.
+   */
   default UType paramRaw() {
     return null;
   }
 
-  /** Return the raw type. */
+  /**
+   * Return the raw type.
+   */
   String full();
 
   default boolean isGeneric() {
@@ -114,8 +121,8 @@ public String full() {
     @Override
     public Set<String> importTypes() {
       return rawType.startsWith("java.lang.") && rawType.indexOf('.') > -1
-          ? Set.of()
-          : Collections.singleton(rawType.replace("[]", ""));
+        ? Set.of()
+        : Collections.singleton(rawType.replace("[]", ""));
     }
 
     @Override
@@ -154,7 +161,6 @@ class Generic implements UType {
     }
 
     private String extractRawParam() {
-
       switch (mainType()) {
         case "java.util.Set":
         case "java.util.List":
diff --git a/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerWriter.java b/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerWriter.java
@@ -89,7 +89,6 @@ private void writeClassStart() {
 
     for (final UType type : jsonTypes.values()) {
       final var typeString = PrimitiveUtil.wrap(type.shortType()).replace(",", ", ");
-
       writer.append("  private final JsonType<%s> %sJsonType;", typeString, type.shortName()).eol();
     }
     writer.eol();
diff --git a/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/JavalinProcessor.java b/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/JavalinProcessor.java
@@ -17,6 +17,7 @@ public JavalinProcessor() {
       Class.forName("io.avaje.jsonb.Jsonb");
       jsonBOnClassPath = true;
     } catch (final ClassNotFoundException e) {
+      // intentionally ignored
     }
     useJsonB = jsonBOnClassPath;
   }
diff --git a/http-generator-nima/src/main/java/io/avaje/http/generator/helidon/nima/ControllerWriter.java b/http-generator-nima/src/main/java/io/avaje/http/generator/helidon/nima/ControllerWriter.java
@@ -93,7 +93,6 @@ private void writeClassStart() {
     }
     for (final UType type : jsonTypes.values()) {
       final var typeString = PrimitiveUtil.wrap(type.shortType()).replace(",", ", ");
-
       writer.append("  private final JsonType<%s> %sJsonType;", typeString, type.shortName()).eol();
     }
     writer.eol();
diff --git a/http-generator-nima/src/main/java/io/avaje/http/generator/helidon/nima/NimaProcessor.java b/http-generator-nima/src/main/java/io/avaje/http/generator/helidon/nima/NimaProcessor.java
@@ -17,6 +17,7 @@ public NimaProcessor() {
       Class.forName("io.avaje.jsonb.Jsonb");
       jsonBOnClassPath = true;
     } catch (final ClassNotFoundException e) {
+      // intentionally ignored
     }
     jsonB = jsonBOnClassPath;
   }
diff --git a/tests/test-javalin-jsonb/src/main/resources/public/openapi.json b/tests/test-javalin-jsonb/src/main/resources/public/openapi.json
@@ -5,6 +5,10 @@
     "description" : "Example Javalin controllers with Java and Maven",
     "version" : ""
   },
+  "tags" : [ {
+    "name" : "tag1",
+    "description" : "this is added to openapi tags"
+  } ],
   "paths" : {
     "/bars" : {
       "get" : {
@@ -678,6 +682,125 @@
         "deprecated" : true
       }
     },
+    "/openapi/get" : {
+      "get" : {
+        "tags" : [ ],
+        "summary" : "Example of Open API Get (up to the first period is the summary)",
+        "description" : "When using Javalin Context only This Javadoc description is added to the generated openapi.json",
+        "responses" : {
+          "200" : {
+            "description" : "funny phrase (this part of the javadoc is added to the response desc)",
+            "content" : {
+              "text/plain" : {
+                "schema" : {
+                  "type" : "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/openapi/post" : {
+      "post" : {
+        "tags" : [ "tag1" ],
+        "summary" : "Standard Post",
+        "description" : "uses tag annotation to add tags to openapi json",
+        "requestBody" : {
+          "description" : "the body (this is used for generated request body desc)",
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/Person"
+              }
+            }
+          },
+          "required" : true
+        },
+        "responses" : {
+          "200" : {
+            "description" : "overrides @return javadoc description",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/Person"
+                }
+              }
+            }
+          },
+          "201" : {
+            "description" : "the response body (from javadoc)",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/Person"
+                }
+              }
+            }
+          },
+          "400" : {
+            "description" : "User not found (Will not have an associated response schema)"
+          },
+          "500" : {
+            "description" : "Some other Error (Will have this error class as the response class)",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/ErrorResponse"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/openapi/post1" : {
+      "post" : {
+        "tags" : [ ],
+        "summary" : "Standard Post",
+        "description" : "The Deprecated annotation adds \"deprecacted:true\" to the generated json",
+        "requestBody" : {
+          "description" : "the body",
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "type" : "array",
+                "items" : {
+                  "$ref" : "#/components/schemas/Person"
+                }
+              }
+            }
+          },
+          "required" : true
+        },
+        "responses" : {
+          "400" : {
+            "description" : "User not found"
+          },
+          "500" : {
+            "description" : "Some other Error",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/ErrorResponse"
+                }
+              }
+            }
+          },
+          "201" : {
+            "description" : "the response body (from javadoc)",
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/Person"
+                }
+              }
+            }
+          }
+        },
+        "deprecated" : true
+      }
+    },
     "/req-scoped" : {
       "get" : {
         "tags" : [ ],
@@ -946,7 +1069,7 @@
               "schema" : {
                 "type" : "array",
                 "items" : {
-                  "$ref" : "#/components/schemas/E"
+                  "$ref" : "#/components/schemas/Person"
                 }
               }
             }
@@ -1116,8 +1239,16 @@
           }
         }
       },
-      "E" : {
-        "type" : "object"
+      "ErrorResponse" : {
+        "type" : "object",
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          },
+          "text" : {
+            "type" : "string"
+          }
+        }
       },
       "GetBeanForm" : {
         "type" : "object",

Original file line number	Diff line number	Diff line change
`@@ -152,14 +152,11 @@ void writeGeneric(UType type) {`
`152`	`152`	`.map(Util::shortName)`
`153`	`153`	`.collect(Collectors.joining(".class, "));`
`154`	`154`
`155`		`- writer.append(`
`156`		`- "Types.newParameterizedType(%s.class, %s.class)", Util.shortName(type.mainType()), params);`
	`155`	`+ writer.append("Types.newParameterizedType(%s.class, %s.class)", Util.shortName(type.mainType()), params);`
`157`	`156`	`} else {`
`158`	`157`	`writer.append("%s.class", Util.shortName(type.mainType()));`
`159`	`158`	`}`
`160`		`- writer.append(");");`
`161`		`-`
`162`		`- writer.eol();`
	`159`	`+ writer.append(");").eol();`
`163`	`160`	`}`
`164`	`161`
`165`	`162`	`private void writeWithHandler() {`
`@@ -283,4 +280,4 @@ private boolean isHttpResponse(String type0) {`
`283`	`280`	`return type0.equals("java.net.http.HttpResponse");`
`284`	`281`	`}`
`285`	`282`
`286`		`-}`
	`283`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ public ClientProcessor() {`
`35`	`35`	`Class.forName("io.avaje.jsonb.Jsonb");`
`36`	`36`	`jsonBOnClassPath = true;`
`37`	`37`	`} catch (final ClassNotFoundException e) {`
	`38`	`+ // intentionally ignored`
`38`	`39`	`}`
`39`	`40`	`useJsonB = jsonBOnClassPath;`
`40`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ private void writeClassStart() {`
`89`	`89`
`90`	`90`	`for (final UType type : jsonTypes.values()) {`
`91`	`91`	`final var typeString = PrimitiveUtil.wrap(type.shortType()).replace(",", ", ");`
`92`		`-`
`93`	`92`	`writer.append(" private final JsonType<%s> %sJsonType;", typeString, type.shortName()).eol();`
`94`	`93`	`}`
`95`	`94`	`writer.eol();`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public JavalinProcessor() {`
`17`	`17`	`Class.forName("io.avaje.jsonb.Jsonb");`
`18`	`18`	`jsonBOnClassPath = true;`
`19`	`19`	`} catch (final ClassNotFoundException e) {`
	`20`	`+ // intentionally ignored`
`20`	`21`	`}`
`21`	`22`	`useJsonB = jsonBOnClassPath;`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,6 @@ private void writeClassStart() {`
`93`	`93`	`}`
`94`	`94`	`for (final UType type : jsonTypes.values()) {`
`95`	`95`	`final var typeString = PrimitiveUtil.wrap(type.shortType()).replace(",", ", ");`
`96`		`-`
`97`	`96`	`writer.append(" private final JsonType<%s> %sJsonType;", typeString, type.shortName()).eol();`
`98`	`97`	`}`
`99`	`98`	`writer.eol();`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public NimaProcessor() {`
`17`	`17`	`Class.forName("io.avaje.jsonb.Jsonb");`
`18`	`18`	`jsonBOnClassPath = true;`
`19`	`19`	`} catch (final ClassNotFoundException e) {`
	`20`	`+ // intentionally ignored`
`20`	`21`	`}`
`21`	`22`	`jsonB = jsonBOnClassPath;`
`22`	`23`	`}`