chore: add Redirect from old icon endpoint to the new one [DHIS2-16042]

dhis2 · Dec 5, 2023 · 485a832 · 485a832
1 parent 2f8d701
commit 485a832
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/icon/IconController.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/icon/IconController.java
@@ -34,6 +34,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -56,6 +57,7 @@
 import org.hisp.dhis.icon.IconService;
 import org.hisp.dhis.schema.descriptors.IconSchemaDescriptor;
 import org.hisp.dhis.webapi.mvc.annotation.ApiVersion;
+import org.hisp.dhis.webapi.utils.ContextUtils;
 import org.hisp.dhis.webapi.utils.HeaderUtils;
 import org.springframework.core.io.Resource;
 import org.springframework.http.CacheControl;
@@ -100,9 +102,12 @@ public class IconController {
   }
 
   @GetMapping("/{iconKey}/icon.svg")
-  public void getIconData(HttpServletResponse response, @PathVariable String iconKey)
-      throws IOException, NotFoundException {
-    downloadDefaultIcon(iconKey, response);
+  @Deprecated
+  public void getIconData(
+      HttpServletResponse response, HttpServletRequest request, @PathVariable String iconKey)
+      throws IOException {
+    String location = response.encodeRedirectURL("/icons/" + iconKey + "/icon");
+    response.sendRedirect(ContextUtils.getRootPath(request) + location);
   }
 
   @GetMapping(value = "/{key}/icon")