[#noissue] fix serverMapDataFilter on linkSelector

pinpoint-apm · Sep 19, 2023 · e7a5ec3 · e7a5ec3
1 parent 0d327b3
commit e7a5ec3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/config/ApplicationMapModule.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/config/ApplicationMapModule.java
@@ -24,6 +24,7 @@
 import com.navercorp.pinpoint.web.applicationmap.map.LinkSelectorFactory;
 import com.navercorp.pinpoint.web.applicationmap.service.LinkDataMapService;
 import com.navercorp.pinpoint.web.dao.HostApplicationMapDao;
+import com.navercorp.pinpoint.web.security.ServerMapDataFilter;
 import com.navercorp.pinpoint.web.task.ChainedTaskDecorator;
 import com.navercorp.pinpoint.web.task.RequestContextPropagatingTaskDecorator;
 import com.navercorp.pinpoint.web.task.SecurityContextPropagatingTaskDecorator;
@@ -38,6 +39,7 @@
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.Executor;
 
 @Configuration
@@ -76,9 +78,10 @@ public ApplicationsMapCreatorFactory applicationsMapCreatorFactory(@Qualifier("a
 
     @Bean
     public LinkSelectorFactory linkSelectorFactory(LinkDataMapService linkDataMapService,
-                                                   ApplicationsMapCreatorFactory appliationsMapCreatorFactory,
-                                                   HostApplicationMapDao hostApplicationMapDao) {
-        return new LinkSelectorFactory(linkDataMapService, appliationsMapCreatorFactory, hostApplicationMapDao);
+                                                   ApplicationsMapCreatorFactory applicationsMapCreatorFactory,
+                                                   HostApplicationMapDao hostApplicationMapDao,
+                                                   Optional<ServerMapDataFilter> serverMapDataFilter) {
+        return new LinkSelectorFactory(linkDataMapService, applicationsMapCreatorFactory, hostApplicationMapDao, serverMapDataFilter);
     }
 
     @Bean

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/map/LinkSelectorFactory.java b/web/src/main/java/com/navercorp/pinpoint/web/applicationmap/map/LinkSelectorFactory.java
@@ -23,9 +23,11 @@
 import com.navercorp.pinpoint.web.applicationmap.service.LinkDataMapService;
 import com.navercorp.pinpoint.web.dao.HostApplicationMapDao;
 import com.navercorp.pinpoint.web.security.ServerMapDataFilter;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Objects;
+import java.util.Optional;
+
 /**
  * @author HyunGil Jeong
  */
@@ -40,24 +42,15 @@ public class LinkSelectorFactory {
 
     private final ServerMapDataFilter serverMapDataFilter;
 
-    @Autowired(required = false)
-    public LinkSelectorFactory(
-            LinkDataMapService linkDataMapService,
-            ApplicationsMapCreatorFactory appliationsMapCreatorFactory,
-            HostApplicationMapDao hostApplicationMapDao) {
-        this(linkDataMapService, appliationsMapCreatorFactory, hostApplicationMapDao, null);
-    }
-
-    @Autowired(required = false)
     public LinkSelectorFactory(
             LinkDataMapService linkDataMapService,
-            ApplicationsMapCreatorFactory appliationsMapCreatorFactory,
+            ApplicationsMapCreatorFactory applicationsMapCreatorFactory,
             HostApplicationMapDao hostApplicationMapDao,
-            ServerMapDataFilter serverMapDataFilter) {
-        this.linkDataMapService = linkDataMapService;
-        this.applicationsMapCreatorFactory = appliationsMapCreatorFactory;
-        this.hostApplicationMapDao = hostApplicationMapDao;
-        this.serverMapDataFilter = serverMapDataFilter;
+            Optional<ServerMapDataFilter> serverMapDataFilter) {
+        this.linkDataMapService = Objects.requireNonNull(linkDataMapService, "linkDataMapService");
+        this.applicationsMapCreatorFactory = Objects.requireNonNull(applicationsMapCreatorFactory, "applicationsMapCreatorFactory");
+        this.hostApplicationMapDao = Objects.requireNonNull(hostApplicationMapDao, "hostApplicationMapDao");
+        this.serverMapDataFilter = Objects.requireNonNull(serverMapDataFilter, "serverMapDataFilter").orElse(null);
     }
 
     public LinkSelector createLinkSelector(LinkSelectorType linkSelectorType) {

diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/map/LinkSelectorTestBase.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/map/LinkSelectorTestBase.java
@@ -34,6 +34,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
@@ -74,7 +75,7 @@ public abstract class LinkSelectorTestBase {
     public void setUp() throws Exception {
         this.linkDataMapService = mock(LinkDataMapService.class);
         this.hostApplicationMapDao = mock(HostApplicationMapDao.class);
-        this.linkSelectorFactory = new LinkSelectorFactory(linkDataMapService, applicationsMapCreatorFactory, hostApplicationMapDao);
+        this.linkSelectorFactory = new LinkSelectorFactory(linkDataMapService, applicationsMapCreatorFactory, hostApplicationMapDao, Optional.empty());
     }
 
     @AfterEach