Yaml bean registry

.gitignore

@@ -126,3 +126,4 @@ maven-plugin/target/surefire/
 /docs/router-conf.xsd
 .vscode/
 /core/derby.log
+/distribution/conf/apis.yaml

README.md

@@ -35,11 +35,7 @@ Solve even complex custom API requirements with simple configurations.
 
 **YAML Configuration (beta):**
 ```yaml
-apiVersion: membrane-api.io/v1beta2
-kind: api
-metadata:
-  name: log
-spec:
+api:
   port: 2000
   interceptors:
     - log:

annot/pom.xml

@@ -67,6 +67,11 @@
             <artifactId>jackson-dataformat-yaml</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.networknt</groupId>
+            <artifactId>json-schema-validator</artifactId>
+            <version>2.0.0</version>
+        </dependency>
 
         <dependency>
             <groupId>org.hamcrest</groupId>

annot/src/main/java/com/predic8/membrane/annot/K8sHelperGenerator.java → annot/src/main/java/com/predic8/membrane/annot/Grammar.java

@@ -16,12 +16,13 @@
 
 import java.util.List;
 
-public interface K8sHelperGenerator {
+public interface Grammar {
 
     Class<?> getElement(String key);
 
     Class<?> getLocal(String context, String key);
 
     List<String> getCrdSingularNames();
 
+    String getSchemaLocation();
 }

annot/src/main/java/com/predic8/membrane/annot/generator/JsonSchemaGenerator.java

@@ -37,7 +37,7 @@
  * - Choose/cases/case has one nesting to much
  * - apiKey/extractors/expressionExtractor/expression => too much?
  */
-public class JsonSchemaGenerator extends AbstractK8sGenerator {
+public class JsonSchemaGenerator extends AbstractGrammar {
 
     private final Map<String, Boolean> topLevelAdded = new HashMap<>();
 
@@ -78,71 +78,33 @@ private void assemble(Model m, MainInfo main) throws IOException {
         topLevelAdded.clear();
 
         addParserDefinitions(m, main);
-        addTopLevelProperties();
+        addTopLevelProperties(m, main);
 
         writeSchema(main, schema);
     }
 
-    private void addTopLevelProperties() {
-        schema.additionalProperties(false)
-                .property(ref("soapProxy")
-                        .ref("#/$defs/com_predic8_membrane_core_config_spring_SoapProxyParser"))
-                .property(ref("internal")
-                        .ref("#/$defs/com_predic8_membrane_core_config_spring_InternalParser"))
-                .property(ref("proxy")
-                        .ref("#/$defs/com_predic8_membrane_core_config_spring_ProxyParser"))
-                .property(ref("api")
-                        .ref("#/$defs/com_predic8_membrane_core_config_spring_ApiParser"))
-                .property(ref("stompProxy")
-                        .ref("#/$defs/com_predic8_membrane_core_config_spring_StompProxyParser"))
-                .property(ref("sslProxy")
-                        .ref("#/$defs/com_predic8_membrane_core_config_spring_SslProxyParser"));
-
-        List<SchemaObject> kinds = new ArrayList<>();
-
-        kinds.add(object()
-                .additionalProperties(false)
-                .property(ref("api")
-                        .ref("#/$defs/com_predic8_membrane_core_config_spring_ApiParser")
-                        .required(true)));
-
-        kinds.add(object()
-                .additionalProperties(false)
-                .property(ref("soapProxy")
-                        .ref("#/$defs/com_predic8_membrane_core_config_spring_SoapProxyParser")
-                        .required(true)));
-
-        kinds.add(object()
-                .additionalProperties(false)
-                .property(ref("internal")
-                        .ref("#/$defs/com_predic8_membrane_core_config_spring_InternalParser")
-                        .required(true)));
-
-        kinds.add(object()
-                .additionalProperties(false)
-                .property(ref("proxy")
-                        .ref("#/$defs/com_predic8_membrane_core_config_spring_ProxyParser")
-                        .required(true)));
-
-        kinds.add(object()
-                .additionalProperties(false)
-                .property(ref("stompProxy")
-                        .ref("#/$defs/com_predic8_membrane_core_config_spring_StompProxyParser")
-                        .required(true)));
-
-        kinds.add(object()
-                .additionalProperties(false)
-                .property(ref("sslProxy")
-                        .ref("#/$defs/com_predic8_membrane_core_config_spring_SslProxyParser")
-                        .required(true)));
-
-        kinds.add(object()
-                .additionalProperties(false)
-                .property(ref("bean")
-                        .ref("#/$defs/com_predic8_membrane_core_config_spring_BeanParser")
-                        .required(true)));
-
-        schema.oneOf(new ArrayList<>(kinds));
+    private void addTopLevelProperties(Model m, MainInfo main) {
+        schema.additionalProperties(false);
+        List<AbstractSchema<?>> kinds = new ArrayList<>();
+
+        main.getElements().values().forEach(e -> {
+            if (!e.getAnnotation().topLevel())
+                return;
+
+            String name = e.getAnnotation().name();
+            String refName = "#/$defs/" + e.getXSDTypeName(m);
+
+            schema.property(ref(name).ref(refName));
+
+            kinds.add(object()
+                    .additionalProperties(false)
+                    .property(ref(name)
+                            .ref(refName)
+                            .required(true)));
+        });
+
+        if (!kinds.isEmpty())
+            schema.oneOf(kinds);
     }
 
     private void addParserDefinitions(Model m, MainInfo main) {
@@ -180,7 +142,7 @@ private SchemaObject createParser(Model m, MainInfo main, ElementInfo elementInf
         }
 
         SchemaObject parser = object(parserName)
-                .additionalProperties(false)
+                .additionalProperties(elementInfo.getOai() != null)
                 .description(getDescriptionContent(elementInfo));
         collectProperties(m, main, elementInfo, parser);
         return parser;
@@ -203,16 +165,20 @@ private FileObject createFile(MainInfo main) throws IOException {
         return processingEnv.getFiler()
                 .createResource(
                         CLASS_OUTPUT,
-                        "com.predic8.membrane.core.config.json",
+                        main.getAnnotation().outputPackage().replaceAll("\\.spring$", ".json"),
                         "membrane.schema.json",
                         sources.toArray(new Element[0])
                 );
     }
 
     private void processMCAttributes(ElementInfo i, SchemaObject so) {
-        i.getAis().stream()
-                .filter(ai -> !ai.getXMLName().equals("id"))
-                .forEach(ai -> so.property(createProperty(ai)));
+        i.getAis().forEach(ai -> {
+            // hide id only on top-level elements
+            if ("id".equals(ai.getXMLName()) && i.getAnnotation().topLevel()) {
+                return;
+            }
+            so.property(createProperty(ai));
+        });
     }
 
     private AbstractSchema<?> createProperty(AttributeInfo ai) {

annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/AbstractK8sGenerator.java → annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/AbstractGrammar.java

@@ -14,8 +14,6 @@
 package com.predic8.membrane.annot.generator.kubernetes;
 
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.node.*;
-import com.predic8.membrane.annot.generator.kubernetes.model.*;
 import com.predic8.membrane.annot.model.ElementInfo;
 import com.predic8.membrane.annot.model.MainInfo;
 import com.predic8.membrane.annot.model.Model;
@@ -34,7 +32,7 @@
 /**
  * Bundles functionality for kubernetes file generation
  */
-public abstract class AbstractK8sGenerator {
+public abstract class AbstractGrammar {
 
     protected final ObjectMapper om = new ObjectMapper();
     protected final ObjectWriter writer = om.writerWithDefaultPrettyPrinter();
@@ -53,7 +51,7 @@ public WritableNames(ElementInfo ei) {
         }
     }
 
-    public AbstractK8sGenerator(final ProcessingEnvironment processingEnv) {
+    public AbstractGrammar(final ProcessingEnvironment processingEnv) {
         this.processingEnv = processingEnv;
     }
 

annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/K8sHelperGenerator.java → annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/Grammar.java

@@ -27,15 +27,15 @@
 /**
  * Autogenerates a helper file for JSON parsing
  */
-public class K8sHelperGenerator extends AbstractK8sGenerator {
+public class Grammar extends AbstractGrammar {
 
-    public K8sHelperGenerator(ProcessingEnvironment processingEnv) {
+    public Grammar(ProcessingEnvironment processingEnv) {
         super(processingEnv);
     }
 
     @Override
     protected String fileName() {
-        return K8sHelperGenerator.class.getSimpleName() + "AutoGenerated";
+        return Grammar.class.getSimpleName() + "AutoGenerated";
     }
 
     @Override
@@ -83,60 +83,74 @@ private void writeCopyright(Writer w) throws IOException {
     }
 
     private void writeClassContent(Writer w, MainInfo mainInfo) throws IOException {
-        appendLine(w,
-                "",
-                "package " + mainInfo.getAnnotation().outputPackage() + ";",
-                "",
-                "import java.util.Map;",
-                "import java.util.List;",
-                "import java.util.HashMap;",
-                "import java.util.ArrayList;",
-                "import com.predic8.membrane.annot.K8sHelperGenerator;",
-                "",
-                "/**",
-                "  * Automatically generated by {@link " + K8sHelperGenerator.class.getName() + "}",
-                "  */",
-                "public class " + fileName() + " implements K8sHelperGenerator {",
-                "    private static Map<String, Class<?>> elementMapping = new HashMap<>();",
-                "    private static Map<String, Map<String, Class<?>>> localElementMapping = new HashMap<>();",
-                "    private static List<String> crdSingularNames = new ArrayList<>();",
-                "",
-                "    private static void localElementMappingPut(String context, String name, Class<?> clazz) {",
-                "        Map<String, Class<?>> local = localElementMapping.get(context);",
-                "        if (local == null) {",
-                "            local = new HashMap<>();",
-                "            localElementMapping.put(context, local);",
-                "            localElementMapping.put(context.toLowerCase(), local);",
-                "        }",
-                "        local.put(name, clazz);",
-                "        local.put(name.toLowerCase(), clazz);",
-                "    }",
-                "",
-                "    @Override\n" +
-                "    public Class<?> getLocal(String context, String key) {",
-                "        Map<String, Class<?>> local = localElementMapping.get(context);",
-                "        if (local == null)",
-                "            return null;",
-                "        return local.get(key);",
-                "    }",
-                "    @Override",
-                "    public Class<?> getElement(String key) {",
-                "        return elementMapping.get(key);",
-                "    }",
-                "",
-                "    @Override",
-                "    public List<String> getCrdSingularNames() {",
-                "        return crdSingularNames;",
-                "    }",
-                "",
-                "    static {",
-                        "",
-                        assembleCrdSingularNames(mainInfo),
-                        "",
-                        assembleElementMapping(mainInfo),
-                "    }",
-                "}"
-        );
+        w.write("""
+            package %s;
+
+            import java.util.Map;
+            import java.util.List;
+            import java.util.HashMap;
+            import java.util.ArrayList;
+            import com.predic8.membrane.annot.Grammar;
+
+            /**
+             * Automatically generated by {@link %s}
+             */
+            public class %s implements Grammar {
+                private static Map<String, Class<?>> elementMapping = new HashMap<>();
+                private static Map<String, Map<String, Class<?>>> localElementMapping = new HashMap<>();
+                private static List<String> crdSingularNames = new ArrayList<>();
+
+                private static void localElementMappingPut(String context, String name, Class<?> clazz) {
+                    Map<String, Class<?>> local = localElementMapping.get(context);
+                    if (local == null) {
+                        local = new HashMap<>();
+                        localElementMapping.put(context, local);
+                        localElementMapping.put(context.toLowerCase(), local);
+                    }
+                    local.put(name, clazz);
+                    local.put(name.toLowerCase(), clazz);
+                }
+
+                @Override
+                public Class<?> getLocal(String context, String key) {
+                    Map<String, Class<?>> local = localElementMapping.get(context);
+                    if (local == null)
+                        return null;
+                    return local.get(key);
+                }
+
+                @Override
+                public Class<?> getElement(String key) {
+                    return elementMapping.get(key);
+                }
+
+                @Override
+                public List<String> getCrdSingularNames() {
+                    return crdSingularNames;
+                }
+
+                @Override
+                public String getSchemaLocation() {
+                    return "classpath:/%s/membrane.schema.json";
+                }
+
+                static {
+            """.formatted(
+                mainInfo.getAnnotation().outputPackage(),
+                Grammar.class.getName(),
+                fileName(),
+                mainInfo.getAnnotation().outputPackage()
+                        .replaceAll(".spring$", ".json")
+                        .replaceAll("\\.", "/")
+        ));
+
+        w.write(assembleCrdSingularNames(mainInfo) + "\n");
+        w.write(assembleElementMapping(mainInfo) + "\n");
+
+        w.write("""
+                }
+            }
+            """);
     }
 
     private String assembleElementMapping(MainInfo main) {

annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/K8sJsonSchemaGenerator.java

@@ -28,7 +28,7 @@
 /**
  * Generates JSON Schema (draft 2019-09/2020-12) to validate Kubernetes CustomResourceDefinitions.
  */
-public class K8sJsonSchemaGenerator extends AbstractK8sGenerator {
+public class K8sJsonSchemaGenerator extends AbstractGrammar {
 
     public K8sJsonSchemaGenerator(ProcessingEnvironment processingEnv) {
         super(processingEnv);

annot/src/main/java/com/predic8/membrane/annot/generator/kubernetes/K8sYamlGenerator.java

@@ -29,7 +29,7 @@
 /**
  * Generates ClusterRoles, ClusterRoleBindings and CustomResourceDefinitions for kubernetes integration.
  */
-public class K8sYamlGenerator extends AbstractK8sGenerator {
+public class K8sYamlGenerator extends AbstractGrammar {
 
     private final List<String> crdPlurals;