diff --git a/web-starter/src/main/resources/application.yml b/web-starter/src/main/resources/application.yml index 969eca71e9d2..a93bbc1cdc10 100644 --- a/web-starter/src/main/resources/application.yml +++ b/web-starter/src/main/resources/application.yml @@ -10,7 +10,7 @@ spring: server: port: 8080 error: - path: /api/error + path: /api-public/error include-exception: true include-message: always include-binding-errors: always diff --git a/web/src/main/java/com/navercorp/pinpoint/web/controller/MainController.java b/web/src/main/java/com/navercorp/pinpoint/web/controller/MainController.java index 8f53c2cc397f..bbce40f2c0f5 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/controller/MainController.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/controller/MainController.java @@ -44,7 +44,6 @@ * @author netspider */ @RestController -@RequestMapping("/api") @Validated public class MainController { @@ -65,7 +64,7 @@ public MainController( this.cacheService = Objects.requireNonNull(cacheService, "cacheService"); } - @GetMapping(value = "/applications") + @GetMapping(value = "/api/applications") public ResponseEntity getApplicationGroup( @RequestHeader(value = "If-None-Match", required = false) @NullOrNotBlank String eTagHeader, @RequestParam(value = "clearCache", required = false) @NullOrNotBlank String clearCache @@ -139,7 +138,7 @@ private static boolean needClearCache(ETag eTag, String clearCache) { return eTag == null || clearCache != null; } - @GetMapping(value = "/serverTime") + @GetMapping(value = {"/api/serverTime", "/api-public/serverTime"}) public ServerTime getServerTime() { return new ServerTime(); } diff --git a/web/src/main/java/com/navercorp/pinpoint/web/controller/NonWhiteLabelErrorController.java b/web/src/main/java/com/navercorp/pinpoint/web/controller/NonWhiteLabelErrorController.java index 9c31acf5cf32..7690038c86eb 100644 --- a/web/src/main/java/com/navercorp/pinpoint/web/controller/NonWhiteLabelErrorController.java +++ b/web/src/main/java/com/navercorp/pinpoint/web/controller/NonWhiteLabelErrorController.java @@ -33,7 +33,7 @@ import java.net.URISyntaxException; @RestController -@RequestMapping(value={"/api/error"}) +@RequestMapping(value={"/api-public/error"}) @Validated public class NonWhiteLabelErrorController extends AbstractErrorController { private final ErrorProperties errorProperties;