Merge branch 'master' into simplify-jsonschema-example

Author: predic8

.gitignore

@@ -127,3 +127,4 @@ maven-plugin/target/surefire/
 .vscode/
 /core/derby.log
 /distribution/conf/apis.yaml
+/distribution/conf/membrane.log

Dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.9.10-amazoncorretto-21-al2023
+FROM maven:3.9.12-amazoncorretto-21-al2023
 
 ADD pom.xml /app/
 ADD annot/pom.xml /app/annot/

README.md

@@ -747,18 +747,18 @@ api:
 
 ### Transform XML into Text or JSON
 
-Using `setProperty` you can extract values from XML request or response bodies and store it in properties. Then the properties are available as variables inside the `template` plugin.
-plugin.
+You can use XPath to extract values from an XML message and insert them into a `template`.
 
-```xml
-
-<api port="2000">
-    <request>
-        <setProperty name="fn" value="${/person/@firstname}" language="xpath"/>
-        <template>Buenas Noches, ${property.fn}sito!</template>
-    </request>
-    <return/>
-</api>
+```yaml
+api:
+  port: 2000
+  flow:
+    - request:
+        - template:
+            src: |
+              Buenas noches, ${fn.xpath('/person/@firstname')}
+        - return:
+            status: 200
 ```
 
 See: [message-transformation examples](./distribution/examples/message-transformation)
@@ -876,7 +876,7 @@ Membrane offers lots of security features to protect backend servers.
 You can define APIs keys directly in your configuration, and Membrane will validate incoming requests against them.
 
 ### Example Configuration
-The following configuration secures the `Fruitshop API` by validating a key provided as a query parameter:
+The following configuration secures the `Fruitshop API` by validating an API key provided as a query parameter:
 
 ```xml
 <api port="2000">

annot/pom.xml

@@ -25,7 +25,7 @@
 		<groupId>org.membrane-soa</groupId>
 		<artifactId>service-proxy-parent</artifactId>
 		<relativePath>../pom.xml</relativePath>
-		<version>7.0.5-SNAPSHOT</version>
+		<version>7.0.6-SNAPSHOT</version>
 	</parent>
 
     <dependencies>
@@ -89,6 +89,11 @@
             <version>3.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

…mbrane/annot/yaml/BeanCacheObserver.java …nnot/beanregistry/BeanCacheObserver.javaannot/src/main/java/com/predic8/membrane/annot/yaml/BeanCacheObserver.java renamed to annot/src/main/java/com/predic8/membrane/annot/beanregistry/BeanCacheObserver.java annot/src/main/java/com/predic8/membrane/annot/yaml/BeanCacheObserver.java renamed to annot/src/main/java/com/predic8/membrane/annot/beanregistry/BeanCacheObserver.java

@@ -12,11 +12,7 @@
    See the License for the specific language governing permissions and
    limitations under the License. */
 
-package com.predic8.membrane.annot.yaml;
-
-import com.predic8.membrane.annot.beanregistry.BeanDefinition;
-import com.predic8.membrane.annot.beanregistry.BeanDefinitionChanged;
-import com.predic8.membrane.annot.beanregistry.BeanRegistryImplementation;
+package com.predic8.membrane.annot.beanregistry;
 
 import java.io.IOException;
 

annot/src/main/java/com/predic8/membrane/annot/beanregistry/BeanCollector.java

