[#9684] Add pinpoint-agent-testweb-commons module

Author: emeroad

agent-testweb/agent-testweb-commons/pom.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2023 NAVER Corp.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.navercorp.pinpoint</groupId>
+        <artifactId>pinpoint-agent-testweb</artifactId>
+        <version>2.5.1-SNAPSHOT</version>
+    </parent>
+    <artifactId>pinpoint-agent-testweb-commons</artifactId>
+    <packaging>jar</packaging>
+
+    <properties>
+        <encoding>UTF-8</encoding>
+        <jdk.version>1.8</jdk.version>
+        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
+        <spring-boot-build-skip>true</spring-boot-build-skip>
+
+        <j2html.version>1.6.0</j2html.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.j2html</groupId>
+            <artifactId>j2html</artifactId>
+            <version>${j2html.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+
+        </plugins>
+    </build>
+
+</project>

agent-testweb/vertx-3-plugin-testweb/src/main/java/com/pinpoint/test/plugin/ApiLinkPage.java renamed to agent-testweb/agent-testweb-commons/src/main/java/com.pinpoint.test.common/view/ApiLinkPage.java

@@ -1,9 +1,9 @@
-package com.pinpoint.test.plugin;
+package com.pinpoint.test.common.view;
 
-import io.vertx.ext.web.Route;
 import j2html.tags.specialized.ATag;
 import j2html.tags.specialized.HtmlTag;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -22,26 +22,28 @@
  */
 public class ApiLinkPage {
     private final String title;
+    private List<ATag> aTags = new ArrayList<>();
 
     public ApiLinkPage(String title) {
         this.title = Objects.requireNonNull(title, "title");
     }
 
-    public String buildRoute(List<Route> routes) {
-        List<ATag> collect = routes.stream()
+    public ApiLinkPage addHrefTag(List<HrefTag> hrefTags) {
+        List<ATag> collect = hrefTags.stream()
                 .map(this::aTag)
                 .collect(Collectors.toList());
-        return buildHtml(collect);
+        this.aTags.addAll(collect);
+        return this;
     }
 
-    private ATag aTag(Route route) {
+    private ATag aTag(HrefTag hrefTag) {
         return a()
-                .withText(route.getPath())
-                .withHref(route.getPath())
+                .withText(hrefTag.getText())
+                .withHref(hrefTag.getPath())
                 .withTarget("_blank");
     }
 
-    public String buildHtml(List<ATag> aTags) {
+    public String build() {
 
         HtmlTag html = html(
                 head(title(title)),
@@ -52,4 +54,5 @@ public String buildHtml(List<ATag> aTags) {
         );
         return html.render();
     }
+
 }

agent-testweb/agent-testweb-commons/src/main/java/com.pinpoint.test.common/view/HrefTag.java

@@ -0,0 +1,27 @@
+package com.pinpoint.test.common.view;
+
+public class HrefTag {
+    private final String text;
+    private final String path;
+
+    public static HrefTag of(String path) {
+        return new HrefTag(path, path);
+    }
+
+    public static HrefTag of(String text, String path) {
+        return new HrefTag(text, path);
+    }
+
+    HrefTag(String text, String path) {
+        this.text = text;
+        this.path = path;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public String getPath() {
+        return path;
+    }
+}

agent-testweb/bom/pom.xml

@@ -38,7 +38,6 @@
         <apache.dubbo.version>2.7.2</apache.dubbo.version>
         <ehcache.version>2.10.6</ehcache.version>
         <undertow.version>2.2.17.Final</undertow.version>
-        <j2html.version>1.6.0</j2html.version>
     </properties>
 
     <dependencyManagement>
@@ -69,11 +68,6 @@
                 <artifactId>springdoc-openapi-ui</artifactId>
                 <version>1.4.4</version>
             </dependency>
-            <dependency>
-                <groupId>com.j2html</groupId>
-                <artifactId>j2html</artifactId>
-                <version>${j2html.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

agent-testweb/mongodb-reactive-plugin-testweb/pom.xml

@@ -41,8 +41,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.j2html</groupId>
-            <artifactId>j2html</artifactId>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-agent-testweb-commons</artifactId>
         </dependency>
 
         <dependency>

agent-testweb/mongodb-reactive-plugin-testweb/src/main/java/com/pinpoint/test/plugin/ApiLinkPage.java

@@ -20,6 +20,8 @@
 import com.mongodb.client.result.InsertOneResult;
 import com.mongodb.reactivestreams.client.MongoCollection;
 import com.mongodb.reactivestreams.client.MongoDatabase;
+import com.pinpoint.test.common.view.ApiLinkPage;
+import com.pinpoint.test.common.view.HrefTag;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.bson.Document;
@@ -67,14 +69,16 @@ public MongoReactivePluginController(RequestMappingHandlerMapping handlerMapping
     @GetMapping("/")
     String welcome() {
         Map<RequestMappingInfo, HandlerMethod> handlerMethods = this.handlerMapping.getHandlerMethods();
-        List<String> list = new ArrayList<>();
+        List<HrefTag> list = new ArrayList<>();
         for (RequestMappingInfo info : handlerMethods.keySet()) {
             for (String path : info.getDirectPaths()) {
-                list.add(path);
+                list.add(HrefTag.of(path));
             }
         }
-        list.sort(String::compareTo);
-        return new ApiLinkPage("mongodb-reactive-plugin-testweb").build(list);
+        list.sort(Comparator.comparing(HrefTag::getPath));
+        return new ApiLinkPage("mongodb-reactive-plugin-testweb")
+                .addHrefTag(list)
+                .build();
     }
 
     @GetMapping(value = "/insertOne")

agent-testweb/mongodb-reactive-plugin-testweb/src/main/java/com/pinpoint/test/plugin/MongoReactivePluginController.java

@@ -51,6 +51,7 @@
 
     <modules>
         <module>bom</module>
+        <module>agent-testweb-commons</module>
         <module>agentsdk-async-testweb</module>
         <module>thread-plugin-testweb</module>
         <module>paho-mqtt-plugin-testweb</module>
@@ -89,6 +90,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>com.navercorp.pinpoint</groupId>
+                <artifactId>pinpoint-agent-testweb-commons</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

agent-testweb/pom.xml

@@ -39,8 +39,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.j2html</groupId>
-            <artifactId>j2html</artifactId>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-agent-testweb-commons</artifactId>
         </dependency>
     </dependencies>