[#noissue] Fix quickstart test app

emeroad · Jan 3, 2025 · 4eb6a07 · 4eb6a07
1 parent 362f726
commit 4eb6a07
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...start/testapp/src/main/java/com/navercorp/pinpoint/testapp/controller/ApisController.java b/...start/testapp/src/main/java/com/navercorp/pinpoint/testapp/controller/ApisController.java
@@ -6,6 +6,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
@@ -44,7 +45,7 @@ private void initApiMappings() {
             }
 
             String controllerName = handlerMethodBeanClazz.getSimpleName();
-            Set<String> mappedRequests = requestMappingInfo.getPatternsCondition().getPatterns();
+            Set<String> mappedRequests = requestMappingInfo.getPatternValues();
 
             SortedSet<RequestMappedUri> alreadyMappedRequests = this.apiMappings.get(controllerName);
             if (alreadyMappedRequests == null) {
@@ -68,9 +69,9 @@ private Set<RequestMappedUri> createRequestMappedApis(HandlerMethod handlerMetho
     }
 
     @GetMapping(value = {"/", "/index.html", "/apis"})
-    public String apis(Model model) {
+    public ModelAndView apis(Model model) {
         model.addAttribute("apiMappings", this.apiMappings);
-        return "apis";
+        return new ModelAndView("apis.html", model.asMap());
     }
 
     public static class RequestMappedUri {

diff --git a/...art/testapp/src/main/java/com/navercorp/pinpoint/testapp/controller/SimpleController.java b/...art/testapp/src/main/java/com/navercorp/pinpoint/testapp/controller/SimpleController.java
@@ -24,6 +24,7 @@ public Map<String, Object> getCurrentTimestamp() {
     }
 
     @RequestMapping("/testUserInputRequestAttribute")
+    @Description("Test user input request attribute \"pinpoint.metric.uri-template\"= \"/userInput\".")
     public Map<String, Object> testUserInputAttribute(HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         map.put("message", "test user input attribute");
@@ -65,7 +66,7 @@ public Map<String, Object> sleep7() throws InterruptedException {
     }
 
     @RequestMapping("/randomResponseTime/**")
-    @Description("Waits for random time and then returns")
+    @Description("Waits for a random time (0s ~ 10s), then has a (20%) chance to fail.")
     public Map<String, Object> randomResponseTime() throws InterruptedException {
         double a = Math.random() * 10000;
         double fail = Math.random() * 10;
@@ -82,6 +83,7 @@ public Map<String, Object> randomResponseTime() throws InterruptedException {
     }
 
     @RequestMapping("/fails")
+    @Description("Call that fails with an RuntimeException.")
     public void fails() throws Exception {
         throw new RuntimeException();
     }