Jackson 3.0 upgrade

.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

@@ -53,19 +53,24 @@
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
+		<dependency>
+			<groupId>tools.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+		</dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
             <scope>compile</scope>
         </dependency>
+		<dependency>
+			<groupId>tools.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-yaml</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson.version}</version>
+            <groupId>com.networknt</groupId>
+            <artifactId>json-schema-validator</artifactId>
+            <version>2.0.0</version>
         </dependency>
 
         <dependency>

annot/src/main/java/com/predic8/membrane/annot/AbstractParser.java

@@ -18,6 +18,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.jetbrains.annotations.*;
+import org.slf4j.*;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.RuntimeBeanNameReference;
@@ -36,10 +38,11 @@
 
 public abstract class AbstractParser extends AbstractSingleBeanDefinitionParser {
 
-	private static final String MEMBRANE_BEANS_NAMESPACE = "http://membrane-soa.org/proxies/1/";
+    private static final Logger log = LoggerFactory.getLogger(AbstractParser.class);
+
 	private static final String MEMBRANE_PROXIES_NAMESPACE = "http://membrane-soa.org/proxies/1/";
 
-	private boolean inlined = false;
+    private boolean inlined = false;
 
 	public BeanDefinition parse(Element e) {
 		inlined = true;
@@ -112,6 +115,7 @@ protected void setProperties(String prop, Element e, BeanDefinitionBuilder build
 		builder.addPropertyValue(prop, attrs);
 	}
 
+    // TODO @Tobias can that be deleted?
 	protected void parseElementToProperty(Element ele, ParserContext parserContext, BeanDefinitionBuilder builder, String property) {
 		BeanDefinitionParserDelegate delegate = parserContext.getDelegate();
 
@@ -143,32 +147,35 @@ protected void handleChildElement(Element ele, ParserContext parserContext, Bean
 
 		try {
 			Object o = delegate.parsePropertySubElement(ele, builder.getBeanDefinition());
-
-			String clazz = null;
-			if (o instanceof BeanDefinitionHolder) {
-				clazz = ((BeanDefinitionHolder) o).getBeanDefinition().getBeanClassName();
-			} else if (o instanceof RuntimeBeanReference) {
-				clazz = parserContext.getRegistry().getBeanDefinition(((RuntimeBeanReference) o).getBeanName()).getBeanClassName();
-			} else if (o instanceof RuntimeBeanNameReference) {
-				clazz = parserContext.getRegistry().getBeanDefinition(((RuntimeBeanNameReference) o).getBeanName()).getBeanClassName();
-			} else {
-				parserContext.getReaderContext().error("Don't know how to get bean class from " + o.getClass(), ele);
-			}
-
-			handleChildObject(ele, parserContext, builder, Class.forName(clazz), o);
+            handleChildObject(ele, parserContext, builder, Thread.currentThread().getContextClassLoader().loadClass(getBeanClassNameFromObject(ele, parserContext, o)), o);
 		} catch (ClassNotFoundException e) {
 			throw new RuntimeException(e);
 		}
 	}
 
-	protected int incrementCounter(BeanDefinitionBuilder builder, String counter) {
+    private static @Nullable String getBeanClassNameFromObject(Element ele, ParserContext parserContext, Object o) {
+        return switch (o) {
+            case BeanDefinitionHolder beanDefinitionHolder -> beanDefinitionHolder.getBeanDefinition().getBeanClassName();
+            case RuntimeBeanReference runtimeBeanReference -> parserContext.getRegistry().getBeanDefinition(runtimeBeanReference.getBeanName()).getBeanClassName();
+            case RuntimeBeanNameReference runtimeBeanNameReference -> parserContext.getRegistry().getBeanDefinition(runtimeBeanNameReference.getBeanName()).getBeanClassName();
+            default -> {
+                var msg = "Don't know how to get bean class from " + o.getClass();
+                log.warn(msg);
+                parserContext.getReaderContext().error(msg, ele);
+                throw new RuntimeException(msg);
+            }
+        };
+    }
+
+    protected int incrementCounter(BeanDefinitionBuilder builder, String counter) {
 		Integer i = (Integer) builder.getRawBeanDefinition().getAttribute(counter);
 		if (i == null)
 			i = 0;
 		builder.getRawBeanDefinition().setAttribute(counter, i+1);
 		return i;
 	}
 
+    // TODO needed?
 	protected boolean isMembraneNamespace(String namespace) {
 		return MEMBRANE_PROXIES_NAMESPACE.equals(namespace);
 	}

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

@@ -13,7 +13,7 @@
    limitations under the License. */
 package com.predic8.membrane.annot.generator;
 
-import com.fasterxml.jackson.databind.node.*;
+import tools.jackson.databind.node.*;
 import com.predic8.membrane.annot.*;
 import com.predic8.membrane.annot.generator.kubernetes.*;
 import com.predic8.membrane.annot.generator.kubernetes.model.*;
@@ -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

@@ -34,7 +34,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 +53,7 @@ public WritableNames(ElementInfo ei) {
         }
     }
 
-    public AbstractK8sGenerator(final ProcessingEnvironment processingEnv) {
+    public AbstractGrammar(final ProcessingEnvironment processingEnv) {
         this.processingEnv = processingEnv;
     }