Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
eb65c79
improved log messages and level
hhund Oct 19, 2026
3415bc0
refactored method / bean names
hhund Oct 19, 2026
af3b370
renamed config parameters / environment variables -> breaking change
hhund Oct 19, 2026
285b8bf
refactored status webservice, added websocket status to health check
hhund Oct 19, 2026
a484349
refactored code, moved checks from afterPropertiesSet to constructors
hhund Oct 19, 2026
ff33e38
Merge remote-tracking branch 'origin/develop' into
hhund Oct 20, 2026
ba22553
added not null check
hhund Oct 20, 2026
c929ffe
refactored code and reorganized maven dependencies
hhund Oct 20, 2026
3cbfcd9
Merge remote-tracking branch 'origin/develop' into
hhund Oct 21, 2026
02a9e26
reverted changes, InitializingBean implementation can not be removed
hhund Oct 26, 2026
bbbc064
replaced org.apache.commons.lang3.StringUtils.isBlank with JDK function
hhund Nov 17, 2026
53c237f
fixed method parameter name in JavaDoc demo code
hhund Nov 17, 2026
d2f74ba
removed unused code
hhund Nov 17, 2026
f5b4ea4
added not null checks
hhund Nov 18, 2026
22d3033
reconfigured thread names, switch jetty server to virtual threads
hhund Nov 18, 2026
ae7f0de
improved OIDC client proxy config
hhund Nov 18, 2026
da8ce3d
added forward proxy with HTTP CONNECT via TLS
hhund Nov 18, 2026
8604c84
keycloak config cleanup and new custom dsf login theme
hhund Nov 18, 2026
8318d26
ssl_verify_client off override for default localhost index page
hhund Nov 18, 2026
eedf24c
new websocket client impl based on jetty-websocket-jetty-client
hhund Nov 18, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ dsf-docker-dev-setup-3dic-ttp/secrets/dic2.crt
dsf-docker-dev-setup-3dic-ttp/secrets/dic2.key
dsf-docker-dev-setup-3dic-ttp/secrets/dic3.crt
dsf-docker-dev-setup-3dic-ttp/secrets/dic3.key
dsf-docker-dev-setup-3dic-ttp/secrets/forward-proxy-tls.chain.crt
dsf-docker-dev-setup-3dic-ttp/secrets/forward-proxy-tls.key.plain
dsf-docker-dev-setup-3dic-ttp/secrets/issuing_ca.crt
dsf-docker-dev-setup-3dic-ttp/secrets/keycloak.chain.crt
dsf-docker-dev-setup-3dic-ttp/secrets/keycloak.key.plain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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/";

Expand All @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading