From 1b6a195663a627dbddd3b41a53b7360ccb71a2f5 Mon Sep 17 00:00:00 2001 From: Enrico Colasante Date: Wed, 27 Nov 2024 13:10:26 +0100 Subject: [PATCH] fix: Remove doubled api string in location header [DHIS2-12536] (#19311) --- .../controller/deprecated/tracker/EnrollmentController.java | 4 ++-- .../deprecated/tracker/TrackedEntityInstanceController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/deprecated/tracker/EnrollmentController.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/deprecated/tracker/EnrollmentController.java index ef0746a7b97b..ea1da621e972 100644 --- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/deprecated/tracker/EnrollmentController.java +++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/deprecated/tracker/EnrollmentController.java @@ -233,7 +233,7 @@ public WebMessage postEnrollmentJson( if (!importSummary.getStatus().equals(ImportStatus.ERROR)) { importSummaries(importSummaries) .setHttpStatus(HttpStatus.CREATED) - .setLocation("enrollments/" + importSummary.getReference()); + .setLocation("/enrollments/" + importSummary.getReference()); } } @@ -280,7 +280,7 @@ public WebMessage postEnrollmentXml( if (!importSummary.getStatus().equals(ImportStatus.ERROR)) { importSummaries(importSummaries) .setHttpStatus(HttpStatus.CREATED) - .setLocation("enrollments/" + importSummary.getReference()); + .setLocation("/enrollments/" + importSummary.getReference()); } } diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/deprecated/tracker/TrackedEntityInstanceController.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/deprecated/tracker/TrackedEntityInstanceController.java index 1d08b6985901..a3adcff55e5b 100644 --- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/deprecated/tracker/TrackedEntityInstanceController.java +++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/deprecated/tracker/TrackedEntityInstanceController.java @@ -457,7 +457,7 @@ private WebMessage postTrackedEntityInstance( .setLocation( singleSummary == null ? null - : "trackedEntityInstances/" + singleSummary.getReference()); + : "/trackedEntityInstances/" + singleSummary.getReference()); } return jobConfigurationReport(jobId); }