Module class rename to ModuleDefine, Module is the JDK9 class. It is conflict...

Module class rename to ModuleDefine, Module is the JDK9 class. It is conflict with our Module class. (#1168)

apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/define/AgentGRPCModule.java

@@ -19,12 +19,12 @@
 
 package org.apache.skywalking.apm.collector.agent.grpc.define;
 
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
  */
-public class AgentGRPCModule extends Module {
+public class AgentGRPCModule extends ModuleDefine {
 
     public static final String NAME = "agent_gRPC";
 

apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCProvider.java

@@ -33,7 +33,7 @@ import org.apache.skywalking.apm.collector.analysis.segment.parser.define.Analys
 import org.apache.skywalking.apm.collector.cluster.ClusterModule;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleRegisterService;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
 import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
@@ -65,7 +65,7 @@ public class AgentModuleGRPCProvider extends ModuleProvider {
     }
 
     @Override
-    public Class<? extends Module> module() {
+    public Class<? extends ModuleDefine> module() {
         return AgentGRPCModule.class;
     }
 

apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java

@@ -31,7 +31,7 @@ import static org.mockito.Mockito.when;
 /**
  * @author lican
  */
-public class MockModule extends Module {
+public class MockModule extends ModuleDefine {
 
     public MockModule() throws ServiceNotProvidedException {
         ModuleProvider moduleProvider = Mockito.mock(ModuleProvider.class);

apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/define/AgentJettyModule.java

@@ -18,12 +18,12 @@
 
 package org.apache.skywalking.apm.collector.agent.jetty.define;
 
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
  */
-public class AgentJettyModule extends Module {
+public class AgentJettyModule extends ModuleDefine {
 
     public static final String NAME = "agent_jetty";
 

apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyProvider.java

@@ -29,9 +29,8 @@ import org.apache.skywalking.apm.collector.agent.jetty.provider.handler.naming.A
 import org.apache.skywalking.apm.collector.cluster.ClusterModule;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleRegisterService;
-import org.apache.skywalking.apm.collector.core.module.Module;
-import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
+import org.apache.skywalking.apm.collector.core.module.*;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.jetty.manager.JettyManagerModule;
 import org.apache.skywalking.apm.collector.jetty.manager.service.JettyManagerService;
 import org.apache.skywalking.apm.collector.naming.NamingModule;
@@ -55,7 +54,7 @@ public class AgentModuleJettyProvider extends ModuleProvider {
         return NAME;
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return AgentJettyModule.class;
     }
 

apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java

@@ -34,7 +34,7 @@ import static org.mockito.Mockito.when;
 /**
  * @author lican
  */
-public class MockModule extends Module {
+public class MockModule extends ModuleDefine {
 
     public MockModule() throws ServiceNotProvidedException {
         ModuleProvider moduleProvider = Mockito.mock(ModuleProvider.class);

apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/define/AnalysisAlarmModule.java

@@ -18,12 +18,12 @@
 
 package org.apache.skywalking.apm.collector.analysis.alarm.define;
 
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
  */
-public class AnalysisAlarmModule extends Module {
+public class AnalysisAlarmModule extends ModuleDefine {
 
     public static final String NAME = "analysis_alarm";
 

apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java

@@ -29,7 +29,7 @@ import org.apache.skywalking.apm.collector.analysis.metric.define.AnalysisMetric
 import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerCreateListener;
 import org.apache.skywalking.apm.collector.analysis.worker.timer.PersistenceTimer;
 import org.apache.skywalking.apm.collector.configuration.ConfigurationModule;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
 import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.remote.RemoteModule;
@@ -58,7 +58,7 @@ public class AnalysisAlarmModuleProvider extends ModuleProvider {
         return "default";
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return AnalysisAlarmModule.class;
     }
 

apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/define/AnalysisBaselineComputingModule.java

@@ -18,14 +18,14 @@
 
 package org.apache.skywalking.apm.collector.analysis.baseline.computing.define;
 
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * The <code>AnalysisBaselineComputingModule</code> defines the required service interfaces.
  *
  * @author wu-sheng, peng-yongsheng
  */
-public class AnalysisBaselineComputingModule extends Module {
+public class AnalysisBaselineComputingModule extends ModuleDefine {
 
     public static final String NAME = "analysis_baseline-computing";
 

apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/provider/AnalysisBaselineComputingModuleProvider.java

@@ -19,9 +19,8 @@
 package org.apache.skywalking.apm.collector.analysis.baseline.computing.provider;
 
 import org.apache.skywalking.apm.collector.analysis.baseline.computing.define.AnalysisBaselineComputingModule;
-import org.apache.skywalking.apm.collector.core.module.Module;
-import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
+import org.apache.skywalking.apm.collector.core.module.*;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * The <code>AnalysisBaselineComputingModuleProvider</code> is the default implementation of {@link
@@ -43,7 +42,7 @@ public class AnalysisBaselineComputingModuleProvider extends ModuleProvider {
         return NAME;
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return AnalysisBaselineComputingModule.class;
     }
 

apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/define/AnalysisJVMModule.java

@@ -22,12 +22,12 @@ import org.apache.skywalking.apm.collector.analysis.jvm.define.service.ICpuMetri
 import org.apache.skywalking.apm.collector.analysis.jvm.define.service.IGCMetricService;
 import org.apache.skywalking.apm.collector.analysis.jvm.define.service.IMemoryMetricService;
 import org.apache.skywalking.apm.collector.analysis.jvm.define.service.IMemoryPoolMetricService;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
  */
-public class AnalysisJVMModule extends Module {
+public class AnalysisJVMModule extends ModuleDefine {
 
     public static final String NAME = "analysis_jvm";
 

apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/AnalysisJVMModuleProvider.java

@@ -33,10 +33,8 @@ import org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.memory.M
 import org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.memorypool.MemoryPoolMetricPersistenceGraph;
 import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerCreateListener;
 import org.apache.skywalking.apm.collector.analysis.worker.timer.PersistenceTimer;
-import org.apache.skywalking.apm.collector.core.module.Module;
-import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
-import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
+import org.apache.skywalking.apm.collector.core.module.*;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.remote.RemoteModule;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
 
@@ -57,7 +55,7 @@ public class AnalysisJVMModuleProvider extends ModuleProvider {
         return NAME;
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return AnalysisJVMModule.class;
     }
 

apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/AnalysisMetricModule.java

@@ -19,12 +19,12 @@
 package org.apache.skywalking.apm.collector.analysis.metric.define;
 
 import org.apache.skywalking.apm.collector.analysis.metric.define.service.IInstanceHeartBeatService;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
  */
-public class AnalysisMetricModule extends Module {
+public class AnalysisMetricModule extends ModuleDefine {
 
     public static final String NAME = "analysis_metric";
 

apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java

@@ -47,7 +47,7 @@ import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerCrea
 import org.apache.skywalking.apm.collector.analysis.worker.timer.PersistenceTimer;
 import org.apache.skywalking.apm.collector.cache.CacheModule;
 import org.apache.skywalking.apm.collector.configuration.ConfigurationModule;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
 import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
@@ -82,7 +82,7 @@ public class AnalysisMetricModuleProvider extends ModuleProvider {
         return NAME;
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return AnalysisMetricModule.class;
     }
 

apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/test/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionSpanListenerTestCase.java

@@ -21,9 +21,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.glob
 import java.util.LinkedList;
 import org.apache.skywalking.apm.collector.configuration.ConfigurationModule;
 import org.apache.skywalking.apm.collector.configuration.service.IResponseTimeDistributionConfigService;
-import org.apache.skywalking.apm.collector.core.module.Module;
-import org.apache.skywalking.apm.collector.core.module.ModuleManager;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
+import org.apache.skywalking.apm.collector.core.module.*;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -44,7 +43,7 @@ public class ResponseTimeDistributionSpanListenerTestCase {
         Mockito.when(service.getResponseTimeStep()).thenReturn(50);
         Mockito.when(service.getCountOfResponseTimeSteps()).thenReturn(40);
 
-        Module module = Mockito.mock(Module.class);
+        ModuleDefine module = Mockito.mock(ModuleDefine.class);
         Whitebox.setInternalState(module, "loadedProviders", loadedProviders);
         Mockito.when(module.getService(IResponseTimeDistributionConfigService.class)).thenReturn(service);
 

apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/AnalysisRegisterModule.java

@@ -22,12 +22,12 @@ import org.apache.skywalking.apm.collector.analysis.register.define.service.IApp
 import org.apache.skywalking.apm.collector.analysis.register.define.service.IInstanceIDService;
 import org.apache.skywalking.apm.collector.analysis.register.define.service.INetworkAddressIDService;
 import org.apache.skywalking.apm.collector.analysis.register.define.service.IServiceNameService;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
  */
-public class AnalysisRegisterModule extends Module {
+public class AnalysisRegisterModule extends ModuleDefine {
 
     public static final String NAME = "analysis_register";
 

apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/AnalysisRegisterModuleProvider.java

@@ -34,10 +34,8 @@ import org.apache.skywalking.apm.collector.analysis.register.provider.service.Se
 import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerCreateListener;
 import org.apache.skywalking.apm.collector.analysis.worker.timer.PersistenceTimer;
 import org.apache.skywalking.apm.collector.cache.CacheModule;
-import org.apache.skywalking.apm.collector.core.module.Module;
-import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
-import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
+import org.apache.skywalking.apm.collector.core.module.*;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.remote.RemoteModule;
 import org.apache.skywalking.apm.collector.remote.service.RemoteDataRegisterService;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
@@ -63,7 +61,7 @@ public class AnalysisRegisterModuleProvider extends ModuleProvider {
         return NAME;
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return AnalysisRegisterModule.class;
     }
 

apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/define/AnalysisSegmentParserModule.java

@@ -20,12 +20,12 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.define;
 
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.service.ISegmentParseService;
 import org.apache.skywalking.apm.collector.analysis.segment.parser.define.service.ISegmentParserListenerRegister;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
  */
-public class AnalysisSegmentParserModule extends Module {
+public class AnalysisSegmentParserModule extends ModuleDefine {
 
     public static final String NAME = "analysis_segment_parser";
 

apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/AnalysisSegmentParserModuleProvider.java

@@ -33,10 +33,8 @@ import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerCrea
 import org.apache.skywalking.apm.collector.analysis.worker.timer.PersistenceTimer;
 import org.apache.skywalking.apm.collector.cache.CacheModule;
 import org.apache.skywalking.apm.collector.configuration.ConfigurationModule;
-import org.apache.skywalking.apm.collector.core.module.Module;
-import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
-import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
+import org.apache.skywalking.apm.collector.core.module.*;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
 
 /**
@@ -57,7 +55,7 @@ public class AnalysisSegmentParserModuleProvider extends ModuleProvider {
         return NAME;
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return AnalysisSegmentParserModule.class;
     }
 

apm-collector/apm-collector-cache/collector-cache-caffeine-provider/src/main/java/org/apache/skywalking/apm/collector/cache/caffeine/CacheModuleCaffeineProvider.java

@@ -29,10 +29,8 @@ import org.apache.skywalking.apm.collector.cache.service.InstanceCacheService;
 import org.apache.skywalking.apm.collector.cache.service.NetworkAddressCacheService;
 import org.apache.skywalking.apm.collector.cache.service.ServiceIdCacheService;
 import org.apache.skywalking.apm.collector.cache.service.ServiceNameCacheService;
-import org.apache.skywalking.apm.collector.core.module.Module;
-import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
-import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
+import org.apache.skywalking.apm.collector.core.module.*;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
 
 /**
@@ -51,7 +49,7 @@ public class CacheModuleCaffeineProvider extends ModuleProvider {
         return "caffeine";
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return CacheModule.class;
     }
 

apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/CacheModule.java

@@ -23,12 +23,12 @@ import org.apache.skywalking.apm.collector.cache.service.InstanceCacheService;
 import org.apache.skywalking.apm.collector.cache.service.NetworkAddressCacheService;
 import org.apache.skywalking.apm.collector.cache.service.ServiceIdCacheService;
 import org.apache.skywalking.apm.collector.cache.service.ServiceNameCacheService;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
  */
-public class CacheModule extends Module {
+public class CacheModule extends ModuleDefine {
 
     public static final String NAME = "cache";
 

apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/CacheModuleGuavaProvider.java

@@ -29,7 +29,7 @@ import org.apache.skywalking.apm.collector.cache.service.InstanceCacheService;
 import org.apache.skywalking.apm.collector.cache.service.NetworkAddressCacheService;
 import org.apache.skywalking.apm.collector.cache.service.ServiceIdCacheService;
 import org.apache.skywalking.apm.collector.cache.service.ServiceNameCacheService;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
 import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
@@ -51,7 +51,7 @@ public class CacheModuleGuavaProvider extends ModuleProvider {
         return "guava";
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return CacheModule.class;
     }
 

apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/apache/skywalking/apm/collector/cluster/ClusterModule.java

@@ -22,12 +22,12 @@ package org.apache.skywalking.apm.collector.cluster;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleRegisterService;
 import org.apache.skywalking.apm.collector.core.module.Service;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
  */
-public class ClusterModule extends Module {
+public class ClusterModule extends ModuleDefine {
 
     public static final String NAME = "cluster";
 

apm-collector/apm-collector-cluster/collector-cluster-redis-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/redis/ClusterModuleRedisProvider.java

@@ -21,10 +21,8 @@ package org.apache.skywalking.apm.collector.cluster.redis;
 import org.apache.skywalking.apm.collector.cluster.ClusterModule;
 import org.apache.skywalking.apm.collector.cluster.redis.service.RedisModuleRegisterService;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleRegisterService;
-import org.apache.skywalking.apm.collector.core.module.Module;
-import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
-import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
+import org.apache.skywalking.apm.collector.core.module.*;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
@@ -42,7 +40,7 @@ public class ClusterModuleRedisProvider extends ModuleProvider {
         return "redis";
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return ClusterModule.class;
     }
 

apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/standalone/ClusterModuleStandaloneProvider.java

@@ -27,7 +27,7 @@ import org.apache.skywalking.apm.collector.cluster.standalone.service.Standalone
 import org.apache.skywalking.apm.collector.cluster.standalone.service.StandaloneModuleRegisterService;
 import org.apache.skywalking.apm.collector.core.CollectorException;
 import org.apache.skywalking.apm.collector.core.UnexpectedException;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
 import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
@@ -55,7 +55,7 @@ public class ClusterModuleStandaloneProvider extends ModuleProvider {
         return "standalone";
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return ClusterModule.class;
     }
 

apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/zookeeper/ClusterModuleZookeeperProvider.java

@@ -29,7 +29,7 @@ import org.apache.skywalking.apm.collector.configuration.ConfigurationModule;
 import org.apache.skywalking.apm.collector.configuration.service.ICollectorConfig;
 import org.apache.skywalking.apm.collector.core.CollectorException;
 import org.apache.skywalking.apm.collector.core.UnexpectedException;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
 import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
@@ -56,7 +56,7 @@ public class ClusterModuleZookeeperProvider extends ModuleProvider {
         return "zookeeper";
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return ClusterModule.class;
     }
 

apm-collector/apm-collector-configuration/collector-configuration-define/src/main/java/org/apache/skywalking/apm/collector/configuration/ConfigurationModule.java

@@ -28,12 +28,12 @@ import org.apache.skywalking.apm.collector.configuration.service.IInstanceRefere
 import org.apache.skywalking.apm.collector.configuration.service.IResponseTimeDistributionConfigService;
 import org.apache.skywalking.apm.collector.configuration.service.IServiceAlarmRuleConfig;
 import org.apache.skywalking.apm.collector.configuration.service.IServiceReferenceAlarmRuleConfig;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
  */
-public class ConfigurationModule extends Module {
+public class ConfigurationModule extends ModuleDefine {
 
     public static final String NAME = "configuration";
 

apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/ConfigurationModuleProvider.java

@@ -38,7 +38,7 @@ public class ConfigurationModuleProvider extends ModuleProvider {
         return "default";
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return ConfigurationModule.class;
     }
 

apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/BootstrapFlow.java

@@ -32,10 +32,10 @@ import org.slf4j.LoggerFactory;
 class BootstrapFlow {
     private static final Logger logger = LoggerFactory.getLogger(BootstrapFlow.class);
 
-    private Map<String, Module> loadedModules;
+    private Map<String, ModuleDefine> loadedModules;
     private List<ModuleProvider> startupSequence;
 
-    BootstrapFlow(Map<String, Module> loadedModules) throws CycleDependencyException {
+    BootstrapFlow(Map<String, ModuleDefine> loadedModules) throws CycleDependencyException {
         this.loadedModules = loadedModules;
         startupSequence = new LinkedList<>();
 

apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/Module.java → apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/ModuleDefine.java

@@ -32,9 +32,9 @@ import org.slf4j.LoggerFactory;
  *
  * @author wu-sheng, peng-yongsheng
  */
-public abstract class Module {
+public abstract class ModuleDefine {
 
-    private final Logger logger = LoggerFactory.getLogger(Module.class);
+    private final Logger logger = LoggerFactory.getLogger(ModuleDefine.class);
 
     private LinkedList<ModuleProvider> loadedProviders = new LinkedList<>();
 

apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/ModuleManager.java

@@ -25,13 +25,13 @@ import java.util.Map;
 import java.util.ServiceLoader;
 
 /**
- * The <code>ModuleManager</code> takes charge of all {@link Module}s in collector.
+ * The <code>ModuleManager</code> takes charge of all {@link ModuleDefine}s in collector.
  *
  * @author wu-sheng, peng-yongsheng
  */
 public class ModuleManager {
     private boolean isInPrepareStage = true;
-    private Map<String, Module> loadedModules = new HashMap<>();
+    private Map<String, ModuleDefine> loadedModules = new HashMap<>();
 
     /**
      * Init the given modules
@@ -39,12 +39,12 @@ public class ModuleManager {
     public void init(
         ApplicationConfiguration applicationConfiguration) throws ModuleNotFoundException, ProviderNotFoundException, ServiceNotProvidedException, CycleDependencyException, ModuleConfigException, ModuleStartException {
         String[] moduleNames = applicationConfiguration.moduleList();
-        ServiceLoader<Module> moduleServiceLoader = ServiceLoader.load(Module.class);
+        ServiceLoader<ModuleDefine> moduleServiceLoader = ServiceLoader.load(ModuleDefine.class);
         LinkedList<String> moduleList = new LinkedList<>(Arrays.asList(moduleNames));
-        for (Module module : moduleServiceLoader) {
+        for (ModuleDefine module : moduleServiceLoader) {
             for (String moduleName : moduleNames) {
                 if (moduleName.equals(module.name())) {
-                    Module newInstance;
+                    ModuleDefine newInstance;
                     try {
                         newInstance = module.getClass().newInstance();
                     } catch (InstantiationException | IllegalAccessException e) {
@@ -73,9 +73,9 @@ public class ModuleManager {
         return loadedModules.get(moduleName) != null;
     }
 
-    public Module find(String moduleName) throws ModuleNotFoundRuntimeException {
+    public ModuleDefine find(String moduleName) throws ModuleNotFoundRuntimeException {
         assertPreparedStage();
-        Module module = loadedModules.get(moduleName);
+        ModuleDefine module = loadedModules.get(moduleName);
         if (module != null)
             return module;
         throw new ModuleNotFoundRuntimeException(moduleName + " missing.");

apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/ModuleProvider.java

@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * The <code>ModuleProvider</code> is an implementation of a {@link Module}.
+ * The <code>ModuleProvider</code> is an implementation of a {@link ModuleDefine}.
  *
  * And each module can have one or more implementation, which depends on `application.yml`
  *
@@ -30,7 +30,7 @@ import java.util.Map;
  */
 public abstract class ModuleProvider {
     private ModuleManager manager;
-    private Module module;
+    private ModuleDefine module;
     private Map<Class<? extends Service>, Service> services = new HashMap<>();
 
     public ModuleProvider() {
@@ -40,7 +40,7 @@ public abstract class ModuleProvider {
         this.manager = manager;
     }
 
-    void setModule(Module module) {
+    void setModule(ModuleDefine module) {
         this.module = module;
     }
 
@@ -56,7 +56,7 @@ public abstract class ModuleProvider {
     /**
      * @return the module name
      */
-    public abstract Class<? extends Module> module();
+    public abstract Class<? extends ModuleDefine> module();
 
     /**
      * @return ModuleConfig
@@ -112,7 +112,7 @@ public abstract class ModuleProvider {
         }
 
         if (requiredServices.length != services.size()) {
-            throw new ServiceNotProvidedException("The " + this.name() + " provider in " + module.name() + " module provide more service implementations than Module requirements.");
+            throw new ServiceNotProvidedException("The " + this.name() + " provider in " + module.name() + " module provide more service implementations than ModuleDefine requirements.");
         }
     }
 
@@ -126,7 +126,7 @@ public abstract class ModuleProvider {
         throw new ServiceNotProvidedException("Service " + serviceType.getName() + " should not be provided, based on module define.");
     }
 
-    Module getModule() {
+    ModuleDefine getModule() {
         return module;
     }
 

apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/Service.java

@@ -22,7 +22,7 @@ package org.apache.skywalking.apm.collector.core.module;
 /**
  * The <code>Service</code> implementation is a service provided by its own modules.
  *
- * And every {@link ModuleProvider} must provide all the given services of the {@link Module}.
+ * And every {@link ModuleProvider} must provide all the given services of the {@link ModuleDefine}.
  *
  * @author wu-sheng
  */

apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/BaseModuleA.java

@@ -22,7 +22,7 @@ package org.apache.skywalking.apm.collector.core.module;
 /**
  * @author wu-sheng
  */
-public class BaseModuleA extends Module {
+public class BaseModuleA extends ModuleDefine {
     @Override public String name() {
         return "BaseA";
     }

apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/BaseModuleB.java

@@ -22,7 +22,7 @@ package org.apache.skywalking.apm.collector.core.module;
 /**
  * @author wu-sheng
  */
-public class BaseModuleB extends Module {
+public class BaseModuleB extends ModuleDefine {
     @Override public String name() {
         return "BaseB";
     }

apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/ModuleAProvider.java

@@ -30,7 +30,7 @@ public class ModuleAProvider extends ModuleProvider {
         return null;
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return BaseModuleA.class;
     }
 

apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/ModuleBProvider.java

@@ -31,7 +31,7 @@ public class ModuleBProvider extends ModuleProvider {
         return null;
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return BaseModuleB.class;
     }
 

apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/TestModule.java

@@ -22,7 +22,7 @@ package org.apache.skywalking.apm.collector.core.module;
 /**
  * @author wu-sheng
  */
-public class TestModule extends Module {
+public class TestModule extends ModuleDefine {
     @Override public String name() {
         return "Test";
     }

apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/TestModuleProvider.java

@@ -26,7 +26,7 @@ public class TestModuleProvider extends ModuleProvider {
         return "TestModule-Provider";
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return TestModule.class;
     }
 

apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/GRPCManagerModule.java

@@ -19,13 +19,13 @@
 
 package org.apache.skywalking.apm.collector.grpc.manager;
 
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.grpc.manager.service.GRPCManagerService;
 
 /**
  * @author peng-yongsheng
  */
-public class GRPCManagerModule extends Module {
+public class GRPCManagerModule extends ModuleDefine {
 
     public static final String NAME = "gRPC_manager";
 

apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/GRPCManagerProvider.java

@@ -20,7 +20,7 @@ package org.apache.skywalking.apm.collector.grpc.manager;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
 import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
@@ -50,7 +50,7 @@ public class GRPCManagerProvider extends ModuleProvider {
         return "default";
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return GRPCManagerModule.class;
     }
 

apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/JettyManagerModule.java

@@ -19,13 +19,13 @@
 
 package org.apache.skywalking.apm.collector.jetty.manager;
 
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.jetty.manager.service.JettyManagerService;
 
 /**
  * @author peng-yongsheng
  */
-public class JettyManagerModule extends Module {
+public class JettyManagerModule extends ModuleDefine {
 
     public static final String NAME = "jetty_manager";
 

apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/JettyManagerProvider.java

@@ -20,10 +20,8 @@ package org.apache.skywalking.apm.collector.jetty.manager;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.skywalking.apm.collector.core.module.Module;
-import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
-import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
+import org.apache.skywalking.apm.collector.core.module.*;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.jetty.manager.service.JettyManagerService;
 import org.apache.skywalking.apm.collector.jetty.manager.service.JettyManagerServiceImpl;
 import org.apache.skywalking.apm.collector.server.ServerException;
@@ -49,7 +47,7 @@ public class JettyManagerProvider extends ModuleProvider {
         return "default";
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return JettyManagerModule.class;
     }
 

apm-collector/apm-collector-naming/collector-naming-define/src/main/java/org/apache/skywalking/apm/collector/naming/NamingModule.java

@@ -21,12 +21,12 @@ package org.apache.skywalking.apm.collector.naming;
 
 import org.apache.skywalking.apm.collector.core.module.Service;
 import org.apache.skywalking.apm.collector.naming.service.NamingHandlerRegisterService;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
  */
-public class NamingModule extends Module {
+public class NamingModule extends ModuleDefine {
 
     public static final String NAME = "naming";
 

apm-collector/apm-collector-naming/collector-naming-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/naming/jetty/NamingModuleJettyProvider.java

@@ -19,10 +19,8 @@
 package org.apache.skywalking.apm.collector.naming.jetty;
 
 import org.apache.skywalking.apm.collector.cluster.ClusterModule;
-import org.apache.skywalking.apm.collector.core.module.Module;
-import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
-import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
+import org.apache.skywalking.apm.collector.core.module.*;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.jetty.manager.JettyManagerModule;
 import org.apache.skywalking.apm.collector.jetty.manager.service.JettyManagerService;
 import org.apache.skywalking.apm.collector.naming.NamingModule;
@@ -45,7 +43,7 @@ public class NamingModuleJettyProvider extends ModuleProvider {
         return "jetty";
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return NamingModule.class;
     }
 

apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/apache/skywalking/apm/collector/remote/RemoteModule.java

@@ -21,12 +21,12 @@ package org.apache.skywalking.apm.collector.remote;
 
 import org.apache.skywalking.apm.collector.remote.service.RemoteDataRegisterService;
 import org.apache.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
  */
-public class RemoteModule extends Module {
+public class RemoteModule extends ModuleDefine {
 
     public static final String NAME = "remote";
 

apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/RemoteModuleGRPCProvider.java

@@ -21,10 +21,8 @@ package org.apache.skywalking.apm.collector.remote.grpc;
 import org.apache.skywalking.apm.collector.cluster.ClusterModule;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleRegisterService;
-import org.apache.skywalking.apm.collector.core.module.Module;
-import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
-import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
+import org.apache.skywalking.apm.collector.core.module.*;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.grpc.manager.GRPCManagerModule;
 import org.apache.skywalking.apm.collector.grpc.manager.service.GRPCManagerService;
 import org.apache.skywalking.apm.collector.remote.RemoteModule;
@@ -55,7 +53,7 @@ public class RemoteModuleGRPCProvider extends ModuleProvider {
         return NAME;
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return RemoteModule.class;
     }
 

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java

@@ -20,7 +20,7 @@ package org.apache.skywalking.apm.collector.storage;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.storage.base.dao.IBatchDAO;
 import org.apache.skywalking.apm.collector.storage.dao.IGlobalTracePersistenceDAO;
 import org.apache.skywalking.apm.collector.storage.dao.IInstanceHeartBeatPersistenceDAO;
@@ -130,7 +130,7 @@ import org.apache.skywalking.apm.collector.storage.dao.ui.IServiceReferenceMetri
 /**
  * @author peng-yongsheng
  */
-public class StorageModule extends Module {
+public class StorageModule extends ModuleDefine {
 
     public static final String NAME = "storage";
 

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java

@@ -27,7 +27,7 @@ import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService
 import org.apache.skywalking.apm.collector.cluster.service.ModuleRegisterService;
 import org.apache.skywalking.apm.collector.configuration.ConfigurationModule;
 import org.apache.skywalking.apm.collector.configuration.service.ICollectorConfig;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
 import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.core.module.ModuleStartException;
@@ -268,7 +268,7 @@ public class StorageModuleEsProvider extends ModuleProvider {
         return NAME;
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return StorageModule.class;
     }
 

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java

@@ -22,10 +22,8 @@ import org.apache.skywalking.apm.collector.client.h2.H2Client;
 import org.apache.skywalking.apm.collector.client.h2.H2ClientException;
 import org.apache.skywalking.apm.collector.cluster.ClusterModule;
 import org.apache.skywalking.apm.collector.configuration.ConfigurationModule;
-import org.apache.skywalking.apm.collector.core.module.Module;
-import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
-import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
-import org.apache.skywalking.apm.collector.core.module.ServiceNotProvidedException;
+import org.apache.skywalking.apm.collector.core.module.*;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.remote.RemoteModule;
 import org.apache.skywalking.apm.collector.storage.StorageException;
 import org.apache.skywalking.apm.collector.storage.StorageModule;
@@ -261,7 +259,7 @@ public class StorageModuleH2Provider extends ModuleProvider {
         return "h2";
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return StorageModule.class;
     }
 

apm-collector/apm-collector-ui/collector-ui-define/src/main/java/org/apache/skywalking/apm/collector/ui/UIModule.java

@@ -19,12 +19,12 @@
 
 package org.apache.skywalking.apm.collector.ui;
 
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 
 /**
  * @author peng-yongsheng
  */
-public class UIModule extends Module {
+public class UIModule extends ModuleDefine {
 
     public static final String NAME = "ui";
 

apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java

@@ -23,7 +23,7 @@ import org.apache.skywalking.apm.collector.cluster.ClusterModule;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleListenerService;
 import org.apache.skywalking.apm.collector.cluster.service.ModuleRegisterService;
 import org.apache.skywalking.apm.collector.configuration.ConfigurationModule;
-import org.apache.skywalking.apm.collector.core.module.Module;
+import org.apache.skywalking.apm.collector.core.module.ModuleDefine;
 import org.apache.skywalking.apm.collector.core.module.ModuleConfig;
 import org.apache.skywalking.apm.collector.core.module.ModuleProvider;
 import org.apache.skywalking.apm.collector.jetty.manager.JettyManagerModule;
@@ -54,7 +54,7 @@ public class UIModuleJettyProvider extends ModuleProvider {
         return NAME;
     }
 
-    @Override public Class<? extends Module> module() {
+    @Override public Class<? extends ModuleDefine> module() {
         return UIModule.class;
     }
 

apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java

@@ -31,7 +31,7 @@ import static org.powermock.api.mockito.PowerMockito.when;
 /**
  * @author lican
  */
-public class MockModule extends Module {
+public class MockModule extends ModuleDefine {
 
     public MockModule() throws ServiceNotProvidedException {
         ModuleProvider moduleProvider = Mockito.mock(ModuleProvider.class);