From 2948f314e421559a9fb9a72da5d15708b457daba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gru=CC=88ndner?= Date: Tue, 20 Sep 2022 21:57:14 +0200 Subject: [PATCH 01/14] bump sq2cql version and add version to DSF CQL library --- pom.xml | 2 +- .../query/broker/dsf/DSFQueryManager.java | 2 ++ .../query/translation/CqlQueryTranslator.java | 2 +- .../query/translation/CqlQueryTranslatorTest.java | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 943649a2..b54d933f 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ de.medizininformatik-initiative sq2cql - 0.1.20 + 0.1.24 diff --git a/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManager.java b/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManager.java index 8d3f47e1..3816256e 100644 --- a/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManager.java +++ b/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManager.java @@ -42,6 +42,7 @@ class DSFQueryManager implements QueryManager { private static final String RECIPIENT_TYPE = "Organization"; private static final String LIBRARY_NAME = "Retrieve"; + private static final String LIBRARY_VERSION = "1.0.0"; private static final String CODE_SYSTEM_FEASIBILITY = "http://medizininformatik-initiative.de/fhir/CodeSystem/feasibility"; private static final String CODE_SYSTEM_FEASIBILITY_VALUE_MEASURE_REFERENCE = "measure-reference"; @@ -213,6 +214,7 @@ private Bundle addLibrary(Bundle queryBundle, Map queryContents, Bundle bundle = queryBundle.copy(); Library library = new Library() .setName(LIBRARY_NAME) + .setVersion(LIBRARY_VERSION) .setStatus(ACTIVE) .setType(new CodeableConcept() .addCoding(new Coding() diff --git a/src/main/java/de/numcodex/feasibility_gui_backend/query/translation/CqlQueryTranslator.java b/src/main/java/de/numcodex/feasibility_gui_backend/query/translation/CqlQueryTranslator.java index d405d94b..c2dd9171 100644 --- a/src/main/java/de/numcodex/feasibility_gui_backend/query/translation/CqlQueryTranslator.java +++ b/src/main/java/de/numcodex/feasibility_gui_backend/query/translation/CqlQueryTranslator.java @@ -31,7 +31,7 @@ public String translate(StructuredQuery query) throws QueryTranslationException } try { - return translator.toCql(structuredQuery).print(PrintContext.ZERO); + return translator.toCql(structuredQuery).print(); } catch (Exception e) { throw new QueryTranslationException("cannot translate structured query to CQL format", e); } diff --git a/src/test/java/de/numcodex/feasibility_gui_backend/query/translation/CqlQueryTranslatorTest.java b/src/test/java/de/numcodex/feasibility_gui_backend/query/translation/CqlQueryTranslatorTest.java index 8718d90f..981879b2 100644 --- a/src/test/java/de/numcodex/feasibility_gui_backend/query/translation/CqlQueryTranslatorTest.java +++ b/src/test/java/de/numcodex/feasibility_gui_backend/query/translation/CqlQueryTranslatorTest.java @@ -88,7 +88,7 @@ public void testTranslate_TranslationFails() { @Disabled("Needs to be enabled if the new version of sq2cl is available and compatible with structured query v2.") @Test public void testTranslate_EverythingSucceeds() throws QueryTranslationException { - var termCode = new TermCode(); + /*var termCode = new TermCode(); termCode.setCode("LL2191-6"); termCode.setSystem("http://loinc.org"); termCode.setDisplay("Geschlecht"); @@ -109,5 +109,6 @@ public void testTranslate_EverythingSucceeds() throws QueryTranslationException var translationResult = cqlQueryTranslator.translate(testQuery); assertEquals("bar", translationResult); + */ } } From e4e55162967e1d511fd188a0fd8266dffa82da37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gru=CC=88ndner?= Date: Tue, 20 Sep 2022 22:00:47 +0200 Subject: [PATCH 02/14] re-add translation test and remove any from print --- .../query/translation/CqlQueryTranslatorTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/de/numcodex/feasibility_gui_backend/query/translation/CqlQueryTranslatorTest.java b/src/test/java/de/numcodex/feasibility_gui_backend/query/translation/CqlQueryTranslatorTest.java index 981879b2..e10b3717 100644 --- a/src/test/java/de/numcodex/feasibility_gui_backend/query/translation/CqlQueryTranslatorTest.java +++ b/src/test/java/de/numcodex/feasibility_gui_backend/query/translation/CqlQueryTranslatorTest.java @@ -88,7 +88,7 @@ public void testTranslate_TranslationFails() { @Disabled("Needs to be enabled if the new version of sq2cl is available and compatible with structured query v2.") @Test public void testTranslate_EverythingSucceeds() throws QueryTranslationException { - /*var termCode = new TermCode(); + var termCode = new TermCode(); termCode.setCode("LL2191-6"); termCode.setSystem("http://loinc.org"); termCode.setDisplay("Geschlecht"); @@ -103,12 +103,12 @@ public void testTranslate_EverythingSucceeds() throws QueryTranslationException testQuery.setVersion(URI.create("http://to_be_decided.com/draft-2/schema#")); var resultLibraryMock = mock(Library.class); - when(resultLibraryMock.print(any())).thenReturn("bar"); + when(resultLibraryMock.print()).thenReturn("bar"); when(translator.toCql(any(de.numcodex.sq2cql.model.structured_query.StructuredQuery.class))) .thenReturn(resultLibraryMock); var translationResult = cqlQueryTranslator.translate(testQuery); assertEquals("bar", translationResult); - */ + } } From 1a0d83573c2248c166342ce7b862fadab74d25ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gru=CC=88ndner?= Date: Tue, 20 Sep 2022 22:06:06 +0200 Subject: [PATCH 03/14] add snakeyaml to adress security scan results --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index b54d933f..bc6a2195 100644 --- a/pom.xml +++ b/pom.xml @@ -67,11 +67,20 @@ spring-boot-starter-actuator + + + + org.yaml + snakeyaml + 1.32 + + org.keycloak keycloak-spring-boot-starter 18.0.0 + org.springframework.boot spring-boot-starter-security From 595770e95deb7012a94a70aaf0e98abe1a459ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gru=CC=88ndner?= Date: Tue, 20 Sep 2022 22:24:06 +0200 Subject: [PATCH 04/14] move snakeyaml down to avoid jaxb exception --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index bc6a2195..1195c90f 100644 --- a/pom.xml +++ b/pom.xml @@ -67,14 +67,6 @@ spring-boot-starter-actuator - - - - org.yaml - snakeyaml - 1.32 - - org.keycloak keycloak-spring-boot-starter @@ -217,6 +209,14 @@ test + + + + org.yaml + snakeyaml + 1.32 + + io.projectreactor reactor-test From 5bd837f9c0759d80b08dcb345722d0b5d1442de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gru=CC=88ndner?= Date: Tue, 20 Sep 2022 22:32:05 +0200 Subject: [PATCH 05/14] remove snakeyaml --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index 1195c90f..8ff02c6b 100644 --- a/pom.xml +++ b/pom.xml @@ -209,14 +209,6 @@ test - - - - org.yaml - snakeyaml - 1.32 - - io.projectreactor reactor-test From 2df11124a94921a1006ce5b1bd097cc0a06e6be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gru=CC=88ndner?= Date: Tue, 20 Sep 2022 23:04:18 +0200 Subject: [PATCH 06/14] Revert "remove snakeyaml" This reverts commit 5bd837f9c0759d80b08dcb345722d0b5d1442de7. --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index 8ff02c6b..1195c90f 100644 --- a/pom.xml +++ b/pom.xml @@ -209,6 +209,14 @@ test + + + + org.yaml + snakeyaml + 1.32 + + io.projectreactor reactor-test From f60844adf07a7ed3bc30351e3c1bcbf375e82d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Gru=CC=88ndner?= Date: Tue, 27 Sep 2022 17:56:48 +0200 Subject: [PATCH 07/14] update sq2cql-version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1195c90f..7ce1a554 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ de.medizininformatik-initiative sq2cql - 0.1.24 + 0.1.26 From 5fc6443b20c121233f539126a6f4a79a333cfc05 Mon Sep 17 00:00:00 2001 From: DiCanio Date: Fri, 21 Oct 2022 11:48:58 +0200 Subject: [PATCH 08/14] Support DSF Feasibility Plugin v0.4.0 Adds support for the DSF feasibility plugin in version 0.4.0. Also bumps the corresponding DSF dependencies to appropriate versions matching the plugin. --- pom.xml | 6 +++--- .../query/broker/dsf/DSFQueryManager.java | 2 +- .../query/broker/dsf/DSFQueryResultHandler.java | 2 +- .../query/broker/dsf/DSFQueryManagerTest.java | 2 +- .../query/broker/dsf/DSFQueryResultCollectorIT.java | 4 ++-- .../query/broker/dsf/DSFQueryResultHandlerTest.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 7ce1a554..fcf528ba 100644 --- a/pom.xml +++ b/pom.xml @@ -140,19 +140,19 @@ org.highmed.dsf dsf-fhir-webservice-client - 0.7.0 + 0.9.0 org.highmed.dsf dsf-fhir-websocket-client - 0.7.0 + 0.9.0 org.highmed.dsf dsf-fhir-rest-adapter - 0.7.0 + 0.9.0 diff --git a/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManager.java b/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManager.java index 3816256e..f667251c 100644 --- a/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManager.java +++ b/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManager.java @@ -28,7 +28,7 @@ */ class DSFQueryManager implements QueryManager { - private static final String INSTANTIATE_URI = "http://medizininformatik-initiative.de/bpe/Process/feasibilityRequest/0.3.0"; + private static final String INSTANTIATE_URI = "http://medizininformatik-initiative.de/bpe/Process/feasibilityRequest/0.4.0"; private static final String REQUEST_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-request"; private static final String MEASURE_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-measure"; private static final String LIBRARY_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-library"; diff --git a/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandler.java b/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandler.java index 40197d6a..b288e2d6 100644 --- a/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandler.java +++ b/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandler.java @@ -13,7 +13,7 @@ @Slf4j class DSFQueryResultHandler { - private static final String SINGLE_DIC_QUERY_RESULT_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.3.0"; + private static final String SINGLE_DIC_QUERY_RESULT_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.4.0"; private static final String CODE_SYSTEM_FEASIBILITY = "http://medizininformatik-initiative.de/fhir/CodeSystem/feasibility"; private static final String CODE_SYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REF = "measure-report-reference"; private static final String CODE_SYSTEM_BPMN_MESSAGE = "http://highmed.org/fhir/CodeSystem/bpmn-message"; diff --git a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManagerTest.java b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManagerTest.java index e7218982..6a089f05 100644 --- a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManagerTest.java +++ b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManagerTest.java @@ -145,7 +145,7 @@ public void testPublishQuery() throws UnsupportedMediaTypeException, QueryNotFou assertEquals(businessKey, queryId); assertNotNull(library.getName()); - assertEquals("http://medizininformatik-initiative.de/bpe/Process/feasibilityRequest/0.3.0", task.getInstantiatesUri()); + assertEquals("http://medizininformatik-initiative.de/bpe/Process/feasibilityRequest/0.4.0", task.getInstantiatesUri()); assertEquals(1, task.getMeta().getProfile().stream().filter(p -> p.getValueAsString() .equals("http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-request")) .count()); diff --git a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultCollectorIT.java b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultCollectorIT.java index 83db1c4c..769da27b 100644 --- a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultCollectorIT.java +++ b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultCollectorIT.java @@ -31,7 +31,7 @@ @SuppressWarnings("NewClassNamingConvention") public class DSFQueryResultCollectorIT { - private static final String SINGLE_DIC_RESULT_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.3.0"; + private static final String SINGLE_DIC_RESULT_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.4.0"; @Mock private DSFBrokerClient brokerClient; @@ -60,7 +60,7 @@ private Task createTestTask(String brokerQueryId, String siteId, String measureR .setStatus(COMPLETED) .setIntent(ORDER) .setAuthoredOn(new Date()) - .setInstantiatesUri("http://highmed.org/bpe/Process/feasibilityRequest/0.3.0"); + .setInstantiatesUri("http://highmed.org/bpe/Process/feasibilityRequest/0.4.0"); task.getRequester() .setType("Organization") diff --git a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandlerTest.java b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandlerTest.java index c20dcf32..0655d9da 100644 --- a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandlerTest.java +++ b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandlerTest.java @@ -55,7 +55,7 @@ public void testOnResultButReferencedMeasureReportCanNotBeFetched() throws FhirW .setIntent(ORDER) .setRequester(dicOrganizationRef) .setRestriction(new TaskRestrictionComponent().addRecipient(zarsOrganizationRef)); - task.getMeta().addProfile("http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.3.0"); + task.getMeta().addProfile("http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.4.0"); task.addInput() .setType(new CodeableConcept() @@ -88,7 +88,7 @@ public void testOnResult() throws FhirWebClientProvisionException { .setIntent(ORDER) .setRequester(dicOrganizationRef) .setRestriction(new TaskRestrictionComponent().addRecipient(zarsOrganizationRef)); - task.getMeta().addProfile("http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.3.0"); + task.getMeta().addProfile("http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.4.0"); task.addInput() .setType(new CodeableConcept() From 90c08866d9419cb6e35a268b477d7fa273800d5f Mon Sep 17 00:00:00 2001 From: DiCanio Date: Fri, 21 Oct 2022 13:54:30 +0200 Subject: [PATCH 09/14] Update Spring Boot Starter Parent --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fcf528ba..ecd84d47 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.3 + 2.7.5 de.medizininformatik-initiative From d00b44040b99e264ee6fc2a08217dbf50e8a1a93 Mon Sep 17 00:00:00 2001 From: DiCanio Date: Fri, 21 Oct 2022 14:09:09 +0200 Subject: [PATCH 10/14] Resolve Apache Commons RCE CVE Replaces the apache commons-text dependency that transitively comes with the dsf-fhir-webservice-client dependency. This is necessary since commons-text versions prior to 1.10.0 allowed for remote code executions. Simply updating the DSF dependency is not possible since they get the affected version from a third party dependency itself which cannot be updated due to breaking changes affecting the overall framework. --- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pom.xml b/pom.xml index ecd84d47..83fce98a 100644 --- a/pom.xml +++ b/pom.xml @@ -137,10 +137,26 @@ 1.3.2 + + + org.apache.commons + commons-text + 1.10.0 + org.highmed.dsf dsf-fhir-webservice-client 0.9.0 + + + org.apache.commons + commons-text + + From 39e3adb1a439efad947a64815a61e4c312f3216d Mon Sep 17 00:00:00 2001 From: Michael Folz Date: Thu, 24 Nov 2022 11:46:28 +0100 Subject: [PATCH 11/14] #39 - Update spring security - Override spring security version to 5.8.0 (as recommended by official documentation) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 83fce98a..8d4c0673 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,7 @@ 4.9.3 4.9.1 42.4.1 + 5.8.0 @@ -76,7 +77,6 @@ org.springframework.boot spring-boot-starter-security - 2.7.2 From 01497678c64cc869a53403201e500d8a91acd5d0 Mon Sep 17 00:00:00 2001 From: DiCanio Date: Tue, 29 Nov 2022 15:17:50 +0100 Subject: [PATCH 12/14] Update Spring to Latest Bugfix Version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d4c0673..ab8f59cf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.5 + 2.7.6 de.medizininformatik-initiative From 429aa46b4af0bf9d5fe71e9fadd575b161b470a1 Mon Sep 17 00:00:00 2001 From: DiCanio Date: Tue, 29 Nov 2022 14:53:01 +0100 Subject: [PATCH 13/14] Support DSF Feasibility Plugin v0.5.0 Adds support for the DSF feasibility plugin in version 0.5.0. --- .../query/broker/dsf/DSFQueryManager.java | 2 +- .../query/broker/dsf/DSFQueryResultHandler.java | 2 +- .../query/broker/dsf/DSFQueryManagerTest.java | 2 +- .../query/broker/dsf/DSFQueryResultCollectorIT.java | 4 ++-- .../query/broker/dsf/DSFQueryResultHandlerTest.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManager.java b/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManager.java index f667251c..0551ae7a 100644 --- a/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManager.java +++ b/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManager.java @@ -28,7 +28,7 @@ */ class DSFQueryManager implements QueryManager { - private static final String INSTANTIATE_URI = "http://medizininformatik-initiative.de/bpe/Process/feasibilityRequest/0.4.0"; + private static final String INSTANTIATE_URI = "http://medizininformatik-initiative.de/bpe/Process/feasibilityRequest/0.5.0"; private static final String REQUEST_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-request"; private static final String MEASURE_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-measure"; private static final String LIBRARY_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-library"; diff --git a/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandler.java b/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandler.java index b288e2d6..eafffe2f 100644 --- a/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandler.java +++ b/src/main/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandler.java @@ -13,7 +13,7 @@ @Slf4j class DSFQueryResultHandler { - private static final String SINGLE_DIC_QUERY_RESULT_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.4.0"; + private static final String SINGLE_DIC_QUERY_RESULT_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.5.0"; private static final String CODE_SYSTEM_FEASIBILITY = "http://medizininformatik-initiative.de/fhir/CodeSystem/feasibility"; private static final String CODE_SYSTEM_FEASIBILITY_VALUE_MEASURE_REPORT_REF = "measure-report-reference"; private static final String CODE_SYSTEM_BPMN_MESSAGE = "http://highmed.org/fhir/CodeSystem/bpmn-message"; diff --git a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManagerTest.java b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManagerTest.java index 6a089f05..165956be 100644 --- a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManagerTest.java +++ b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryManagerTest.java @@ -145,7 +145,7 @@ public void testPublishQuery() throws UnsupportedMediaTypeException, QueryNotFou assertEquals(businessKey, queryId); assertNotNull(library.getName()); - assertEquals("http://medizininformatik-initiative.de/bpe/Process/feasibilityRequest/0.4.0", task.getInstantiatesUri()); + assertEquals("http://medizininformatik-initiative.de/bpe/Process/feasibilityRequest/0.5.0", task.getInstantiatesUri()); assertEquals(1, task.getMeta().getProfile().stream().filter(p -> p.getValueAsString() .equals("http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-request")) .count()); diff --git a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultCollectorIT.java b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultCollectorIT.java index 769da27b..ddb1e42a 100644 --- a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultCollectorIT.java +++ b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultCollectorIT.java @@ -31,7 +31,7 @@ @SuppressWarnings("NewClassNamingConvention") public class DSFQueryResultCollectorIT { - private static final String SINGLE_DIC_RESULT_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.4.0"; + private static final String SINGLE_DIC_RESULT_PROFILE = "http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.5.0"; @Mock private DSFBrokerClient brokerClient; @@ -60,7 +60,7 @@ private Task createTestTask(String brokerQueryId, String siteId, String measureR .setStatus(COMPLETED) .setIntent(ORDER) .setAuthoredOn(new Date()) - .setInstantiatesUri("http://highmed.org/bpe/Process/feasibilityRequest/0.4.0"); + .setInstantiatesUri("http://highmed.org/bpe/Process/feasibilityRequest/0.5.0"); task.getRequester() .setType("Organization") diff --git a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandlerTest.java b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandlerTest.java index 0655d9da..a7a0f8ff 100644 --- a/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandlerTest.java +++ b/src/test/java/de/numcodex/feasibility_gui_backend/query/broker/dsf/DSFQueryResultHandlerTest.java @@ -55,7 +55,7 @@ public void testOnResultButReferencedMeasureReportCanNotBeFetched() throws FhirW .setIntent(ORDER) .setRequester(dicOrganizationRef) .setRestriction(new TaskRestrictionComponent().addRecipient(zarsOrganizationRef)); - task.getMeta().addProfile("http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.4.0"); + task.getMeta().addProfile("http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.5.0"); task.addInput() .setType(new CodeableConcept() @@ -88,7 +88,7 @@ public void testOnResult() throws FhirWebClientProvisionException { .setIntent(ORDER) .setRequester(dicOrganizationRef) .setRestriction(new TaskRestrictionComponent().addRecipient(zarsOrganizationRef)); - task.getMeta().addProfile("http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.4.0"); + task.getMeta().addProfile("http://medizininformatik-initiative.de/fhir/StructureDefinition/feasibility-task-single-dic-result|0.5.0"); task.addInput() .setType(new CodeableConcept() From 94ab4be2a6c6b4c74d0f12d2989c64d96baa2dad Mon Sep 17 00:00:00 2001 From: DiCanio Date: Mon, 24 Oct 2022 13:13:06 +0200 Subject: [PATCH 14/14] Prepare Release of v2.1.0 --- Dockerfile | 12 ++++++------ pom.xml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index bc3454fb..f3f9720b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /opt/codex-feasibility-backend COPY ./target/*.jar ./feasibility-gui-backend.jar COPY ontology ontology -ARG VERSION=0.0.0 +ARG VERSION=2.1.0 ENV APP_VERSION=${VERSION} ENV FEASIBILITY_DATABASE_HOST="feasibility-network" ENV FEASIBILITY_DATABASE_PORT=5432 @@ -19,12 +19,12 @@ ENTRYPOINT ["java","-jar","feasibility-gui-backend.jar"] ARG GIT_REF="" ARG BUILD_TIME="" -LABEL maintainer="num-codex" \ +LABEL maintainer="medizininformatik-initiative" \ org.opencontainers.image.created=${BUILD_TIME} \ - org.opencontainers.image.authors="num-codex" \ - org.opencontainers.image.source="https://github.com/num-codex/codex-feasibility-backend" \ + org.opencontainers.image.authors="medizininformatik-initiative" \ + org.opencontainers.image.source="https://github.com/medizininformatik-initiative/feasibility-backend" \ org.opencontainers.image.version=${VERSION} \ org.opencontainers.image.revision=${GIT_REF} \ - org.opencontainers.image.vendor="num-codex" \ - org.opencontainers.image.title="codex feasibility backend" \ + org.opencontainers.image.vendor="medizininformatik-initiative" \ + org.opencontainers.image.title="feasibility backend" \ org.opencontainers.image.description="Provides backend functions for feasibility UI including query execution" diff --git a/pom.xml b/pom.xml index ab8f59cf..0689a15f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ de.medizininformatik-initiative FeasibilityGuiBackend - 1.0.1 + 2.1.0 FeasibilityGuiBackend Backend of the Feasibility GUI