added DeploymentListener implementations and called ok tests

hhund · hhund · commit 7c9fe0cf5d3a · 2025-08-06T12:22:47.000+02:00
diff --git a/dsf-bpe/dsf-bpe-server/src/test/java/dev/dsf/bpe/integration/AbstractIntegrationTest.java b/dsf-bpe/dsf-bpe-server/src/test/java/dev/dsf/bpe/integration/AbstractIntegrationTest.java
@@ -54,6 +54,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.SpringServletContainerInitializer;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.testcontainers.utility.DockerImageName;
 
 import ca.uhn.fhir.context.FhirContext;
@@ -580,4 +582,10 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOEx
 			logger.error("Error while deleting directory {}, error: {}", directory.toString(), e.toString());
 		}
 	}
+
+	protected static AnnotationConfigWebApplicationContext getBpeSpringWebApplicationContext()
+	{
+		return (AnnotationConfigWebApplicationContext) WebApplicationContextUtils
+				.getWebApplicationContext(bpeServer.getServletContext());
+	}
 }
diff --git a/dsf-bpe/dsf-bpe-server/src/test/java/dev/dsf/bpe/integration/AbstractPluginIntegrationTest.java b/dsf-bpe/dsf-bpe-server/src/test/java/dev/dsf/bpe/integration/AbstractPluginIntegrationTest.java
@@ -8,6 +8,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.BlockingDeque;
 import java.util.concurrent.LinkedBlockingDeque;
@@ -31,6 +32,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import dev.dsf.bpe.api.plugin.ProcessIdAndVersion;
+import dev.dsf.bpe.api.plugin.ProcessPlugin;
+import dev.dsf.bpe.plugin.ProcessPluginManager;
 import dev.dsf.fhir.client.WebsocketClient;
 
 public abstract class AbstractPluginIntegrationTest extends AbstractIntegrationTest
@@ -202,4 +206,10 @@ private List<String> getTestMethodFailed(Task t)
 		return t.getOutput().stream().filter(isTestMethodFailed()).map(TaskOutputComponent::getValue)
 				.map(v -> ((StringType) v).getValue()).toList();
 	}
+
+	protected static Optional<ProcessPlugin> getProcessPluginForTestProcess(String version)
+	{
+		ProcessPluginManager pluginManager = getBpeSpringWebApplicationContext().getBean(ProcessPluginManager.class);
+		return pluginManager.getProcessPlugin(new ProcessIdAndVersion("dsfdev_test", version));
+	}
 }
diff --git a/dsf-bpe/dsf-bpe-server/src/test/java/dev/dsf/bpe/integration/PluginV1IntegrationTest.java b/dsf-bpe/dsf-bpe-server/src/test/java/dev/dsf/bpe/integration/PluginV1IntegrationTest.java
@@ -1,8 +1,17 @@
 package dev.dsf.bpe.integration;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+import java.util.Optional;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import dev.dsf.bpe.api.plugin.ProcessPlugin;
+
 public class PluginV1IntegrationTest extends AbstractPluginIntegrationTest
 {
 	private static final String PROCESS_VERSION = "1.0";
@@ -13,9 +22,22 @@ public PluginV1IntegrationTest()
 	}
 
 	@BeforeClass
-	public static void verifyProcessPluginResourcesExist() throws Exception
+	public static void verifyProcessPluginResourcesExistAndListenerCalled() throws Exception
 	{
 		verifyProcessPluginResourcesExistForVersion(PROCESS_VERSION);
+
+		Optional<ProcessPlugin> processPlugin = getProcessPluginForTestProcess(PROCESS_VERSION);
+		assertTrue(processPlugin.isPresent());
+
+		// not statically typed since listener class is loaded by plugin class loader
+		Object listener = processPlugin.get().getApplicationContext().getBean("processPluginDeploymentStateListener");
+		assertNotNull(listener);
+
+		@SuppressWarnings("unchecked")
+		List<Boolean> ok = (List<Boolean>) listener.getClass().getMethod("getOk").invoke(listener);
+		assertNotNull(ok);
+		assertEquals(1, ok.size());
+		assertTrue(ok.get(0));
 	}
 
 	@Test
