Issue/594 websocket connection status in bpe status webservice

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/ProcessPluginApiImpl.java

@@ -18,7 +18,6 @@
 import java.util.Objects;
 
 import org.operaton.bpm.engine.delegate.DelegateExecution;
-import org.springframework.beans.factory.InitializingBean;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -35,7 +34,7 @@
 import dev.dsf.fhir.authorization.process.ProcessAuthorizationHelper;
 import dev.dsf.fhir.authorization.read.ReadAccessHelper;
 
-public class ProcessPluginApiImpl implements ProcessPluginApi, InitializingBean
+public class ProcessPluginApiImpl implements ProcessPluginApi
 {
 	private final ProxyConfig proxyConfig;
 	private final EndpointProvider endpointProvider;
@@ -49,40 +48,50 @@ public class ProcessPluginApiImpl implements ProcessPluginApi, InitializingBean
 	private final ReadAccessHelper readAccessHelper;
 	private final TaskHelper taskHelper;
 
+	/**
+	 * @param proxyConfig
+	 *            not <code>null</code>
+	 * @param endpointProvider
+	 *            not <code>null</code>
+	 * @param fhirContext
+	 *            not <code>null</code>
+	 * @param fhirWebserviceClientProvider
+	 *            not <code>null</code>
+	 * @param mailService
+	 *            not <code>null</code>
+	 * @param objectMapper
+	 *            not <code>null</code>
+	 * @param organizationProvider
+	 *            not <code>null</code>
+	 * @param processAuthorizationHelper
+	 *            not <code>null</code>
+	 * @param questionnaireResponseHelper
+	 *            not <code>null</code>
+	 * @param readAccessHelper
+	 *            not <code>null</code>
+	 * @param taskHelper
+	 *            not <code>null</code>
+	 */
 	public ProcessPluginApiImpl(ProxyConfig proxyConfig, EndpointProvider endpointProvider, FhirContext fhirContext,
 			FhirWebserviceClientProvider fhirWebserviceClientProvider, MailService mailService,
 			ObjectMapper objectMapper, OrganizationProvider organizationProvider,
 			ProcessAuthorizationHelper processAuthorizationHelper,
 			QuestionnaireResponseHelper questionnaireResponseHelper, ReadAccessHelper readAccessHelper,
 			TaskHelper taskHelper)
 	{
-		this.proxyConfig = proxyConfig;
-		this.endpointProvider = endpointProvider;
-		this.fhirContext = fhirContext;
-		this.fhirWebserviceClientProvider = fhirWebserviceClientProvider;
-		this.mailService = mailService;
-		this.objectMapper = objectMapper;
-		this.organizationProvider = organizationProvider;
-		this.processAuthorizationHelper = processAuthorizationHelper;
+		this.proxyConfig = Objects.requireNonNull(proxyConfig, "proxyConfig");
+		this.endpointProvider = Objects.requireNonNull(endpointProvider, "endpointProvider");
+		this.fhirContext = Objects.requireNonNull(fhirContext, "fhirContext");
+		this.fhirWebserviceClientProvider = Objects.requireNonNull(fhirWebserviceClientProvider,
+				"fhirWebserviceClientProvider");
+		this.mailService = Objects.requireNonNull(mailService, "mailService");
+		this.objectMapper = Objects.requireNonNull(objectMapper, "objectMapper");
+		this.organizationProvider = Objects.requireNonNull(organizationProvider, "organizationProvider");
+		this.processAuthorizationHelper = Objects.requireNonNull(processAuthorizationHelper,
+				"processAuthorizationHelper");
 		this.questionnaireResponseHelper = questionnaireResponseHelper;
-		this.readAccessHelper = readAccessHelper;
-		this.taskHelper = taskHelper;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception
-	{
-		Objects.requireNonNull(proxyConfig, "proxyConfig");
-		Objects.requireNonNull(endpointProvider, "endpointProvider");
-		Objects.requireNonNull(fhirContext, "fhirContext");
-		Objects.requireNonNull(fhirWebserviceClientProvider, "fhirWebserviceClientProvider");
-		Objects.requireNonNull(mailService, "mailService");
-		Objects.requireNonNull(objectMapper, "objectMapper");
-		Objects.requireNonNull(organizationProvider, "organizationProvider");
-		Objects.requireNonNull(processAuthorizationHelper, "processAuthorizationHelper");
-		Objects.requireNonNull(questionnaireResponseHelper, "questionnaireResponseHelper");
-		Objects.requireNonNull(readAccessHelper, "readAccessHelper");
-		Objects.requireNonNull(taskHelper, "taskHelper");
+		this.readAccessHelper = Objects.requireNonNull(readAccessHelper, "readAccessHelper");
+		this.taskHelper = Objects.requireNonNull(taskHelper, "taskHelper");
 	}
 
 	@Override

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/AbstractListener.java

@@ -28,24 +28,22 @@
 import org.hl7.fhir.r4.model.Task.ParameterComponent;
 import org.operaton.bpm.engine.delegate.DelegateExecution;
 import org.operaton.bpm.engine.delegate.ExecutionListener;
-import org.springframework.beans.factory.InitializingBean;
 
-public abstract class AbstractListener implements ExecutionListener, InitializingBean
+public abstract class AbstractListener implements ExecutionListener
 {
 	private final String serverBaseUrl;
 	private final Function<DelegateExecution, ListenerVariables> variablesFactory;
 
+	/**
+	 * @param serverBaseUrl
+	 *            not <code>null</code>
+	 * @param variablesFactory
+	 *            not <code>null</code>
+	 */
 	public AbstractListener(String serverBaseUrl, Function<DelegateExecution, ListenerVariables> variablesFactory)
 	{
-		this.serverBaseUrl = serverBaseUrl;
-		this.variablesFactory = variablesFactory;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception
-	{
-		Objects.requireNonNull(serverBaseUrl, "serverBaseUrl");
-		Objects.requireNonNull(variablesFactory, "variablesFactory");
+		this.serverBaseUrl = Objects.requireNonNull(serverBaseUrl, "serverBaseUrl");
+		this.variablesFactory = Objects.requireNonNull(variablesFactory, "variablesFactory");
 	}
 
 	@Override

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/listener/EndListener.java

@@ -35,20 +35,21 @@ public class EndListener extends AbstractListener implements ExecutionListener
 
 	private final FhirWebserviceClientProvider fhirWebserviceClientProvider;
 
+	/**
+	 * @param serverBaseUrl
+	 *            not <code>null</code>
+	 * @param variablesFactory
+	 *            not <code>null</code>
+	 * @param fhirWebserviceClientProvider
+	 *            not <code>null</code>
+	 */
 	public EndListener(String serverBaseUrl, Function<DelegateExecution, ListenerVariables> variablesFactory,
 			FhirWebserviceClientProvider fhirWebserviceClientProvider)
 	{
 		super(serverBaseUrl, variablesFactory);
 
-		this.fhirWebserviceClientProvider = fhirWebserviceClientProvider;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception
-	{
-		super.afterPropertiesSet();
-
-		Objects.requireNonNull(fhirWebserviceClientProvider, "fhirWebserviceClientProvider");
+		this.fhirWebserviceClientProvider = Objects.requireNonNull(fhirWebserviceClientProvider,
+				"fhirWebserviceClientProvider");
 	}
 
 	@Override

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/service/AbstractResourceProvider.java

@@ -30,24 +30,22 @@
 import org.hl7.fhir.r4.model.Coding;
 import org.hl7.fhir.r4.model.Identifier;
 import org.hl7.fhir.r4.model.Resource;
-import org.springframework.beans.factory.InitializingBean;
 
-public abstract class AbstractResourceProvider implements InitializingBean
+public abstract class AbstractResourceProvider
 {
 	protected final FhirWebserviceClientProvider clientProvider;
 	protected final String localEndpointAddress;
 
+	/**
+	 * @param clientProvider
+	 *            not <code>null</code>
+	 * @param localEndpointAddress
+	 *            not <code>null</code>
+	 */
 	public AbstractResourceProvider(FhirWebserviceClientProvider clientProvider, String localEndpointAddress)
 	{
-		this.clientProvider = clientProvider;
-		this.localEndpointAddress = localEndpointAddress;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception
-	{
-		Objects.requireNonNull(clientProvider, "clientProvider");
-		Objects.requireNonNull(localEndpointAddress, "localEndpointAddress");
+		this.clientProvider = Objects.requireNonNull(clientProvider, "clientProvider");
+		this.localEndpointAddress = Objects.requireNonNull(localEndpointAddress, "localEndpointAddress");
 	}
 
 	protected final String toSearchParameter(Identifier identifier)

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/service/FhirWebserviceClientProviderImpl.java

@@ -21,16 +21,14 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.springframework.beans.factory.InitializingBean;
-
 import ca.uhn.fhir.context.FhirContext;
 import dev.dsf.bpe.api.config.BpeProxyConfig;
 import dev.dsf.bpe.api.service.BuildInfoProvider;
 import dev.dsf.fhir.client.FhirWebserviceClient;
 import dev.dsf.fhir.client.FhirWebserviceClientJersey;
 import dev.dsf.fhir.service.ReferenceCleaner;
 
-public class FhirWebserviceClientProviderImpl implements FhirWebserviceClientProvider, InitializingBean
+public class FhirWebserviceClientProviderImpl implements FhirWebserviceClientProvider
 {
 	private static final String USER_AGENT_VALUE = "DSF/";
 
@@ -55,47 +53,58 @@ public class FhirWebserviceClientProviderImpl implements FhirWebserviceClientPro
 	private final BpeProxyConfig proxyConfig;
 	private final BuildInfoProvider buildInfoProvider;
 
+	/**
+	 * @param fhirContext
+	 *            not <code>null</code>
+	 * @param referenceCleaner
+	 *            not <code>null</code>
+	 * @param baseUrlLocal
+	 *            not <code>null</code>
+	 * @param readTimeoutLocal
+	 *            not <code>null</code>, not negative, 0 represents infinity
+	 * @param connectTimeoutLocal
+	 *            not <code>null</code>, not negative, 0 represents infinity
+	 * @param logRequestsAndResponsesLocal
+	 * @param trustStore
+	 *            not <code>null</code>
+	 * @param keyStore
+	 *            not <code>null</code>
+	 * @param keyStorePassword
+	 *            not <code>null</code>
+	 * @param readTimeoutRemote
+	 *            not <code>null</code>, not negative, 0 represents infinity
+	 * @param connectTimeoutRemote
+	 *            not <code>null</code>, not negative, 0 represents infinity
+	 * @param logRequestsAndResponsesRemote
+	 * @param proxyConfig
+	 *            not <code>null</code>
+	 * @param buildInfoProvider
+	 *            not <code>null</code>
+	 */
 	public FhirWebserviceClientProviderImpl(FhirContext fhirContext, ReferenceCleaner referenceCleaner,
 			String baseUrlLocal, Duration readTimeoutLocal, Duration connectTimeoutLocal,
 			boolean logRequestsAndResponsesLocal, KeyStore trustStore, KeyStore keyStore, char[] keyStorePassword,
 			Duration readTimeoutRemote, Duration connectTimeoutRemote, boolean logRequestsAndResponsesRemote,
 			BpeProxyConfig proxyConfig, BuildInfoProvider buildInfoProvider)
 	{
-		this.fhirContext = fhirContext;
-		this.referenceCleaner = referenceCleaner;
+		this.fhirContext = Objects.requireNonNull(fhirContext, "fhirContext");
+		this.referenceCleaner = Objects.requireNonNull(referenceCleaner, "referenceCleaner");
 
-		this.baseUrlLocal = baseUrlLocal;
-		this.readTimeoutLocal = readTimeoutLocal;
-		this.connectTimeoutLocal = connectTimeoutLocal;
+		this.baseUrlLocal = Objects.requireNonNull(baseUrlLocal, "baseUrlLocal");
+		this.readTimeoutLocal = Objects.requireNonNull(readTimeoutLocal, "readTimeoutLocal");
+		this.connectTimeoutLocal = Objects.requireNonNull(connectTimeoutLocal, "connectTimeoutLocal");
 		this.logRequestsAndResponsesLocal = logRequestsAndResponsesLocal;
 
-		this.trustStore = trustStore;
-		this.keyStore = keyStore;
-		this.keyStorePassword = keyStorePassword;
+		this.trustStore = Objects.requireNonNull(trustStore, "trustStore");
+		this.keyStore = Objects.requireNonNull(keyStore, "keyStore");
+		this.keyStorePassword = Objects.requireNonNull(keyStorePassword, "keyStorePassword");
 
-		this.readTimeoutRemote = readTimeoutRemote;
-		this.connectTimeoutRemote = connectTimeoutRemote;
+		this.readTimeoutRemote = Objects.requireNonNull(readTimeoutRemote, "readTimeoutRemote");
+		this.connectTimeoutRemote = Objects.requireNonNull(connectTimeoutRemote, "connectTimeoutRemote");
 		this.logRequestsAndResponsesRemote = logRequestsAndResponsesRemote;
 
-		this.proxyConfig = proxyConfig;
-		this.buildInfoProvider = buildInfoProvider;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception
-	{
-		Objects.requireNonNull(fhirContext, "fhirContext");
-		Objects.requireNonNull(referenceCleaner, "referenceCleaner");
-		Objects.requireNonNull(baseUrlLocal, "baseUrlLocal");
-		Objects.requireNonNull(readTimeoutLocal, "readTimeoutLocal");
-		Objects.requireNonNull(connectTimeoutLocal, "connectTimeoutLocal");
-		Objects.requireNonNull(trustStore, "trustStore");
-		Objects.requireNonNull(keyStore, "keyStore");
-		Objects.requireNonNull(keyStorePassword, "keyStorePassword");
-		Objects.requireNonNull(readTimeoutRemote, "readTimeoutRemote");
-		Objects.requireNonNull(connectTimeoutRemote, "connectTimeoutRemote");
-		Objects.requireNonNull(proxyConfig, "proxyConfig");
-		Objects.requireNonNull(buildInfoProvider, "buildInfoReader");
+		this.proxyConfig = Objects.requireNonNull(proxyConfig, "proxyConfig");
+		this.buildInfoProvider = Objects.requireNonNull(buildInfoProvider, "buildInfoProvider");
 	}
 
 	public String getLocalBaseUrl()

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/service/MailServiceImpl.java

@@ -21,23 +21,19 @@
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 
-import org.springframework.beans.factory.InitializingBean;
-
 import dev.dsf.bpe.api.service.BpeMailService;
 
-public class MailServiceImpl implements MailService, InitializingBean
+public class MailServiceImpl implements MailService
 {
 	private final BpeMailService delegate;
 
+	/**
+	 * @param delegate
+	 *            not <code>null</code>
+	 */
 	public MailServiceImpl(BpeMailService delegate)
 	{
-		this.delegate = delegate;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception
-	{
-		Objects.requireNonNull(delegate, "delegate");
+		this.delegate = Objects.requireNonNull(delegate, "delegate");
 	}
 
 	@Override

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourceSerializer.java

@@ -25,30 +25,27 @@
 import org.operaton.bpm.engine.variable.impl.value.UntypedValueImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.parser.DataFormatException;
 import ca.uhn.fhir.parser.IParser;
 import dev.dsf.bpe.v1.variables.FhirResourceValues.FhirResourceValue;
 
-public class FhirResourceSerializer extends PrimitiveValueSerializer<FhirResourceValue> implements InitializingBean
+public class FhirResourceSerializer extends PrimitiveValueSerializer<FhirResourceValue>
 {
 	private static final Logger logger = LoggerFactory.getLogger(FhirResourceSerializer.class);
 
 	private final FhirContext fhirContext;
 
+	/**
+	 * @param fhirContext
+	 *            not <code>null</code>
+	 */
 	public FhirResourceSerializer(FhirContext fhirContext)
 	{
 		super(FhirResourceValues.VALUE_TYPE);
 
-		this.fhirContext = fhirContext;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception
-	{
-		Objects.requireNonNull(fhirContext, "fhirContext");
+		this.fhirContext = Objects.requireNonNull(fhirContext, "fhirContext");
 	}
 
 	@Override

dsf-bpe/dsf-bpe-process-api-v1-impl/src/main/java/dev/dsf/bpe/v1/variables/FhirResourcesListSerializer.java

@@ -22,28 +22,24 @@
 import org.operaton.bpm.engine.impl.variable.serializer.PrimitiveValueSerializer;
 import org.operaton.bpm.engine.impl.variable.serializer.ValueFields;
 import org.operaton.bpm.engine.variable.impl.value.UntypedValueImpl;
-import org.springframework.beans.factory.InitializingBean;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import dev.dsf.bpe.v1.variables.FhirResourcesListValues.FhirResourcesListValue;
 
 public class FhirResourcesListSerializer extends PrimitiveValueSerializer<FhirResourcesListValue>
-		implements InitializingBean
 {
 	private final ObjectMapper objectMapper;
 
+	/**
+	 * @param objectMapper
+	 *            not <code>null</code>
+	 */
 	public FhirResourcesListSerializer(ObjectMapper objectMapper)
 	{
 		super(FhirResourcesListValues.VALUE_TYPE);
 
-		this.objectMapper = objectMapper;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception
-	{
-		Objects.requireNonNull(objectMapper, "objectMapper");
+		this.objectMapper = Objects.requireNonNull(objectMapper, "objectMapper");
 	}
 
 	@Override