[#10099] Remove WebApplicationType.SERVET from Batch module

pinpoint-apm · Jun 29, 2023 · 2178e71 · 2178e71
1 parent a590c84
commit 2178e71
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/batch/src/main/java/com/navercorp/pinpoint/batch/BatchStarter.java b/batch/src/main/java/com/navercorp/pinpoint/batch/BatchStarter.java
@@ -17,6 +17,7 @@
 package com.navercorp.pinpoint.batch;
 
 import com.navercorp.pinpoint.common.server.starter.BasicStarter;
+import org.springframework.boot.WebApplicationType;
 
 public class BatchStarter extends BasicStarter {
     public static final String EXTERNAL_PROPERTY_SOURCE_NAME = "BatchExternalEnvironment";
@@ -26,5 +27,6 @@ public BatchStarter(Class<?>... sources) {
         super(sources);
         this.externalPropertySourceName = EXTERNAL_PROPERTY_SOURCE_NAME;
         this.externalConfigurationKey = EXTERNAL_CONFIGURATION_KEY;
+        setWebApplicationType(WebApplicationType.NONE);
     }
 }
diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/starter/BasicStarter.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/starter/BasicStarter.java
@@ -33,7 +33,9 @@
 public class BasicStarter {
     protected String externalPropertySourceName;
     protected String externalConfigurationKey;
-    protected List<String> externalProfiles = new ArrayList<>();
+    private final List<String> externalProfiles = new ArrayList<>();
+
+    private WebApplicationType webApplicationType = WebApplicationType.SERVLET;
 
     private final Class<?>[] sources;
 
@@ -45,11 +47,15 @@ public void addProfiles(String ...profiles) {
         externalProfiles.addAll(List.of(profiles));
     }
 
+    public void setWebApplicationType(WebApplicationType webApplicationType) {
+        this.webApplicationType = Objects.requireNonNull(webApplicationType, "webApplicationType");
+    }
+
     public void start(String[] args) {
         SpringApplicationBuilder builder = new SpringApplicationBuilder();
 
         builder.sources(sources);
-        builder.web(WebApplicationType.SERVLET);
+        builder.web(webApplicationType);
         builder.bannerMode(Banner.Mode.OFF);
 
         builder.listeners(new AdditionalProfileListener(externalProfiles));