Skip to content

Commit f72b861

Browse files
hhundhhund
committed
Merge remote-tracking branch 'origin/develop_2' into
issue/349_Data_Compression_Service
2 parents 89d0c71 + 9510f6b commit f72b861

File tree

85 files changed

+1822
-969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1822
-969
lines changed

‎.gitignore‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ dsf-bpe/dsf-bpe-server-jetty/cert/*.key
2121
dsf-bpe/dsf-bpe-server-jetty/conf/config.properties
2222
dsf-bpe/dsf-bpe-server-jetty/docker/api/v1/*.jar
2323
dsf-bpe/dsf-bpe-server-jetty/docker/api/v2/*.jar
24-
dsf-bpe/dsf-bpe-server-jetty/docker/ca/*.pem
24+
dsf-bpe/dsf-bpe-server-jetty/docker/ca/client_ca_chains/*.crt
25+
dsf-bpe/dsf-bpe-server-jetty/docker/ca/server_root_cas/*.crt
2526
dsf-bpe/dsf-bpe-server-jetty/docker/dsf_bpe.jar
2627
dsf-bpe/dsf-bpe-server-jetty/docker/dsf_status_client.jar
2728
dsf-bpe/dsf-bpe-server-jetty/docker/lib/*.jar
@@ -32,8 +33,10 @@ dsf-bpe/dsf-bpe-server-jetty/ui
3233
###
3334
# dsf-docker ignore
3435
###
35-
dsf-docker/bpe_proxy/ca/*.pem
36-
dsf-docker/fhir_proxy/ca/*.pem
36+
dsf-docker/bpe_proxy/ca/client_ca_chains/*.crt
37+
dsf-docker/bpe_proxy/ca/client_issuing_cas/*.crt
38+
dsf-docker/fhir_proxy/ca/client_ca_chains/*.crt
39+
dsf-docker/fhir_proxy/ca/client_issuing_cas/*.crt
3740

3841
###
3942
# dsf-docker-test-setup ignores
@@ -98,25 +101,10 @@ dsf-fhir/dsf-fhir-server-jetty/cert/*.crt
98101
dsf-fhir/dsf-fhir-server-jetty/cert/*.key
99102
dsf-fhir/dsf-fhir-server-jetty/conf/bundle.xml
100103
dsf-fhir/dsf-fhir-server-jetty/conf/config.properties
101-
dsf-fhir/dsf-fhir-server-jetty/docker/ca/*.pem
104+
dsf-fhir/dsf-fhir-server-jetty/docker/ca/client_ca_chains/*.crt
105+
dsf-fhir/dsf-fhir-server-jetty/docker/ca/server_root_cas/*.crt
102106
dsf-fhir/dsf-fhir-server-jetty/docker/dsf_fhir.jar
103107
dsf-fhir/dsf-fhir-server-jetty/docker/dsf_status_client.jar
104108
dsf-fhir/dsf-fhir-server-jetty/docker/lib/*.jar
105109
dsf-fhir/dsf-fhir-server-jetty/ui
106-
dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/bundle.xml
107-
108-
###
109-
# dsf-tools ignores
110-
###
111-
dsf-tools/dsf-tools-default-ca-files-generator/cert/*.pem
112-
113-
dsf-tools/dsf-tools-test-data-generator/bundle/*.xml
114-
115-
dsf-tools/dsf-tools-test-data-generator/cert/**/*.pem
116-
dsf-tools/dsf-tools-test-data-generator/cert/**/*.key
117-
dsf-tools/dsf-tools-test-data-generator/cert/**/*.crt
118-
dsf-tools/dsf-tools-test-data-generator/cert/**/*.csr
119-
dsf-tools/dsf-tools-test-data-generator/cert/**/*.p12
120-
dsf-tools/dsf-tools-test-data-generator/cert/thumbprints.txt
121-
122-
dsf-tools/dsf-tools-test-data-generator/config/*.properties
110+
dsf-fhir/dsf-fhir-validation/src/main/resources/fhir/bundle.xml

‎dsf-bpe/dsf-bpe-process-api-v1-impl/pom.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,22 @@
6464

6565
<build>
6666
<plugins>
67+
<plugin>
68+
<groupId>org.apache.maven.plugins</groupId>
69+
<artifactId>maven-compiler-plugin</artifactId>
70+
<configuration>
71+
<testCompilerArgument>-proc:none</testCompilerArgument>
72+
</configuration>
73+
</plugin>
6774
<plugin>
6875
<groupId>org.apache.maven.plugins</groupId>
6976
<artifactId>maven-dependency-plugin</artifactId>
7077
<executions>
78+
<execution>
79+
<goals>
80+
<goal>properties</goal>
81+
</goals>
82+
</execution>
7183
<execution>
7284
<id>copy-api-v1-dependencies-to-docker</id>
7385
<phase>pre-integration-test</phase>
@@ -187,6 +199,13 @@
187199
</execution>
188200
</executions>
189201
</plugin>
202+
<plugin>
203+
<groupId>org.apache.maven.plugins</groupId>
204+
<artifactId>maven-surefire-plugin</artifactId>
205+
<configuration>
206+
<argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine>
207+
</configuration>
208+
</plugin>
190209
<plugin>
191210
<groupId>org.apache.maven.plugins</groupId>
192211
<artifactId>maven-clean-plugin</artifactId>

‎dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/ProcessPluginApiFactory.java‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
package dev.dsf.bpe.v2;
2+
3+
import java.util.Objects;
4+
import java.util.function.Supplier;
5+
6+
import org.springframework.context.ApplicationContext;
7+
8+
import com.fasterxml.jackson.databind.ObjectMapper;
9+
10+
import ca.uhn.fhir.context.FhirContext;
11+
import dev.dsf.bpe.v2.config.ProxyConfig;
12+
import dev.dsf.bpe.v2.service.CompressionService;
13+
import dev.dsf.bpe.v2.service.CryptoService;
14+
import dev.dsf.bpe.v2.service.DataLogger;
15+
import dev.dsf.bpe.v2.service.DsfClientProvider;
16+
import dev.dsf.bpe.v2.service.EndpointProvider;
17+
import dev.dsf.bpe.v2.service.FhirClientConfigProvider;
18+
import dev.dsf.bpe.v2.service.FhirClientProvider;
19+
import dev.dsf.bpe.v2.service.MailService;
20+
import dev.dsf.bpe.v2.service.MimeTypeService;
21+
import dev.dsf.bpe.v2.service.OidcClientProvider;
22+
import dev.dsf.bpe.v2.service.OrganizationProvider;
23+
import dev.dsf.bpe.v2.service.QuestionnaireResponseHelper;
24+
import dev.dsf.bpe.v2.service.ReadAccessHelper;
25+
import dev.dsf.bpe.v2.service.TargetProvider;
26+
import dev.dsf.bpe.v2.service.TaskHelper;
27+
import dev.dsf.bpe.v2.service.process.ProcessAuthorizationHelper;
28+
29+
public class ProcessPluginApiFactory implements Supplier<ProcessPluginApi>
30+
{
31+
private final ApplicationContext parentContext;
32+
private final ProcessPluginDefinition processPluginDefinition;
33+
34+
public ProcessPluginApiFactory(ProcessPluginDefinition processPluginDefinition, ApplicationContext parentContext)
35+
{
36+
this.processPluginDefinition = Objects.requireNonNull(processPluginDefinition, "processPluginDefinition");
37+
this.parentContext = Objects.requireNonNull(parentContext, "parentContext");
38+
}
39+
40+
private <T> T fromParent(Class<T> t)
41+
{
42+
return parentContext.getBean(t);
43+
}
44+
45+
@Override
46+
public ProcessPluginApi get()
47+
{
48+
return new ProcessPluginApiImpl(processPluginDefinition, fromParent(ProxyConfig.class),
49+
fromParent(EndpointProvider.class), fromParent(FhirContext.class), fromParent(DsfClientProvider.class),
50+
fromParent(FhirClientProvider.class), fromParent(FhirClientConfigProvider.class),
51+
fromParent(OidcClientProvider.class), fromParent(MailService.class), fromParent(MimeTypeService.class),
52+
fromParent(ObjectMapper.class), fromParent(OrganizationProvider.class),
53+
fromParent(ProcessAuthorizationHelper.class), fromParent(QuestionnaireResponseHelper.class),
54+
fromParent(ReadAccessHelper.class), fromParent(TaskHelper.class), fromParent(CompressionService.class),
55+
fromParent(CryptoService.class), fromParent(TargetProvider.class), fromParent(DataLogger.class));
56+
}
57+
}

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

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import dev.dsf.bpe.v2.service.DataLogger;
1414
import dev.dsf.bpe.v2.service.DsfClientProvider;
1515
import dev.dsf.bpe.v2.service.EndpointProvider;
16+
import dev.dsf.bpe.v2.service.FhirClientConfigProvider;
1617
import dev.dsf.bpe.v2.service.FhirClientProvider;
1718
import dev.dsf.bpe.v2.service.MailService;
1819
import dev.dsf.bpe.v2.service.MimeTypeService;
@@ -26,11 +27,13 @@
2627

2728
public class ProcessPluginApiImpl implements ProcessPluginApi, InitializingBean
2829
{
30+
private final ProcessPluginDefinition processPluginDefinition;
2931
private final ProxyConfig proxyConfig;
3032
private final EndpointProvider endpointProvider;
3133
private final FhirContext fhirContext;
3234
private final DsfClientProvider dsfClientProvider;
3335
private final FhirClientProvider fhirClientProvider;
36+
private final FhirClientConfigProvider fhirClientConfigProvider;
3437
private final OidcClientProvider oidcClientProvider;
3538
private final MailService mailService;
3639
private final MimeTypeService mimeTypeService;
@@ -45,20 +48,23 @@ public class ProcessPluginApiImpl implements ProcessPluginApi, InitializingBean
4548
private final TargetProvider targetProvider;
4649
private final DataLogger dataLogger;
4750

48-
public ProcessPluginApiImpl(ProxyConfig proxyConfig, EndpointProvider endpointProvider, FhirContext fhirContext,
49-
DsfClientProvider dsfClientProvider, FhirClientProvider fhirClientProvider,
51+
public ProcessPluginApiImpl(ProcessPluginDefinition processPluginDefinition, ProxyConfig proxyConfig,
52+
EndpointProvider endpointProvider, FhirContext fhirContext, DsfClientProvider dsfClientProvider,
53+
FhirClientProvider fhirClientProvider, FhirClientConfigProvider fhirClientConfigProvider,
5054
OidcClientProvider oidcClientProvider, MailService mailService, MimeTypeService mimeTypeService,
5155
ObjectMapper objectMapper, OrganizationProvider organizationProvider,
5256
ProcessAuthorizationHelper processAuthorizationHelper,
5357
QuestionnaireResponseHelper questionnaireResponseHelper, ReadAccessHelper readAccessHelper,
5458
TaskHelper taskHelper, CompressionService compressionService, CryptoService cryptoService,
5559
TargetProvider targetProvider, DataLogger dataLogger)
5660
{
61+
this.processPluginDefinition = processPluginDefinition;
5762
this.proxyConfig = proxyConfig;
5863
this.endpointProvider = endpointProvider;
5964
this.fhirContext = fhirContext;
6065
this.dsfClientProvider = dsfClientProvider;
6166
this.fhirClientProvider = fhirClientProvider;
67+
this.fhirClientConfigProvider = fhirClientConfigProvider;
6268
this.oidcClientProvider = oidcClientProvider;
6369
this.mailService = mailService;
6470
this.mimeTypeService = mimeTypeService;
@@ -77,11 +83,13 @@ public ProcessPluginApiImpl(ProxyConfig proxyConfig, EndpointProvider endpointPr
7783
@Override
7884
public void afterPropertiesSet() throws Exception
7985
{
86+
Objects.requireNonNull(processPluginDefinition, "processPluginDefinition");
8087
Objects.requireNonNull(proxyConfig, "proxyConfig");
8188
Objects.requireNonNull(endpointProvider, "endpointProvider");
8289
Objects.requireNonNull(fhirContext, "fhirContext");
8390
Objects.requireNonNull(dsfClientProvider, "dsfClientProvider");
8491
Objects.requireNonNull(fhirClientProvider, "fhirClientProvider");
92+
Objects.requireNonNull(fhirClientConfigProvider, "fhirClientConfigProvider");
8593
Objects.requireNonNull(oidcClientProvider, "oidcClientProvider");
8694
Objects.requireNonNull(mailService, "mailService");
8795
Objects.requireNonNull(mimeTypeService, "mimeTypeService");
@@ -97,6 +105,12 @@ public void afterPropertiesSet() throws Exception
97105
Objects.requireNonNull(dataLogger, "dataLogger");
98106
}
99107

108+
@Override
109+
public ProcessPluginDefinition getProcessPluginDefinition()
110+
{
111+
return processPluginDefinition;
112+
}
113+
100114
@Override
101115
public ProxyConfig getProxyConfig()
102116
{
@@ -127,6 +141,12 @@ public FhirClientProvider getFhirClientProvider()
127141
return fhirClientProvider;
128142
}
129143

144+
@Override
145+
public FhirClientConfigProvider getFhirClientConfigProvider()
146+
{
147+
return fhirClientConfigProvider;
148+
}
149+
130150
@Override
131151
public OidcClientProvider getOidcClientProvider()
132152
{

‎dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/client/fhir/FhirClientFactory.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ public int getConnectTimeout()
222222
}
223223

224224
@Override
225+
@Deprecated
225226
public ServerValidationModeEnum getServerValidationModeEnum()
226227
{
227228
return getServerValidationMode();
@@ -294,6 +295,7 @@ public void setProxyCredentials(String theUsername, String thePassword)
294295
}
295296

296297
@Override
298+
@Deprecated
297299
public void setServerValidationModeEnum(ServerValidationModeEnum theServerValidationMode)
298300
{
299301
throw notSupported();

0 commit comments

Comments
 (0)