@@ -27,19 +27,29 @@
  * and send it a series of change events.
  */
 public interface BeanCollector {
+
+    default List<BeanDefinition> parseYamlBeanDefinitions(InputStream yamls, Grammar grammar) throws IOException {
+        List<BeanDefinition> bds = GenericYamlParser.parseMembraneResources(yamls, grammar);
+        for (BeanDefinition bd : bds) {
+            handle(new BeanDefinitionChanged(WatchAction.ADDED, bd), false);
+        }
+        return bds;
+    }
+
+    default void finishStaticConfiguration() {
+        handle(new StaticConfigurationLoaded(), true);
+        start();
+    }
+
     /**
      * Utility method to ingest a stream of YAML objects as a static configuration and then
      * start the bean registry.
      * @param yamls stream of YAML objects
      * @param grammar the grammar to use for parsing
      */
     default void parseYamls(InputStream yamls, Grammar grammar) throws IOException {
-        List<BeanDefinition> bds = GenericYamlParser.parseMembraneResources(yamls, grammar);
-        for (int i = 0; i < bds.size(); i++) {
-            handle(new BeanDefinitionChanged(WatchAction.ADDED, bds.get(i)), i == bds.size() - 1);
-        }
-        handle(new StaticConfigurationLoaded(), true);
-        start();
+        parseYamlBeanDefinitions(yamls, grammar);
+        finishStaticConfiguration();
     }
 
     /**

annot/src/main/java/com/predic8/membrane/annot/beanregistry/BeanContainer.java

@@ -14,29 +14,106 @@
 
 package com.predic8.membrane.annot.beanregistry;
 
-import com.fasterxml.jackson.databind.JsonNode;
+import com.predic8.membrane.annot.Grammar;
+import com.predic8.membrane.annot.bean.BeanFactory;
+import com.predic8.membrane.annot.yaml.GenericYamlParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.atomic.*;
 
 public class BeanContainer {
+    private static final Logger log = LoggerFactory.getLogger(BeanContainer.class);
+
     private final BeanDefinition definition;
     /**
      * Constructed bean after initialization.
      */
-    private volatile Object singleton;
+    private final AtomicReference<Object> singleton = new AtomicReference<>();
 
+    /**
+     * Creates a BeanDefinition where the bean has not yet been instantiated and initialized.
+     */
     public BeanContainer(BeanDefinition definition) {
         this.definition = definition;
     }
 
+    /**
+     * Creates a BeanDefinition where the bean has already been instantiated and initialized.
+     */
+    public BeanContainer(BeanDefinition definition, Object singleton) {
+        this.definition = definition;
+        this.singleton.set(singleton);
+    }
 
-    public Object getSingleton() {
-        return singleton;
+    /**
+     * Only to be used within this class.
+     * Use {@link #getOrCreate(BeanRegistryImplementation, Grammar)} instead.
+     */
+    private Object getSingleton() {
+        return singleton.get();
     }
 
-    public void setSingleton(Object singleton) {
-        this.singleton = singleton;
+    /**
+     * Only to be used within this class.
+     * Use {@link #getOrCreate(BeanRegistryImplementation, Grammar)} instead.
+     */
+    private void setSingleton(Object singleton) {
+        this.singleton.set(singleton);
     }
 
     public BeanDefinition getDefinition() {
         return definition;
     }
+
+    @Override
+    public String toString() {
+        return "BeanContainer: %s of %s singleton: %s".formatted( definition.getName(),definition.getKind(),singleton.get());
+    }
+
+    private synchronized Object define(BeanRegistryImplementation registry, Grammar grammar) {
+        log.debug("defining bean: {}", definition.getNode());
+        try {
+            if ("bean".equals(definition.getKind())) {
+                return new BeanFactory(registry).create(definition.getNode().path("bean"));
+            }
+            return GenericYamlParser.readMembraneObject(definition.getKind(),
+                    grammar,
+                    definition.getNode(),
+                    registry);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public Object getOrCreate(BeanRegistryImplementation registry, Grammar grammar) {
+        boolean prototype = isPrototypeScope(getDefinition());
+
+        // Prototypes are created anew every time.
+        if (prototype) {
+            return define(registry, grammar);
+        }
+
+        // Singleton: ensure define() runs at most once per BeanContainer.
+        synchronized (this) {
+            Object existing = getSingleton();
+            if (existing != null) {
+                return existing;
+            }
+
+            Object created = define(registry, grammar);
+            setSingleton(created);
+            return created;
+        }
+    }
+
+    private static boolean isPrototypeScope(BeanDefinition bd) {
+        if (!bd.isBean())
+            return bd.isPrototype();
+
+        return "PROTOTYPE".equalsIgnoreCase(
+                bd.getNode().path("bean").path("scope").asText("SINGLETON")
+        );
+    }
+
 }

annot/src/main/java/com/predic8/membrane/annot/beanregistry/BeanDefinition.java

@@ -13,11 +13,12 @@
    limitations under the License. */
 package com.predic8.membrane.annot.beanregistry;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.predic8.membrane.annot.yaml.WatchAction;
-
-import static com.predic8.membrane.annot.yaml.WatchAction.*;
+import com.fasterxml.jackson.databind.*;
+import com.predic8.membrane.annot.yaml.*;
 
+/**
+ * Immutable.
+ */
 public class BeanDefinition {
 
     public static final String PROTOTYPE = "prototype";
@@ -78,6 +79,8 @@ public String getKind() {
     }
 
     public String getScope() {
+        if (node == null)
+            return null;
         JsonNode meta = node.get("metadata");
         if (meta == null)
             return null;
@@ -100,4 +103,14 @@ public boolean isPrototype() {
         return PROTOTYPE.equals(getScope());
     }
 
+    @Override
+    public String toString() {
+        return "BeanDefinition{" +
+               "name='" + name + '\'' +
+               ", namespace='" + namespace + '\'' +
+               ", uid='" + uid + '\'' +
+               ", node=" + node +
+               ", kind='" + kind + '\'' +
+               '}';
+    }
 }

annot/src/main/java/com/predic8/membrane/annot/beanregistry/BeanRegistry.java

@@ -16,6 +16,7 @@
 import com.predic8.membrane.annot.*;
 
 import java.util.*;
+import java.util.function.*;
 
 public interface BeanRegistry {
 
@@ -26,4 +27,33 @@ public interface BeanRegistry {
     Grammar getGrammar();
 
     <T> List<T> getBeans(Class<T> clazz);
+
+    /**
+     * Retrieves a single bean of the specified type.
+     *
+     * @param clazz the class of the bean to retrieve
+     * @param <T>   the bean type
+     * @return Optional containing the bean if exactly one exists, empty otherwise
+     * @throws RuntimeException if multiple beans of the specified type exist
+     */
+    <T> Optional<T> getBean(Class<T> clazz);
+
+    /**
+     * Registers a bean with the specified name.
+     *
+     * @param beanName the name to register the bean under
+     * @param bean   instance to register (must not be null)
+     */
+    void register(String beanName, Object bean);
+
+    /**
+     * Registers a bean of the specified type with the given name if it is not already registered.
+     * If a bean with the given name is already present, the existing instance is returned.
+     * Otherwise, the supplier is used to create and register a new instance.
+     * @param type the class type of the bean
+     * @param supplier a supplier that provides a new instance of the bean if not already registered
+     * @param <T> the generic type of the bean
+     * @return the existing or newly created and registered bean instance
+     */
+     <T> T registerIfAbsent(Class<T> type, Supplier<T> supplier);
 }

…/java/com/predic8/membrane/AllTests.java …nnot/beanregistry/BeanRegistryAware.javacore/src/test/java/com/predic8/membrane/AllTests.java renamed to annot/src/main/java/com/predic8/membrane/annot/beanregistry/BeanRegistryAware.java core/src/test/java/com/predic8/membrane/AllTests.java renamed to annot/src/main/java/com/predic8/membrane/annot/beanregistry/BeanRegistryAware.java

@@ -1,4 +1,4 @@
-/* Copyright 2009, 2011 predic8 GmbH, www.predic8.com
+/* Copyright 2025 predic8 GmbH, www.predic8.com
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -11,17 +11,10 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License. */
-package com.predic8.membrane;
 
-import com.predic8.membrane.core.*;
-import com.predic8.membrane.integration.*;
-import org.junit.platform.suite.api.SelectClasses;
-import org.junit.platform.suite.api.Suite;
+package com.predic8.membrane.annot.beanregistry;
+
+public interface BeanRegistryAware {
+    void setRegistry(BeanRegistry registry);
+}
 
-@Suite
-@SelectClasses({
-        UnitTests.class,
-        IntegrationTestsWithoutInternet.class,
-        IntegrationTestsWithInternet.class
-})
-public class AllTests {}