[pinpoint-apm#10077] Remove unnecessary servlet-context-web.xml

web/src/main/java/com/navercorp/pinpoint/web/PinpointWebModule.java

@@ -24,7 +24,6 @@
 @Configuration
 @ImportResource({
         "classpath:applicationContext-web.xml",
-        "classpath:servlet-context-web.xml",
 
         "classpath:applicationContext-web-dao-config.xml",
 })

web/src/main/java/com/navercorp/pinpoint/web/WebMvcConfig.java

@@ -16,12 +16,13 @@
 
 package com.navercorp.pinpoint.web;
 
+import com.navercorp.pinpoint.web.interceptor.AdminAuthInterceptor;
 import com.navercorp.pinpoint.web.vo.tree.SortByRequestConverter;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.http.CacheControl;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
@@ -47,20 +48,29 @@ public class WebMvcConfig implements WebMvcConfigurer {
     @Value("${pinpoint.web.cache-resources:false}")
     private boolean cacheResource;
 
+    @Value("${admin.password:}")
+    private String password;
+
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
         // For using like WelcomePageHandler
         registry.addViewController("/").setViewName("forward:/index.html");
     }
 
-    @Bean
-    public ResourceHandlerBuilder resourceHandlerBuilder() {
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new AdminAuthInterceptor(password))
+                .addPathPatterns("/admin/**");
+    }
+
+    public ResourceHandlerBuilder newResourceHandlerBuilder() {
         return new ResourceHandlerBuilder(cacheResource);
     }
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        final ResourceHandlerBuilder builder = resourceHandlerBuilder();
+        final ResourceHandlerBuilder builder = newResourceHandlerBuilder();
 
         // index.html no-cache
         builder.apply(registry.addResourceHandler("/index.html")
@@ -87,6 +97,10 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
         );
     }
 
+    private ResourceHandlerBuilder newuilder() {
+        return new ResourceHandlerBuilder(cacheResource);
+    }
+
     static class ResourceHandlerBuilder {
 
         private final boolean cacheResources;

web/src/main/java/com/navercorp/pinpoint/web/interceptor/AdminAuthInterceptor.java

@@ -16,19 +16,15 @@
 
 package com.navercorp.pinpoint.web.interceptor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.navercorp.pinpoint.common.util.StringUtils;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
-import org.springframework.beans.factory.annotation.Value;
+import org.apache.logging.log4j.Logger;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * FIXME temporary interceptor for admin operations.
@@ -37,13 +33,14 @@
  */
 public class AdminAuthInterceptor implements HandlerInterceptor {
 
-    private static final Charset UTF_8 = StandardCharsets.UTF_8;
-
     private final Logger logger = LogManager.getLogger(this.getClass());
 
-    @Value("${admin.password:}")
-    private String password;
-
+    private final String password;
+
+    public AdminAuthInterceptor(String password) {
+        this.password = password;
+    }
+
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String requestUri = request.getRequestURI();

web/src/test/java/com/navercorp/pinpoint/web/controller/AlarmControllerTest.java

@@ -53,7 +53,7 @@
 @Disabled
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
-@ContextConfiguration(locations = {"classpath:servlet-context-web.xml", "classpath:applicationContext-web.xml"})
+@ContextConfiguration(locations = {"classpath:applicationContext-web.xml"})
 public class AlarmControllerTest {
     private final static String APPLICATION_ID = "test-application";
     private final static String APPLICATION_ID_UPDATED = "test-application-tomcat";

web/src/test/java/com/navercorp/pinpoint/web/controller/ConfigControllerTest.java

@@ -34,19 +34,19 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import static com.navercorp.pinpoint.web.TestTraceUtils.hasKey;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static com.navercorp.pinpoint.web.TestTraceUtils.hasKey;
 
 /**
  * @author minwoo.jung
  */
 @Disabled
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
-@ContextConfiguration(locations = {"classpath:servlet-context-web.xml", "classpath:applicationContext-web.xml"})
+@ContextConfiguration(locations = {"classpath:applicationContext-web.xml"})
 public class ConfigControllerTest {
     private final Logger logger = LogManager.getLogger(this.getClass());
     @Autowired

web/src/test/java/com/navercorp/pinpoint/web/controller/UserControllerTest.java

@@ -29,22 +29,22 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import static com.navercorp.pinpoint.web.TestTraceUtils.hasKey;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static com.navercorp.pinpoint.web.TestTraceUtils.hasKey;
 
 /**
  * @author minwoo.jung
  */
 @Disabled
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
-@ContextConfiguration(locations = {"classpath:servlet-context-web.xml", "classpath:applicationContext-web.xml"})
+@ContextConfiguration(locations = {"classpath:applicationContext-web.xml"})
 public class UserControllerTest {
 
     private final static String USER_ID = "naver00";

web/src/test/java/com/navercorp/pinpoint/web/controller/UserGroupControllerTest.java

@@ -56,7 +56,7 @@
 @Disabled
 @ExtendWith(SpringExtension.class)
 @WebAppConfiguration
-@ContextConfiguration(locations = {"classpath:servlet-context-web.xml", "classpath:applicationContext-web.xml"})
+@ContextConfiguration(locations = {"classpath:applicationContext-web.xml"})
 public class UserGroupControllerTest {
 
     private final static String TEST_USER_GROUP_ID = "testUserGroup";