diff --git a/dsf-bpe/dsf-bpe-server/src/test/java/dev/dsf/bpe/integration/PluginV2IntegrationTest.java b/dsf-bpe/dsf-bpe-server/src/test/java/dev/dsf/bpe/integration/PluginV2IntegrationTest.java
@@ -1,13 +1,16 @@
 package dev.dsf.bpe.integration;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.cert.X509Certificate;
 import java.util.List;
+import java.util.Optional;
 
 import org.hl7.fhir.r4.model.Binary;
 import org.junit.BeforeClass;
@@ -19,6 +22,7 @@
 import de.hsheilbronn.mi.utils.crypto.io.KeyStoreWriter;
 import de.hsheilbronn.mi.utils.crypto.io.PemWriter;
 import de.hsheilbronn.mi.utils.crypto.keystore.KeyStoreCreator;
+import dev.dsf.bpe.api.plugin.ProcessPlugin;
 import dev.dsf.fhir.authorization.read.ReadAccessHelperImpl;
 import jakarta.ws.rs.core.MediaType;
 
@@ -35,6 +39,19 @@ public PluginV2IntegrationTest()
 	public static void verifyProcessPluginResourcesExist() throws Exception
 	{
 		verifyProcessPluginResourcesExistForVersion(PROCESS_VERSION);
+
+		Optional<ProcessPlugin> processPlugin = getProcessPluginForTestProcess(PROCESS_VERSION);
+		assertTrue(processPlugin.isPresent());
+
+		// not statically typed since listener class is loaded by plugin class loader
+		Object listener = processPlugin.get().getApplicationContext().getBean("processPluginDeploymentListener");
+		assertNotNull(listener);
+
+		@SuppressWarnings("unchecked")
+		List<Boolean> ok = (List<Boolean>) listener.getClass().getMethod("getOk").invoke(listener);
+		assertNotNull(ok);
+		assertEquals(1, ok.size());
+		assertTrue(ok.get(0));
 	}
 
 	@Test
diff --git a/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/deployment/ProcessPluginDeploymentStateListenerTestImpl.java b/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/deployment/ProcessPluginDeploymentStateListenerTestImpl.java
@@ -0,0 +1,29 @@
+package dev.dsf.bpe.test.deployment;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import dev.dsf.bpe.v1.ProcessPluginDeploymentStateListener;
+
+public class ProcessPluginDeploymentStateListenerTestImpl implements ProcessPluginDeploymentStateListener
+{
+	private static final Logger logger = LoggerFactory.getLogger(ProcessPluginDeploymentStateListenerTestImpl.class);
+
+	private final List<Boolean> ok = new ArrayList<>();
+
+	@Override
+	public void onProcessesDeployed(List<String> processes)
+	{
+		ok.add(processes != null && processes.size() == 1 && processes.contains("dsfdev_test"));
+		logger.info("Deployed processes: {}", processes);
+	}
+
+	public List<Boolean> getOk()
+	{
+		return Collections.unmodifiableList(ok);
+	}
+}
diff --git a/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/spring/config/Config.java b/dsf-bpe/dsf-bpe-test-plugin-v1/src/main/java/dev/dsf/bpe/test/spring/config/Config.java
@@ -10,13 +10,15 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 
+import dev.dsf.bpe.test.deployment.ProcessPluginDeploymentStateListenerTestImpl;
 import dev.dsf.bpe.test.service.ApiTest;
 import dev.dsf.bpe.test.service.EndpointProviderTest;
 import dev.dsf.bpe.test.service.EnvironmentVariableTest;
 import dev.dsf.bpe.test.service.OrganizationProviderTest;
 import dev.dsf.bpe.test.service.ProxyTest;
 import dev.dsf.bpe.test.service.TestActivitySelector;
 import dev.dsf.bpe.v1.ProcessPluginApi;
+import dev.dsf.bpe.v1.ProcessPluginDeploymentStateListener;
 import dev.dsf.bpe.v1.documentation.ProcessDocumentation;
 
 @Configuration
@@ -83,4 +85,10 @@ public EnvironmentVariableTest environmentVariableTest()
 	{
 		return new EnvironmentVariableTest(api, envVariableMandatory, envVariableOptional, envVariableProxyUrl);
 	}
