openapi: code cleanup #ref 3729

Author: jknack

modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/javadoc/JavaDocTag.java

@@ -42,9 +42,9 @@ public static List<Server> servers(DetailNode node) {
           values.add(tag.getText().substring(1));
           values.add(value);
         });
-    List<Server> result = new ArrayList<>();
+    var result = new ArrayList<Server>();
     if (!values.isEmpty()) {
-      var serverMap = ExtensionJavaDocParser.parse(values);
+      var serverMap = MiniYamlDocParser.parse(values);
       var servers = serverMap.get("server");
       if (!(servers instanceof List<?>)) {
         servers = List.of(servers);
@@ -122,7 +122,7 @@ public static Map<String, Object> extensions(DetailNode node) {
           values.add(tag.getText().substring(1));
           values.add(value);
         });
-    return ExtensionJavaDocParser.parse(values);
+    return MiniYamlDocParser.parse(values);
   }
 
   public static List<Tag> tags(DetailNode node) {
@@ -158,7 +158,7 @@ public static List<Tag> tags(DetailNode node) {
           }
         });
     if (!values.isEmpty()) {
-      var tagMap = ExtensionJavaDocParser.parse(values);
+      var tagMap = MiniYamlDocParser.parse(values);
       var tags = tagMap.get("tag");
       if (!(tags instanceof List<?>)) {
         tags = List.of(tags);

…napi/javadoc/ExtensionJavaDocParser.java …l/openapi/javadoc/MiniYamlDocParser.javamodules/jooby-openapi/src/main/java/io/jooby/internal/openapi/javadoc/ExtensionJavaDocParser.java renamed to modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/javadoc/MiniYamlDocParser.java modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/javadoc/ExtensionJavaDocParser.java renamed to modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/javadoc/MiniYamlDocParser.java

@@ -10,7 +10,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class ExtensionJavaDocParser {
+public class MiniYamlDocParser {
   @SuppressWarnings("unchecked")
   public static Map<String, Object> parse(List<String> properties) {
     // The root of our final tree structure.
@@ -38,7 +38,7 @@ public static Map<String, Object> parse(List<String> properties) {
     if (result instanceof Map) {
       return (Map<String, Object>) result;
     }
-    throw new IllegalStateException("DD");
+    throw new IllegalArgumentException("Unable to parse: " + properties);
   }
 
   /**
@@ -102,7 +102,7 @@ private static Object restructureNode(Object node) {
         listOfObjects.add(objectMap);
       }
       if (listOfObjects.size() == 1
-          && restructuredMap.keySet().stream().noneMatch(ExtensionJavaDocParser::startsWithDash)) {
+          && restructuredMap.keySet().stream().noneMatch(MiniYamlDocParser::startsWithDash)) {
         return listOfObjects.getFirst();
       }
       return listOfObjects;

modules/jooby-openapi/src/test/java/javadoc/ExtensionJavaDocParserTest.java

@@ -5,7 +5,7 @@
  */
 package javadoc;
 
-import static io.jooby.internal.openapi.javadoc.ExtensionJavaDocParser.parse;
+import static io.jooby.internal.openapi.javadoc.MiniYamlDocParser.parse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;