From 3fe32f5f668b1e8895f8f62c7d036f3fbf20762d Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Thu, 2 Sep 2021 00:08:23 +0200 Subject: [PATCH 1/8] version to 0.5.1-SNAPSHOT --- dsf-bpe/dsf-bpe-process-base/pom.xml | 2 +- dsf-bpe/dsf-bpe-server-jetty/pom.xml | 2 +- dsf-bpe/dsf-bpe-server/pom.xml | 2 +- dsf-bpe/dsf-bpe-webservice-client/pom.xml | 2 +- dsf-bpe/pom.xml | 2 +- dsf-fhir/dsf-fhir-auth/pom.xml | 2 +- dsf-fhir/dsf-fhir-rest-adapter/pom.xml | 2 +- dsf-fhir/dsf-fhir-server-jetty/pom.xml | 2 +- dsf-fhir/dsf-fhir-server/pom.xml | 2 +- dsf-fhir/dsf-fhir-validation/pom.xml | 4 ++-- dsf-fhir/dsf-fhir-webservice-client/pom.xml | 2 +- dsf-fhir/dsf-fhir-websocket-client/pom.xml | 2 +- dsf-fhir/pom.xml | 2 +- dsf-mpi/dsf-mpi-client-pdq/pom.xml | 2 +- dsf-mpi/dsf-mpi-client-stub/pom.xml | 2 +- dsf-mpi/dsf-mpi-client/pom.xml | 2 +- dsf-mpi/pom.xml | 2 +- dsf-openehr/dsf-openehr-client-impl/pom.xml | 2 +- dsf-openehr/dsf-openehr-client-stub/pom.xml | 2 +- dsf-openehr/dsf-openehr-client/pom.xml | 2 +- dsf-openehr/dsf-openehr-model/pom.xml | 2 +- dsf-openehr/pom.xml | 2 +- dsf-pseudonymization/dsf-pseudonymization-base/pom.xml | 2 +- dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml | 2 +- dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml | 2 +- dsf-pseudonymization/pom.xml | 2 +- dsf-tools/dsf-tools-build-info-reader/pom.xml | 2 +- dsf-tools/dsf-tools-bundle-generator/pom.xml | 2 +- dsf-tools/dsf-tools-db-migration/pom.xml | 2 +- dsf-tools/dsf-tools-docker-secrets-reader/pom.xml | 2 +- dsf-tools/dsf-tools-proxy-test/pom.xml | 2 +- dsf-tools/dsf-tools-test-data-generator/pom.xml | 2 +- dsf-tools/pom.xml | 2 +- pom.xml | 2 +- 34 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dsf-bpe/dsf-bpe-process-base/pom.xml b/dsf-bpe/dsf-bpe-process-base/pom.xml index ff52defa6..ad968c43f 100755 --- a/dsf-bpe/dsf-bpe-process-base/pom.xml +++ b/dsf-bpe/dsf-bpe-process-base/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-bpe-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml index 7898496e8..9e49bce19 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-bpe-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index b79e71b03..1753d235b 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-bpe-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-bpe/dsf-bpe-webservice-client/pom.xml b/dsf-bpe/dsf-bpe-webservice-client/pom.xml index 5f23589d4..8c7c5c36a 100755 --- a/dsf-bpe/dsf-bpe-webservice-client/pom.xml +++ b/dsf-bpe/dsf-bpe-webservice-client/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-bpe-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml index 081cf6033..2df50283f 100755 --- a/dsf-bpe/pom.xml +++ b/dsf-bpe/pom.xml @@ -8,7 +8,7 @@ org.highmed.dsf dsf-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml index 494592270..78e32122d 100644 --- a/dsf-fhir/dsf-fhir-auth/pom.xml +++ b/dsf-fhir/dsf-fhir-auth/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml index 940356618..a9af8bde1 100755 --- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml +++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml index 9bfa13782..b8ca104be 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml index a22c2cbbc..3bdf80ecb 100755 --- a/dsf-fhir/dsf-fhir-server/pom.xml +++ b/dsf-fhir/dsf-fhir-server/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml index bb05d88c3..8d8a107f7 100644 --- a/dsf-fhir/dsf-fhir-validation/pom.xml +++ b/dsf-fhir/dsf-fhir-validation/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.0 + 0.5.1-SNAPSHOT @@ -93,7 +93,7 @@ - diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml index 5dea20b08..98923b6ff 100755 --- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml +++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml index f4a015ae0..e7fd4c78e 100755 --- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml +++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml index e9512cb67..e5f0ca467 100755 --- a/dsf-fhir/pom.xml +++ b/dsf-fhir/pom.xml @@ -8,7 +8,7 @@ org.highmed.dsf dsf-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-mpi/dsf-mpi-client-pdq/pom.xml b/dsf-mpi/dsf-mpi-client-pdq/pom.xml index 7705a6b0a..533153e2b 100644 --- a/dsf-mpi/dsf-mpi-client-pdq/pom.xml +++ b/dsf-mpi/dsf-mpi-client-pdq/pom.xml @@ -9,7 +9,7 @@ dsf-mpi-pom org.highmed.dsf - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-mpi/dsf-mpi-client-stub/pom.xml b/dsf-mpi/dsf-mpi-client-stub/pom.xml index 3a81ef433..0bba382a3 100644 --- a/dsf-mpi/dsf-mpi-client-stub/pom.xml +++ b/dsf-mpi/dsf-mpi-client-stub/pom.xml @@ -9,7 +9,7 @@ dsf-mpi-pom org.highmed.dsf - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-mpi/dsf-mpi-client/pom.xml b/dsf-mpi/dsf-mpi-client/pom.xml index b8bdd9cfd..d84720563 100644 --- a/dsf-mpi/dsf-mpi-client/pom.xml +++ b/dsf-mpi/dsf-mpi-client/pom.xml @@ -9,7 +9,7 @@ dsf-mpi-pom org.highmed.dsf - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-mpi/pom.xml b/dsf-mpi/pom.xml index 7fdafb3cf..cc360ab14 100644 --- a/dsf-mpi/pom.xml +++ b/dsf-mpi/pom.xml @@ -10,7 +10,7 @@ dsf-pom org.highmed.dsf - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-openehr/dsf-openehr-client-impl/pom.xml b/dsf-openehr/dsf-openehr-client-impl/pom.xml index f2cd000cd..185c71e13 100644 --- a/dsf-openehr/dsf-openehr-client-impl/pom.xml +++ b/dsf-openehr/dsf-openehr-client-impl/pom.xml @@ -9,7 +9,7 @@ dsf-openehr-pom org.highmed.dsf - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-openehr/dsf-openehr-client-stub/pom.xml b/dsf-openehr/dsf-openehr-client-stub/pom.xml index f0a16543b..f344ac914 100644 --- a/dsf-openehr/dsf-openehr-client-stub/pom.xml +++ b/dsf-openehr/dsf-openehr-client-stub/pom.xml @@ -8,7 +8,7 @@ dsf-openehr-pom org.highmed.dsf - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-openehr/dsf-openehr-client/pom.xml b/dsf-openehr/dsf-openehr-client/pom.xml index 16f4c838a..b34ad13bc 100644 --- a/dsf-openehr/dsf-openehr-client/pom.xml +++ b/dsf-openehr/dsf-openehr-client/pom.xml @@ -8,7 +8,7 @@ dsf-openehr-pom org.highmed.dsf - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-openehr/dsf-openehr-model/pom.xml b/dsf-openehr/dsf-openehr-model/pom.xml index 25a9b5a8f..357386906 100644 --- a/dsf-openehr/dsf-openehr-model/pom.xml +++ b/dsf-openehr/dsf-openehr-model/pom.xml @@ -8,7 +8,7 @@ dsf-openehr-pom org.highmed.dsf - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-openehr/pom.xml b/dsf-openehr/pom.xml index a27889be7..1d6ead8b2 100755 --- a/dsf-openehr/pom.xml +++ b/dsf-openehr/pom.xml @@ -10,7 +10,7 @@ dsf-pom org.highmed.dsf - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml index c54be80f1..2a9dc6a45 100644 --- a/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml +++ b/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-pseudonymization-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml index 871ece75f..5c57d9a71 100644 --- a/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml +++ b/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-pseudonymization-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml index 17d2f987e..104a1c86b 100644 --- a/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml +++ b/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-pseudonymization-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-pseudonymization/pom.xml b/dsf-pseudonymization/pom.xml index 7d8122d91..c930d8d25 100644 --- a/dsf-pseudonymization/pom.xml +++ b/dsf-pseudonymization/pom.xml @@ -8,7 +8,7 @@ org.highmed.dsf dsf-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-tools/dsf-tools-build-info-reader/pom.xml b/dsf-tools/dsf-tools-build-info-reader/pom.xml index 19ca7d0d9..c0829992d 100644 --- a/dsf-tools/dsf-tools-build-info-reader/pom.xml +++ b/dsf-tools/dsf-tools-build-info-reader/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-tools/dsf-tools-bundle-generator/pom.xml b/dsf-tools/dsf-tools-bundle-generator/pom.xml index 415b7dd62..976a084a7 100755 --- a/dsf-tools/dsf-tools-bundle-generator/pom.xml +++ b/dsf-tools/dsf-tools-bundle-generator/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-tools/dsf-tools-db-migration/pom.xml b/dsf-tools/dsf-tools-db-migration/pom.xml index 4bcd086f6..bca55efff 100755 --- a/dsf-tools/dsf-tools-db-migration/pom.xml +++ b/dsf-tools/dsf-tools-db-migration/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml index e20f01dbf..0d303c2a1 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml +++ b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml index 8a26b8b2b..e45163de0 100755 --- a/dsf-tools/dsf-tools-proxy-test/pom.xml +++ b/dsf-tools/dsf-tools-proxy-test/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-tools/dsf-tools-test-data-generator/pom.xml b/dsf-tools/dsf-tools-test-data-generator/pom.xml index 35d4d3aba..7a74d6bc0 100755 --- a/dsf-tools/dsf-tools-test-data-generator/pom.xml +++ b/dsf-tools/dsf-tools-test-data-generator/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/dsf-tools/pom.xml b/dsf-tools/pom.xml index b3dfdf1a6..0b6b2ccdc 100755 --- a/dsf-tools/pom.xml +++ b/dsf-tools/pom.xml @@ -8,7 +8,7 @@ org.highmed.dsf dsf-pom - 0.5.0 + 0.5.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 21732fe9d..f9bf86518 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.highmed.dsf dsf-pom - 0.5.0 + 0.5.1-SNAPSHOT pom From 98a7777ca8e36741ffcf121f6fd1233a946d1e3c Mon Sep 17 00:00:00 2001 From: Reto Wettstein Date: Thu, 2 Sep 2021 00:41:20 +0200 Subject: [PATCH 2/8] adds test and fixes #256 --- .../jdbc/OrganizationAffiliationDaoJdbc.java | 2 +- .../dao/OrganizationAffiliationDaoTest.java | 89 ++++++++++++++----- 2 files changed, 66 insertions(+), 25 deletions(-) diff --git a/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/dao/jdbc/OrganizationAffiliationDaoJdbc.java b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/dao/jdbc/OrganizationAffiliationDaoJdbc.java index 1d2162a12..607dab3d5 100644 --- a/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/dao/jdbc/OrganizationAffiliationDaoJdbc.java +++ b/dsf-fhir/dsf-fhir-server/src/main/java/org/highmed/dsf/fhir/dao/jdbc/OrganizationAffiliationDaoJdbc.java @@ -72,7 +72,7 @@ public List readActiveNotDeletedByMemberOrganizationIde { List affiliations = new ArrayList<>(); - if (result.next()) + while (result.next()) { OrganizationAffiliation oA = getResource(result, 1); String organizationIdentifier = result.getString(2); diff --git a/dsf-fhir/dsf-fhir-server/src/test/java/org/highmed/dsf/fhir/dao/OrganizationAffiliationDaoTest.java b/dsf-fhir/dsf-fhir-server/src/test/java/org/highmed/dsf/fhir/dao/OrganizationAffiliationDaoTest.java index a2d6fea0d..b1e15cba6 100644 --- a/dsf-fhir/dsf-fhir-server/src/test/java/org/highmed/dsf/fhir/dao/OrganizationAffiliationDaoTest.java +++ b/dsf-fhir/dsf-fhir-server/src/test/java/org/highmed/dsf/fhir/dao/OrganizationAffiliationDaoTest.java @@ -1,10 +1,12 @@ package org.highmed.dsf.fhir.dao; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.sql.Connection; +import java.sql.SQLException; import java.util.List; import java.util.UUID; @@ -70,38 +72,21 @@ public void testReadActiveNotDeletedByMemberOrganizationIdentifier() throws Exce try (Connection connection = getDao().newReadWriteTransaction()) { - Organization memberOrg = new Organization(); - memberOrg.setActive(true); - memberOrg.addIdentifier().setSystem(identifierSystem).setValue(identifierValue); + Organization memberOrg = createAndStoreOrganizationInDb(identifierValue, connection); + Organization parentOrg = createAndStoreOrganizationInDb(parentIdentifier, connection); - Organization parentOrg = new Organization(); - parentOrg.setActive(true); - parentOrg.addIdentifier().setSystem(identifierSystem).setValue(parentIdentifier); - - Organization createdMemberOrg = organizationDao.createWithTransactionAndId(connection, memberOrg, - UUID.randomUUID()); - - Organization createdParentOrg = organizationDao.createWithTransactionAndId(connection, parentOrg, - UUID.randomUUID()); - - OrganizationAffiliation affiliation = new OrganizationAffiliation(); - affiliation.setActive(true); - affiliation.getParticipatingOrganization() - .setReference("Organization/" + createdMemberOrg.getIdElement().getIdPart()); - affiliation.getOrganization().setReference("Organization/" + createdParentOrg.getIdElement().getIdPart()); - - OrganizationAffiliation createdAffiliation = getDao().createWithTransactionAndId(connection, affiliation, - UUID.randomUUID()); + OrganizationAffiliation affiliation = createAndStoreOrganizationAffiliationInDb(parentOrg, memberOrg, + connection); List affiliations = getDao() .readActiveNotDeletedByMemberOrganizationIdentifierIncludingOrganizationIdentifiersWithTransaction( connection, identifierValue); assertNotNull(affiliations); assertEquals(1, affiliations.size()); - assertEquals(createdAffiliation.getIdElement().getIdPart(), affiliations.get(0).getIdElement().getIdPart()); + assertEquals(affiliation.getIdElement().getIdPart(), affiliations.get(0).getIdElement().getIdPart()); assertTrue(affiliations.get(0).hasParticipatingOrganization()); assertTrue(affiliations.get(0).getParticipatingOrganization().hasReference()); - assertEquals("Organization/" + createdMemberOrg.getIdElement().getIdPart(), + assertEquals("Organization/" + memberOrg.getIdElement().getIdPart(), affiliations.get(0).getParticipatingOrganization().getReference()); assertTrue(affiliations.get(0).getParticipatingOrganization().hasIdentifier()); assertTrue(affiliations.get(0).getParticipatingOrganization().getIdentifier().hasSystem()); @@ -112,7 +97,7 @@ public void testReadActiveNotDeletedByMemberOrganizationIdentifier() throws Exce affiliations.get(0).getParticipatingOrganization().getIdentifier().getValue()); assertTrue(affiliations.get(0).hasOrganization()); assertTrue(affiliations.get(0).getOrganization().hasReference()); - assertEquals("Organization/" + createdParentOrg.getIdElement().getIdPart(), + assertEquals("Organization/" + parentOrg.getIdElement().getIdPart(), affiliations.get(0).getOrganization().getReference()); assertTrue(affiliations.get(0).getOrganization().hasIdentifier()); assertTrue(affiliations.get(0).getOrganization().getIdentifier().hasSystem()); @@ -122,6 +107,62 @@ public void testReadActiveNotDeletedByMemberOrganizationIdentifier() throws Exce } } + @Test + public void testSizeOfReadActiveNotDeletedByMemberOrganizationIdentifier() throws Exception + { + final String parentFooIdentifier = "parentFoo.org"; + final String parentBarIdentifier = "parentBar.org"; + + try (Connection connection = getDao().newReadWriteTransaction()) + { + Organization memberOrg = createAndStoreOrganizationInDb(identifierValue, connection); + Organization parentFooOrg = createAndStoreOrganizationInDb(parentFooIdentifier, connection); + Organization parentBarOrg = createAndStoreOrganizationInDb(parentBarIdentifier, connection); + + createAndStoreOrganizationAffiliationInDb(parentFooOrg, memberOrg, connection); + createAndStoreOrganizationAffiliationInDb(parentBarOrg, memberOrg, connection); + + List affiliations = getDao() + .readActiveNotDeletedByMemberOrganizationIdentifierIncludingOrganizationIdentifiersWithTransaction( + connection, identifierValue); + assertNotNull(affiliations); + + assertEquals(2, affiliations.size()); + assertEquals(identifierValue, + affiliations.get(0).getParticipatingOrganization().getIdentifier().getValue()); + assertEquals(identifierValue, + affiliations.get(1).getParticipatingOrganization().getIdentifier().getValue()); + assertNotEquals(affiliations.get(0).getOrganization().getIdentifier().getValue(), + affiliations.get(1).getOrganization().getIdentifier().getValue()); + assertTrue(List.of(parentFooIdentifier, parentBarIdentifier) + .contains(affiliations.get(0).getOrganization().getIdentifier().getValue())); + assertTrue(List.of(parentFooIdentifier, parentBarIdentifier) + .contains(affiliations.get(1).getOrganization().getIdentifier().getValue())); + } + } + + private Organization createAndStoreOrganizationInDb(String identifierValue, Connection connection) + throws SQLException + { + Organization memberOrg = new Organization(); + memberOrg.setActive(true); + memberOrg.addIdentifier().setSystem(identifierSystem).setValue(identifierValue); + + return organizationDao.createWithTransactionAndId(connection, memberOrg, UUID.randomUUID()); + } + + private OrganizationAffiliation createAndStoreOrganizationAffiliationInDb(Organization parent, Organization member, + Connection connection) throws SQLException + { + OrganizationAffiliation organizationAffiliation = new OrganizationAffiliation(); + organizationAffiliation.setActive(true); + organizationAffiliation.getParticipatingOrganization() + .setReference("Organization/" + member.getIdElement().getIdPart()); + organizationAffiliation.getOrganization().setReference("Organization/" + parent.getIdElement().getIdPart()); + + return getDao().createWithTransactionAndId(connection, organizationAffiliation, UUID.randomUUID()); + } + @Override @Test public void testReadAccessTriggerAll() throws Exception From e1c1010a8c00dbf40dfa1d47b8f876a19ba56c3e Mon Sep 17 00:00:00 2001 From: Reto Wettstein Date: Thu, 2 Sep 2021 16:30:22 +0200 Subject: [PATCH 3/8] only use the first line of a secrets file, trim whitespaces, ignore CR and LF characters by using readAllLines --- .../secrets/DockerSecretsPropertySourceFactory.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/src/main/java/org/highmed/dsf/tools/docker/secrets/DockerSecretsPropertySourceFactory.java b/dsf-tools/dsf-tools-docker-secrets-reader/src/main/java/org/highmed/dsf/tools/docker/secrets/DockerSecretsPropertySourceFactory.java index 27d62d508..c6091055f 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/src/main/java/org/highmed/dsf/tools/docker/secrets/DockerSecretsPropertySourceFactory.java +++ b/dsf-tools/dsf-tools-docker-secrets-reader/src/main/java/org/highmed/dsf/tools/docker/secrets/DockerSecretsPropertySourceFactory.java @@ -83,7 +83,18 @@ private String readSecretsFile(String key, String secretsFile) try { - return new String(Files.readAllBytes(secretsFilePath), StandardCharsets.UTF_8); + List secretLines = Files.readAllLines(secretsFilePath, StandardCharsets.UTF_8); + + if (secretLines.isEmpty()) + { + logger.warn("secrets file for property {} is empty", key); + return null; + } + + if (secretLines.size() > 1) + logger.warn("secrets file for property {} contains multiple lines, using only the first line", key); + + return secretLines.get(0).trim(); } catch (IOException e) { From 2786de502853af3f67d4fa3a6d6f735f47387c65 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Thu, 2 Sep 2021 22:49:24 +0200 Subject: [PATCH 4/8] removes latestVersion() from the process search query config, fixes #264 The query config methods .versionTag(processVersion) and .latestVersion() should not be used together. A query configured this way would only give a result if the given processVersion is the latest deployed version of the process. --- .../src/main/java/org/highmed/dsf/fhir/task/TaskHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsf-bpe/dsf-bpe-server/src/main/java/org/highmed/dsf/fhir/task/TaskHandler.java b/dsf-bpe/dsf-bpe-server/src/main/java/org/highmed/dsf/fhir/task/TaskHandler.java index aa8a75324..20aadfc5c 100755 --- a/dsf-bpe/dsf-bpe-server/src/main/java/org/highmed/dsf/fhir/task/TaskHandler.java +++ b/dsf-bpe/dsf-bpe-server/src/main/java/org/highmed/dsf/fhir/task/TaskHandler.java @@ -190,7 +190,7 @@ private ProcessDefinition getProcessDefinition(String processDomain, String proc if (processVersion != null && !processVersion.isBlank()) return repositoryService.createProcessDefinitionQuery() .processDefinitionKey(processDomain + "_" + processDefinitionKey).versionTag(processVersion) - .latestVersion().singleResult(); + .singleResult(); else return repositoryService.createProcessDefinitionQuery() .processDefinitionKey(processDomain + "_" + processDefinitionKey).latestVersion().singleResult(); From d8e36c5cfa16d02beab7639ee98704c271885af1 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Thu, 2 Sep 2021 23:06:13 +0200 Subject: [PATCH 5/8] removed trim() to allow passwords with leading or trailing whitespace PostgreSQL does not remove leading or trailing whitespace when reading the password from a file or environment variable, so we shoudn't either. --- .../docker/secrets/DockerSecretsPropertySourceFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/src/main/java/org/highmed/dsf/tools/docker/secrets/DockerSecretsPropertySourceFactory.java b/dsf-tools/dsf-tools-docker-secrets-reader/src/main/java/org/highmed/dsf/tools/docker/secrets/DockerSecretsPropertySourceFactory.java index c6091055f..3ba18b1a6 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/src/main/java/org/highmed/dsf/tools/docker/secrets/DockerSecretsPropertySourceFactory.java +++ b/dsf-tools/dsf-tools-docker-secrets-reader/src/main/java/org/highmed/dsf/tools/docker/secrets/DockerSecretsPropertySourceFactory.java @@ -94,7 +94,7 @@ private String readSecretsFile(String key, String secretsFile) if (secretLines.size() > 1) logger.warn("secrets file for property {} contains multiple lines, using only the first line", key); - return secretLines.get(0).trim(); + return secretLines.get(0); } catch (IOException e) { From d58236c2c6006b01efca5ed03e2fe1879584f838 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Thu, 2 Sep 2021 23:10:17 +0200 Subject: [PATCH 6/8] adds missing plural 's' in debug log message --- .../org/highmed/dsf/fhir/resources/ResourceProviderImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsf-bpe/dsf-bpe-process-base/src/main/java/org/highmed/dsf/fhir/resources/ResourceProviderImpl.java b/dsf-bpe/dsf-bpe-process-base/src/main/java/org/highmed/dsf/fhir/resources/ResourceProviderImpl.java index 6afca0f74..6a07f4f4e 100644 --- a/dsf-bpe/dsf-bpe-process-base/src/main/java/org/highmed/dsf/fhir/resources/ResourceProviderImpl.java +++ b/dsf-bpe/dsf-bpe-process-base/src/main/java/org/highmed/dsf/fhir/resources/ResourceProviderImpl.java @@ -279,7 +279,7 @@ private static T parseResourceAndSetVersion(String Supplier parserSupplier, ClassLoader classLoader, PropertyResolver resolver, String fileName, Class type) { - logger.debug("Reading {} from {} and replacing all occurrence of {} with {}", type.getSimpleName(), fileName, + logger.debug("Reading {} from {} and replacing all occurrences of {} with {}", type.getSimpleName(), fileName, VERSION_PATTERN_STRING, processPluginVersion); try (InputStream in = classLoader.getResourceAsStream(fileName)) From 228ccb2d37b59175fab9fa3bc1b15edfa1a993cb Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Fri, 3 Sep 2021 00:04:53 +0200 Subject: [PATCH 7/8] 0.5.1 release --- CITATION.cff | 4 ++-- dsf-bpe/dsf-bpe-process-base/pom.xml | 2 +- dsf-bpe/dsf-bpe-server-jetty/pom.xml | 2 +- dsf-bpe/dsf-bpe-server/pom.xml | 2 +- dsf-bpe/dsf-bpe-webservice-client/pom.xml | 2 +- dsf-bpe/pom.xml | 2 +- dsf-fhir/dsf-fhir-auth/pom.xml | 2 +- dsf-fhir/dsf-fhir-rest-adapter/pom.xml | 2 +- dsf-fhir/dsf-fhir-server-jetty/pom.xml | 2 +- dsf-fhir/dsf-fhir-server/pom.xml | 2 +- dsf-fhir/dsf-fhir-validation/pom.xml | 4 ++-- dsf-fhir/dsf-fhir-webservice-client/pom.xml | 2 +- dsf-fhir/dsf-fhir-websocket-client/pom.xml | 2 +- dsf-fhir/pom.xml | 2 +- dsf-mpi/dsf-mpi-client-pdq/pom.xml | 2 +- dsf-mpi/dsf-mpi-client-stub/pom.xml | 2 +- dsf-mpi/dsf-mpi-client/pom.xml | 2 +- dsf-mpi/pom.xml | 2 +- dsf-openehr/dsf-openehr-client-impl/pom.xml | 2 +- dsf-openehr/dsf-openehr-client-stub/pom.xml | 2 +- dsf-openehr/dsf-openehr-client/pom.xml | 2 +- dsf-openehr/dsf-openehr-model/pom.xml | 2 +- dsf-openehr/pom.xml | 2 +- dsf-pseudonymization/dsf-pseudonymization-base/pom.xml | 2 +- dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml | 2 +- dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml | 2 +- dsf-pseudonymization/pom.xml | 2 +- dsf-tools/dsf-tools-build-info-reader/pom.xml | 2 +- dsf-tools/dsf-tools-bundle-generator/pom.xml | 2 +- dsf-tools/dsf-tools-db-migration/pom.xml | 2 +- dsf-tools/dsf-tools-docker-secrets-reader/pom.xml | 2 +- dsf-tools/dsf-tools-proxy-test/pom.xml | 2 +- dsf-tools/dsf-tools-test-data-generator/pom.xml | 2 +- dsf-tools/pom.xml | 2 +- pom.xml | 2 +- 35 files changed, 37 insertions(+), 37 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index b4fdf24c5..f40b3c7a1 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -6,8 +6,8 @@ authors: - family-names: Wettstein given-names: Reto title: "HiGHmed Data Sharing Framework (HiGHmed DSF)" -version: 0.5.0 -date-released: 2021-08-24 +version: 0.5.1 +date-released: 2021-09-03 url: https://github.com/highmed/highmed-dsf/wiki repository-code: https://github.com/highmed/highmed-dsf repository-artifact: https://github.com/highmed/highmed-dsf/releases diff --git a/dsf-bpe/dsf-bpe-process-base/pom.xml b/dsf-bpe/dsf-bpe-process-base/pom.xml index ad968c43f..72ff5219b 100755 --- a/dsf-bpe/dsf-bpe-process-base/pom.xml +++ b/dsf-bpe/dsf-bpe-process-base/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-bpe-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-bpe/dsf-bpe-server-jetty/pom.xml b/dsf-bpe/dsf-bpe-server-jetty/pom.xml index 9e49bce19..8809f4dcc 100755 --- a/dsf-bpe/dsf-bpe-server-jetty/pom.xml +++ b/dsf-bpe/dsf-bpe-server-jetty/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-bpe-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-bpe/dsf-bpe-server/pom.xml b/dsf-bpe/dsf-bpe-server/pom.xml index 1753d235b..677a3983f 100755 --- a/dsf-bpe/dsf-bpe-server/pom.xml +++ b/dsf-bpe/dsf-bpe-server/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-bpe-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-bpe/dsf-bpe-webservice-client/pom.xml b/dsf-bpe/dsf-bpe-webservice-client/pom.xml index 8c7c5c36a..d14208454 100755 --- a/dsf-bpe/dsf-bpe-webservice-client/pom.xml +++ b/dsf-bpe/dsf-bpe-webservice-client/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-bpe-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-bpe/pom.xml b/dsf-bpe/pom.xml index 2df50283f..4800abaea 100755 --- a/dsf-bpe/pom.xml +++ b/dsf-bpe/pom.xml @@ -8,7 +8,7 @@ org.highmed.dsf dsf-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-fhir/dsf-fhir-auth/pom.xml b/dsf-fhir/dsf-fhir-auth/pom.xml index 78e32122d..145790c3a 100644 --- a/dsf-fhir/dsf-fhir-auth/pom.xml +++ b/dsf-fhir/dsf-fhir-auth/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml index a9af8bde1..021aa4f5f 100755 --- a/dsf-fhir/dsf-fhir-rest-adapter/pom.xml +++ b/dsf-fhir/dsf-fhir-rest-adapter/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-fhir/dsf-fhir-server-jetty/pom.xml b/dsf-fhir/dsf-fhir-server-jetty/pom.xml index b8ca104be..ccd2a8167 100755 --- a/dsf-fhir/dsf-fhir-server-jetty/pom.xml +++ b/dsf-fhir/dsf-fhir-server-jetty/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-fhir/dsf-fhir-server/pom.xml b/dsf-fhir/dsf-fhir-server/pom.xml index 3bdf80ecb..73952a01e 100755 --- a/dsf-fhir/dsf-fhir-server/pom.xml +++ b/dsf-fhir/dsf-fhir-server/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-fhir/dsf-fhir-validation/pom.xml b/dsf-fhir/dsf-fhir-validation/pom.xml index 8d8a107f7..c8a26eec7 100644 --- a/dsf-fhir/dsf-fhir-validation/pom.xml +++ b/dsf-fhir/dsf-fhir-validation/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.1-SNAPSHOT + 0.5.1 @@ -93,7 +93,7 @@ - diff --git a/dsf-fhir/dsf-fhir-webservice-client/pom.xml b/dsf-fhir/dsf-fhir-webservice-client/pom.xml index 98923b6ff..68e38e721 100755 --- a/dsf-fhir/dsf-fhir-webservice-client/pom.xml +++ b/dsf-fhir/dsf-fhir-webservice-client/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-fhir/dsf-fhir-websocket-client/pom.xml b/dsf-fhir/dsf-fhir-websocket-client/pom.xml index e7fd4c78e..5bf7646dd 100755 --- a/dsf-fhir/dsf-fhir-websocket-client/pom.xml +++ b/dsf-fhir/dsf-fhir-websocket-client/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-fhir-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-fhir/pom.xml b/dsf-fhir/pom.xml index e5f0ca467..fc09b44b2 100755 --- a/dsf-fhir/pom.xml +++ b/dsf-fhir/pom.xml @@ -8,7 +8,7 @@ org.highmed.dsf dsf-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-mpi/dsf-mpi-client-pdq/pom.xml b/dsf-mpi/dsf-mpi-client-pdq/pom.xml index 533153e2b..6887c31d4 100644 --- a/dsf-mpi/dsf-mpi-client-pdq/pom.xml +++ b/dsf-mpi/dsf-mpi-client-pdq/pom.xml @@ -9,7 +9,7 @@ dsf-mpi-pom org.highmed.dsf - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-mpi/dsf-mpi-client-stub/pom.xml b/dsf-mpi/dsf-mpi-client-stub/pom.xml index 0bba382a3..15ed0eb4a 100644 --- a/dsf-mpi/dsf-mpi-client-stub/pom.xml +++ b/dsf-mpi/dsf-mpi-client-stub/pom.xml @@ -9,7 +9,7 @@ dsf-mpi-pom org.highmed.dsf - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-mpi/dsf-mpi-client/pom.xml b/dsf-mpi/dsf-mpi-client/pom.xml index d84720563..3c899b0e7 100644 --- a/dsf-mpi/dsf-mpi-client/pom.xml +++ b/dsf-mpi/dsf-mpi-client/pom.xml @@ -9,7 +9,7 @@ dsf-mpi-pom org.highmed.dsf - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-mpi/pom.xml b/dsf-mpi/pom.xml index cc360ab14..2ab265daa 100644 --- a/dsf-mpi/pom.xml +++ b/dsf-mpi/pom.xml @@ -10,7 +10,7 @@ dsf-pom org.highmed.dsf - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-openehr/dsf-openehr-client-impl/pom.xml b/dsf-openehr/dsf-openehr-client-impl/pom.xml index 185c71e13..5fd8065d7 100644 --- a/dsf-openehr/dsf-openehr-client-impl/pom.xml +++ b/dsf-openehr/dsf-openehr-client-impl/pom.xml @@ -9,7 +9,7 @@ dsf-openehr-pom org.highmed.dsf - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-openehr/dsf-openehr-client-stub/pom.xml b/dsf-openehr/dsf-openehr-client-stub/pom.xml index f344ac914..26a9ad09a 100644 --- a/dsf-openehr/dsf-openehr-client-stub/pom.xml +++ b/dsf-openehr/dsf-openehr-client-stub/pom.xml @@ -8,7 +8,7 @@ dsf-openehr-pom org.highmed.dsf - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-openehr/dsf-openehr-client/pom.xml b/dsf-openehr/dsf-openehr-client/pom.xml index b34ad13bc..27e432626 100644 --- a/dsf-openehr/dsf-openehr-client/pom.xml +++ b/dsf-openehr/dsf-openehr-client/pom.xml @@ -8,7 +8,7 @@ dsf-openehr-pom org.highmed.dsf - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-openehr/dsf-openehr-model/pom.xml b/dsf-openehr/dsf-openehr-model/pom.xml index 357386906..5e88785e5 100644 --- a/dsf-openehr/dsf-openehr-model/pom.xml +++ b/dsf-openehr/dsf-openehr-model/pom.xml @@ -8,7 +8,7 @@ dsf-openehr-pom org.highmed.dsf - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-openehr/pom.xml b/dsf-openehr/pom.xml index 1d6ead8b2..0d1f16c0c 100755 --- a/dsf-openehr/pom.xml +++ b/dsf-openehr/pom.xml @@ -10,7 +10,7 @@ dsf-pom org.highmed.dsf - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml index 2a9dc6a45..4f60457bb 100644 --- a/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml +++ b/dsf-pseudonymization/dsf-pseudonymization-base/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-pseudonymization-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml index 5c57d9a71..0d305dcaa 100644 --- a/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml +++ b/dsf-pseudonymization/dsf-pseudonymization-medic/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-pseudonymization-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml b/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml index 104a1c86b..45259aa12 100644 --- a/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml +++ b/dsf-pseudonymization/dsf-pseudonymization-ttp/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-pseudonymization-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-pseudonymization/pom.xml b/dsf-pseudonymization/pom.xml index c930d8d25..acd30da4d 100644 --- a/dsf-pseudonymization/pom.xml +++ b/dsf-pseudonymization/pom.xml @@ -8,7 +8,7 @@ org.highmed.dsf dsf-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-tools/dsf-tools-build-info-reader/pom.xml b/dsf-tools/dsf-tools-build-info-reader/pom.xml index c0829992d..fc54fcbdb 100644 --- a/dsf-tools/dsf-tools-build-info-reader/pom.xml +++ b/dsf-tools/dsf-tools-build-info-reader/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-tools/dsf-tools-bundle-generator/pom.xml b/dsf-tools/dsf-tools-bundle-generator/pom.xml index 976a084a7..f2e5959e2 100755 --- a/dsf-tools/dsf-tools-bundle-generator/pom.xml +++ b/dsf-tools/dsf-tools-bundle-generator/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-tools/dsf-tools-db-migration/pom.xml b/dsf-tools/dsf-tools-db-migration/pom.xml index bca55efff..cccc5354a 100755 --- a/dsf-tools/dsf-tools-db-migration/pom.xml +++ b/dsf-tools/dsf-tools-db-migration/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml index 0d303c2a1..af8be23c0 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml +++ b/dsf-tools/dsf-tools-docker-secrets-reader/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-tools/dsf-tools-proxy-test/pom.xml b/dsf-tools/dsf-tools-proxy-test/pom.xml index e45163de0..e49b9b6f9 100755 --- a/dsf-tools/dsf-tools-proxy-test/pom.xml +++ b/dsf-tools/dsf-tools-proxy-test/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-tools/dsf-tools-test-data-generator/pom.xml b/dsf-tools/dsf-tools-test-data-generator/pom.xml index 7a74d6bc0..5a794cd77 100755 --- a/dsf-tools/dsf-tools-test-data-generator/pom.xml +++ b/dsf-tools/dsf-tools-test-data-generator/pom.xml @@ -7,7 +7,7 @@ org.highmed.dsf dsf-tools-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/dsf-tools/pom.xml b/dsf-tools/pom.xml index 0b6b2ccdc..4d08e0606 100755 --- a/dsf-tools/pom.xml +++ b/dsf-tools/pom.xml @@ -8,7 +8,7 @@ org.highmed.dsf dsf-pom - 0.5.1-SNAPSHOT + 0.5.1 diff --git a/pom.xml b/pom.xml index f9bf86518..a277a35f2 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.highmed.dsf dsf-pom - 0.5.1-SNAPSHOT + 0.5.1 pom From ad2b00be677e655e3a112badeeb3b857102431f3 Mon Sep 17 00:00:00 2001 From: Hauke Hund Date: Fri, 3 Sep 2021 00:16:02 +0200 Subject: [PATCH 8/8] Changed first letter in warning log messages to uppercase. --- .../docker/secrets/DockerSecretsPropertySourceFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dsf-tools/dsf-tools-docker-secrets-reader/src/main/java/org/highmed/dsf/tools/docker/secrets/DockerSecretsPropertySourceFactory.java b/dsf-tools/dsf-tools-docker-secrets-reader/src/main/java/org/highmed/dsf/tools/docker/secrets/DockerSecretsPropertySourceFactory.java index 3ba18b1a6..92d53d5bb 100644 --- a/dsf-tools/dsf-tools-docker-secrets-reader/src/main/java/org/highmed/dsf/tools/docker/secrets/DockerSecretsPropertySourceFactory.java +++ b/dsf-tools/dsf-tools-docker-secrets-reader/src/main/java/org/highmed/dsf/tools/docker/secrets/DockerSecretsPropertySourceFactory.java @@ -87,12 +87,12 @@ private String readSecretsFile(String key, String secretsFile) if (secretLines.isEmpty()) { - logger.warn("secrets file for property {} is empty", key); + logger.warn("Secrets file for property {} is empty", key); return null; } if (secretLines.size() > 1) - logger.warn("secrets file for property {} contains multiple lines, using only the first line", key); + logger.warn("Secrets file for property {} contains multiple lines, using only the first line", key); return secretLines.get(0); }