+
+	@Bean
+	public ProcessPluginDeploymentStateListener processPluginDeploymentStateListener()
+	{
+		return new ProcessPluginDeploymentStateListenerTestImpl();
+	}
 }
diff --git a/dsf-bpe/dsf-bpe-test-plugin-v2/src/main/java/dev/dsf/bpe/test/deployment/ProcessPluginDeploymentListenerTestImpl.java b/dsf-bpe/dsf-bpe-test-plugin-v2/src/main/java/dev/dsf/bpe/test/deployment/ProcessPluginDeploymentListenerTestImpl.java
@@ -0,0 +1,29 @@
+package dev.dsf.bpe.test.deployment;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import dev.dsf.bpe.v2.ProcessPluginDeploymentListener;
+
+public class ProcessPluginDeploymentListenerTestImpl implements ProcessPluginDeploymentListener
+{
+	private static final Logger logger = LoggerFactory.getLogger(ProcessPluginDeploymentListenerTestImpl.class);
+
+	private final List<Boolean> ok = new ArrayList<>();
+
+	@Override
+	public void onProcessesDeployed(List<String> processes)
+	{
+		ok.add(processes != null && processes.size() == 1 && processes.contains("dsfdev_test"));
+		logger.info("Deployed processes: {}", processes);
+	}
+
+	public List<Boolean> getOk()
+	{
+		return Collections.unmodifiableList(ok);
+	}
+}
diff --git a/dsf-bpe/dsf-bpe-test-plugin-v2/src/main/java/dev/dsf/bpe/test/spring/config/Config.java b/dsf-bpe/dsf-bpe-test-plugin-v2/src/main/java/dev/dsf/bpe/test/spring/config/Config.java
@@ -9,6 +9,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 
+import dev.dsf.bpe.test.deployment.ProcessPluginDeploymentListenerTestImpl;
 import dev.dsf.bpe.test.fhir.FhirResourceModifierImpl;
 import dev.dsf.bpe.test.listener.StartFieldInjectionTestListener;
 import dev.dsf.bpe.test.listener.StartSendTaskTestListener;
@@ -35,6 +36,7 @@
 import dev.dsf.bpe.test.service.ProxyTest;
 import dev.dsf.bpe.test.service.TargetProviderTest;
 import dev.dsf.bpe.test.service.TestActivitySelector;
+import dev.dsf.bpe.v2.ProcessPluginDeploymentListener;
 import dev.dsf.bpe.v2.documentation.ProcessDocumentation;
 import dev.dsf.bpe.v2.fhir.FhirResourceModifier;
 import dev.dsf.bpe.v2.spring.ActivityPrototypeBeanCreator;
@@ -84,4 +86,10 @@ public EnvironmentVariableTest environmentVariableTest()
 	{
 		return new EnvironmentVariableTest(envVariableMandatory, envVariableOptional, envVariableProxyUrl);
 	}
+
+	@Bean
+	public ProcessPluginDeploymentListener processPluginDeploymentListener()
+	{
+		return new ProcessPluginDeploymentListenerTestImpl();
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@`
`54`	`54`	`import org.slf4j.Logger;`
`55`	`55`	`import org.slf4j.LoggerFactory;`
`56`	`56`	`import org.springframework.web.SpringServletContainerInitializer;`
	`57`	`+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;`
	`58`	`+import org.springframework.web.context.support.WebApplicationContextUtils;`
`57`	`59`	`import org.testcontainers.utility.DockerImageName;`
`58`	`60`
`59`	`61`	`import ca.uhn.fhir.context.FhirContext;`
`@@ -580,4 +582,10 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOEx`
`580`	`582`	`logger.error("Error while deleting directory {}, error: {}", directory.toString(), e.toString());`
`581`	`583`	`}`
`582`	`584`	`}`
	`585`	`+`
	`586`	`+ protected static AnnotationConfigWebApplicationContext getBpeSpringWebApplicationContext()`
	`587`	`+ {`
	`588`	`+ return (AnnotationConfigWebApplicationContext) WebApplicationContextUtils`
	`589`	`+ .getWebApplicationContext(bpeServer.getServletContext());`
	`590`	`+ }`
`583`	`591`	`}`