[#10741] Resolve conflicts when rebasing

pinpoint-apm · Jun 12, 2024 · e45dc34 · e45dc34
1 parent d37a0fb
commit e45dc34
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/...sender/src/test/java/com/navercorp/pinpoint/batch/alarm/sender/AlarmMailTemplateTest.java b/...sender/src/test/java/com/navercorp/pinpoint/batch/alarm/sender/AlarmMailTemplateTest.java
@@ -42,7 +42,7 @@ class AlarmMailTemplateTest {
     @Test
     public void newBodyTest() {
         when(rule.getCheckerName()).thenReturn("checkerName");
-        when(rule.getApplicationId()).thenReturn("applicaitonId");
+        when(rule.getApplicationName()).thenReturn("applicationName");
         when(rule.getServiceType()).thenReturn("TOMCAT");
         when(checker.getRule()).thenReturn(rule);
         when(checker.getEmailMessage(anyString(), anyString(), anyString(), anyString())).thenReturn("ERROR RATE is 25 % (Threshold: 10 %)<br>");

diff --git a/.../com/navercorp/pinpoint/web/applicationmap/appender/server/DefaultServerInfoAppender.java b/.../com/navercorp/pinpoint/web/applicationmap/appender/server/DefaultServerInfoAppender.java
@@ -98,7 +98,7 @@ private record ServerGroupRequest(Node node, CompletableFuture<ServerGroupList>
 
     private CompletableFuture<ServerGroupList> getServerGroupListFuture(Range range, Node node, LinkDataDuplexMap linkDataDuplexMap) {
         final Application application = node.getApplication();
-        final ServiceType nodeServiceType = application.getServiceType();
+        final ServiceType nodeServiceType = application.serviceType();
         if (nodeServiceType.isWas()) {
             return CompletableFuture.supplyAsync(new Supplier<>() {
                 @Override

diff --git a/...a/com/navercorp/pinpoint/web/applicationmap/service/ResponseTimeHistogramServiceImpl.java b/...a/com/navercorp/pinpoint/web/applicationmap/service/ResponseTimeHistogramServiceImpl.java
@@ -162,7 +162,7 @@ private NodeHistogramSummary getWasNodeHistogramSummary(ResponseTimeHistogramSer
     private NodeHistogramSummary getTerminalNodeHistogramSummary(ResponseTimeHistogramServiceOption option) {
         Application application = option.getApplication();
         Range range = option.getRange();
-        ServiceType applicationServiceType = application.getServiceType();
+        ServiceType applicationServiceType = application.serviceType();
 
         final ServerGroupListFactory serverGroupListFactory = createServerGroupListFactory(option.isUseStatisticsAgentState());
         List<Application> sourceApplications = option.getFromApplications();

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/view/histogram/HistogramView.java b/web/src/main/java/com/navercorp/pinpoint/web/view/histogram/HistogramView.java
@@ -77,7 +77,7 @@ public TimeSeriesView getLoadStatisticsChart() {
 
     public static HistogramView view(NodeHistogramSummary summary) {
         Application application = summary.getApplication();
-        String nodeName = NodeName.toNodeName(application.getName(), application.getServiceType());
+        String nodeName = NodeName.toNodeName(application.name(), application.serviceType());
         Histogram applicationHistogram = summary.getNodeHistogram().getApplicationHistogram();
         List<TimeHistogram> histogramList = summary.getNodeHistogram().getApplicationTimeHistogram().getHistogramList();
 

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/view/histogram/ServerHistogramView.java b/web/src/main/java/com/navercorp/pinpoint/web/view/histogram/ServerHistogramView.java
@@ -34,7 +34,7 @@ public class ServerHistogramView {
 
     public static ServerHistogramView view(NodeHistogramSummary summary) {
         Application application = summary.getApplication();
-        String key = NodeName.toNodeName(application.getName(), application.getServiceType());
+        String key = NodeName.toNodeName(application.name(), application.serviceType());
         List<HistogramView> agentHistogramList = summary.getNodeHistogram().createAgentHistogramViewList();
         ServerGroupList serverGroupList = summary.getServerGroupList();
         return new ServerHistogramView(key, agentHistogramList, serverGroupList);