From c8c4772f2a25680271e951a30a689893a675cd93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=A9=20Strysewske?= Date: Mon, 5 Dec 2022 15:42:58 +0100 Subject: [PATCH 1/3] [GITFLOW]updating poms for 1.77.2 branch with snapshot versions --- sormas-api/pom.xml | 2 +- sormas-app/pom.xml | 2 +- sormas-backend/pom.xml | 2 +- sormas-base/dependencies/serverlibs.pom | 2 +- sormas-base/pom.xml | 2 +- sormas-cargoserver/pom.xml | 2 +- sormas-ear/pom.xml | 2 +- sormas-keycloak-service-provider/pom.xml | 2 +- sormas-rest/pom.xml | 2 +- sormas-ui/pom.xml | 2 +- sormas-widgetset/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml index e130e44ed0a..89448715730 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 1.77.1 + 1.77.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index 25c593ebbb4..ee2bddc34d4 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.1 + 1.77.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index e05b8b80828..14a2c1e818d 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.1 + 1.77.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index cc02ecf47d5..5f625ce54ee 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 1.77.1 + 1.77.2-SNAPSHOT ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index 4df01fde8d2..a8a268d9318 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 1.77.1 + 1.77.2-SNAPSHOT 1.8 diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml index 7d8bfab8257..6a5c4b0eb97 100644 --- a/sormas-cargoserver/pom.xml +++ b/sormas-cargoserver/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.77.1 + 1.77.2-SNAPSHOT ../sormas-base diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index f5f55c298cb..dcaa7936bf8 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.77.1 + 1.77.2-SNAPSHOT ../sormas-base diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml index 89648c13387..45be04728d1 100644 --- a/sormas-keycloak-service-provider/pom.xml +++ b/sormas-keycloak-service-provider/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.1 + 1.77.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index b9267050ec2..e91f15b96cc 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.77.1 + 1.77.2-SNAPSHOT ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index 0165ee3d92f..8b958c43073 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.1 + 1.77.2-SNAPSHOT ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index 9cc00885d3c..6e3a8bffa33 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.1 + 1.77.2-SNAPSHOT ../sormas-base 4.0.0 From 6a356f62a46d28dd7d313f2234d374b643e77873 Mon Sep 17 00:00:00 2001 From: Carina Paul <47103965+carina29@users.noreply.github.com> Date: Tue, 6 Dec 2022 10:48:58 +0200 Subject: [PATCH 2/3] #11098 - fix NPE exception which blocks Survnet import (#11101) * #11098 - fix NPE exception which blocks Survnet import --- .../main/java/de/symeda/sormas/backend/FacadeHelper.java | 7 +++++++ .../java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java | 7 +++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/FacadeHelper.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/FacadeHelper.java index a1e712ff209..a51d07ee074 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/FacadeHelper.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/FacadeHelper.java @@ -2,6 +2,7 @@ import java.util.Set; +import de.symeda.sormas.api.EntityDto; import de.symeda.sormas.api.i18n.I18nProperties; import de.symeda.sormas.api.i18n.Strings; import de.symeda.sormas.api.user.UserRight; @@ -32,4 +33,10 @@ public static void checkCreateAndEditRights( } } + public static void setUuidIfDtoExists(AbstractDomainObject target, EntityDto dto) { + if (dto != null) { + target.setUuid(dto.getUuid()); + } + } + } diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java index f6d2218d760..21945a42be5 100644 --- a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java +++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java @@ -158,7 +158,6 @@ import de.symeda.sormas.api.infrastructure.facility.FacilityDto; import de.symeda.sormas.api.infrastructure.facility.FacilityHelper; import de.symeda.sormas.api.infrastructure.facility.FacilityType; -import de.symeda.sormas.api.infrastructure.region.RegionDto; import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto; import de.symeda.sormas.api.location.LocationDto; import de.symeda.sormas.api.location.LocationReferenceDto; @@ -2990,9 +2989,9 @@ public Case fillOrBuildEntity(@NotNull CaseDataDto source, Case target, boolean }, checkChangeDate); if (targetWasNull) { - target.getHospitalization().setUuid(source.getHospitalization().getUuid()); - target.getEpiData().setUuid(source.getEpiData().getUuid()); - target.getSymptoms().setUuid(source.getSymptoms().getUuid()); + FacadeHelper.setUuidIfDtoExists(target.getHospitalization(), source.getHospitalization()); + FacadeHelper.setUuidIfDtoExists(target.getEpiData(), source.getEpiData()); + FacadeHelper.setUuidIfDtoExists(target.getSymptoms(), source.getSymptoms()); } target.setDisease(source.getDisease()); From c7308731d4f9f49767c5b1fdabf549336584297d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=A9=20Strysewske?= Date: Tue, 6 Dec 2022 10:06:20 +0100 Subject: [PATCH 3/3] [GITFLOW]updating poms for branch'hotfix-1.77.2' with non-snapshot versions --- sormas-api/pom.xml | 2 +- sormas-app/pom.xml | 2 +- sormas-backend/pom.xml | 2 +- sormas-base/dependencies/serverlibs.pom | 2 +- sormas-base/pom.xml | 2 +- sormas-cargoserver/pom.xml | 2 +- sormas-ear/pom.xml | 2 +- sormas-keycloak-service-provider/pom.xml | 2 +- sormas-rest/pom.xml | 2 +- sormas-ui/pom.xml | 2 +- sormas-widgetset/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sormas-api/pom.xml b/sormas-api/pom.xml index 89448715730..e8fddaa77d3 100644 --- a/sormas-api/pom.xml +++ b/sormas-api/pom.xml @@ -2,7 +2,7 @@ de.symeda.sormas sormas-base - 1.77.2-SNAPSHOT + 1.77.2 ../sormas-base 4.0.0 diff --git a/sormas-app/pom.xml b/sormas-app/pom.xml index ee2bddc34d4..2ccce94b3db 100644 --- a/sormas-app/pom.xml +++ b/sormas-app/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.2-SNAPSHOT + 1.77.2 ../sormas-base 4.0.0 diff --git a/sormas-backend/pom.xml b/sormas-backend/pom.xml index 14a2c1e818d..eea7f02f544 100644 --- a/sormas-backend/pom.xml +++ b/sormas-backend/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.2-SNAPSHOT + 1.77.2 ../sormas-base 4.0.0 diff --git a/sormas-base/dependencies/serverlibs.pom b/sormas-base/dependencies/serverlibs.pom index 5f625ce54ee..ee1480935bc 100644 --- a/sormas-base/dependencies/serverlibs.pom +++ b/sormas-base/dependencies/serverlibs.pom @@ -8,7 +8,7 @@ sormas-base de.symeda.sormas - 1.77.2-SNAPSHOT + 1.77.2 ../ diff --git a/sormas-base/pom.xml b/sormas-base/pom.xml index a8a268d9318..4f5ce7a763e 100644 --- a/sormas-base/pom.xml +++ b/sormas-base/pom.xml @@ -5,7 +5,7 @@ de.symeda.sormas sormas-base pom - 1.77.2-SNAPSHOT + 1.77.2 1.8 diff --git a/sormas-cargoserver/pom.xml b/sormas-cargoserver/pom.xml index 6a5c4b0eb97..cca171a9a20 100644 --- a/sormas-cargoserver/pom.xml +++ b/sormas-cargoserver/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.77.2-SNAPSHOT + 1.77.2 ../sormas-base diff --git a/sormas-ear/pom.xml b/sormas-ear/pom.xml index dcaa7936bf8..e1f44f32644 100644 --- a/sormas-ear/pom.xml +++ b/sormas-ear/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.77.2-SNAPSHOT + 1.77.2 ../sormas-base diff --git a/sormas-keycloak-service-provider/pom.xml b/sormas-keycloak-service-provider/pom.xml index 45be04728d1..b2631031898 100644 --- a/sormas-keycloak-service-provider/pom.xml +++ b/sormas-keycloak-service-provider/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.2-SNAPSHOT + 1.77.2 ../sormas-base 4.0.0 diff --git a/sormas-rest/pom.xml b/sormas-rest/pom.xml index e91f15b96cc..b89e3259dfb 100644 --- a/sormas-rest/pom.xml +++ b/sormas-rest/pom.xml @@ -3,7 +3,7 @@ de.symeda.sormas sormas-base - 1.77.2-SNAPSHOT + 1.77.2 ../sormas-base diff --git a/sormas-ui/pom.xml b/sormas-ui/pom.xml index 8b958c43073..7fdb8a376dc 100644 --- a/sormas-ui/pom.xml +++ b/sormas-ui/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.2-SNAPSHOT + 1.77.2 ../sormas-base 4.0.0 diff --git a/sormas-widgetset/pom.xml b/sormas-widgetset/pom.xml index 6e3a8bffa33..e9b0e2a4235 100644 --- a/sormas-widgetset/pom.xml +++ b/sormas-widgetset/pom.xml @@ -3,7 +3,7 @@ sormas-base de.symeda.sormas - 1.77.2-SNAPSHOT + 1.77.2 ../sormas-base 4.0.0