From 20df4130fe9967d78383c7c3f92943b6e180d7a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E5=8B=87=E5=8D=87=20pengys?= <8082209@qq.com> Date: Fri, 4 May 2018 17:48:47 +0800 Subject: [PATCH] Module class rename to ModuleDefine, Module is the JDK9 class. It is conflict with our Module class. (#1168) --- .../agent/grpc/define/AgentGRPCModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../grpc/provider/AgentModuleGRPCProvider.java | 4 ++-- .../apm/collector/core/module/MockModule.java | 2 +- .../agent/jetty/define/AgentJettyModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../jetty/provider/AgentModuleJettyProvider.java | 7 +++---- .../apm/collector/core/module/MockModule.java | 2 +- .../analysis/alarm/define/AnalysisAlarmModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../provider/AnalysisAlarmModuleProvider.java | 4 ++-- .../define/AnalysisBaselineComputingModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../AnalysisBaselineComputingModuleProvider.java | 7 +++---- .../analysis/jvm/define/AnalysisJVMModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../jvm/provider/AnalysisJVMModuleProvider.java | 8 +++----- .../metric/define/AnalysisMetricModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../provider/AnalysisMetricModuleProvider.java | 4 ++-- ...sponseTimeDistributionSpanListenerTestCase.java | 7 +++---- .../register/define/AnalysisRegisterModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../provider/AnalysisRegisterModuleProvider.java | 8 +++----- .../parser/define/AnalysisSegmentParserModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../AnalysisSegmentParserModuleProvider.java | 8 +++----- .../caffeine/CacheModuleCaffeineProvider.java | 8 +++----- .../apm/collector/cache/CacheModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../cache/guava/CacheModuleGuavaProvider.java | 4 ++-- .../apm/collector/cluster/ClusterModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../cluster/redis/ClusterModuleRedisProvider.java | 8 +++----- .../ClusterModuleStandaloneProvider.java | 4 ++-- .../zookeeper/ClusterModuleZookeeperProvider.java | 4 ++-- .../configuration/ConfigurationModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../configuration/ConfigurationModuleProvider.java | 2 +- .../apm/collector/core/module/BootstrapFlow.java | 4 ++-- .../core/module/{Module.java => ModuleDefine.java} | 4 ++-- .../apm/collector/core/module/ModuleManager.java | 14 +++++++------- .../apm/collector/core/module/ModuleProvider.java | 12 ++++++------ .../apm/collector/core/module/Service.java | 2 +- .../apm/collector/core/module/BaseModuleA.java | 2 +- .../apm/collector/core/module/BaseModuleB.java | 2 +- .../apm/collector/core/module/ModuleAProvider.java | 2 +- .../apm/collector/core/module/ModuleBProvider.java | 2 +- .../apm/collector/core/module/TestModule.java | 2 +- .../collector/core/module/TestModuleProvider.java | 2 +- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../collector/grpc/manager/GRPCManagerModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../grpc/manager/GRPCManagerProvider.java | 4 ++-- .../jetty/manager/JettyManagerModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../jetty/manager/JettyManagerProvider.java | 8 +++----- .../apm/collector/naming/NamingModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../naming/jetty/NamingModuleJettyProvider.java | 8 +++----- .../apm/collector/remote/RemoteModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../remote/grpc/RemoteModuleGRPCProvider.java | 8 +++----- .../apm/collector/storage/StorageModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../storage/es/StorageModuleEsProvider.java | 4 ++-- .../storage/h2/StorageModuleH2Provider.java | 8 +++----- .../skywalking/apm/collector/ui/UIModule.java | 4 ++-- ...walking.apm.collector.core.module.ModuleDefine} | 0 .../collector/ui/jetty/UIModuleJettyProvider.java | 4 ++-- .../apm/collector/core/module/MockModule.java | 2 +- 71 files changed, 116 insertions(+), 137 deletions(-) rename apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-cache/collector-cache-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-cluster/collector-cluster-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-configuration/collector-configuration-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/{Module.java => ModuleDefine.java} (99%) rename apm-collector/apm-collector-core/src/test/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-naming/collector-naming-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-remote/collector-remote-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-storage/collector-storage-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) rename apm-collector/apm-collector-ui/collector-ui-define/src/main/resources/META-INF/services/{org.apache.skywalking.apm.collector.core.module.Module => org.apache.skywalking.apm.collector.core.module.ModuleDefine} (100%) diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/define/AgentGRPCModule.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/define/AgentGRPCModule.java index 8878c3fb9..3c519c0da 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/define/AgentGRPCModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-agent/agent-grpc/agent-grpc-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCProvider.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCProvider.java index 01ee7cb29..f4487171d 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/AgentModuleGRPCProvider.java +++ b/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 module() { + public Class module() { return AgentGRPCModule.class; } diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java index 8a90879a3..a6cc0bcd4 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java +++ b/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); diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/define/AgentJettyModule.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/define/AgentJettyModule.java index 125baf2ab..4adc66427 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/define/AgentJettyModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-agent/agent-jetty/agent-jetty-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyProvider.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyProvider.java index 2b6d49951..4e7cdbbef 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/agent/jetty/provider/AgentModuleJettyProvider.java +++ b/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 module() { + @Override public Class module() { return AgentJettyModule.class; } diff --git a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java b/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java index d987292b7..b7ca4bae3 100644 --- a/apm-collector/apm-collector-agent/agent-jetty/agent-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java +++ b/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); diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/define/AnalysisAlarmModule.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/define/AnalysisAlarmModule.java index e6d22e62a..5b123a5f3 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/define/AnalysisAlarmModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-analysis/analysis-alarm/alarm-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java index 33aaf9df3..eef4b2c67 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/AnalysisAlarmModuleProvider.java +++ b/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 module() { + @Override public Class module() { return AnalysisAlarmModule.class; } diff --git a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/define/AnalysisBaselineComputingModule.java b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/define/AnalysisBaselineComputingModule.java index f7cd930b8..1b824b09f 100644 --- a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/define/AnalysisBaselineComputingModule.java +++ b/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 AnalysisBaselineComputingModule 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"; diff --git a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/provider/AnalysisBaselineComputingModuleProvider.java b/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/provider/AnalysisBaselineComputingModuleProvider.java index aa86137bb..d4913573e 100644 --- a/apm-collector/apm-collector-analysis/analysis-baseline/baseline-computing-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/baseline/computing/provider/AnalysisBaselineComputingModuleProvider.java +++ b/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 AnalysisBaselineComputingModuleProvider is the default implementation of {@link @@ -43,7 +42,7 @@ public class AnalysisBaselineComputingModuleProvider extends ModuleProvider { return NAME; } - @Override public Class module() { + @Override public Class module() { return AnalysisBaselineComputingModule.class; } diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/define/AnalysisJVMModule.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/define/AnalysisJVMModule.java index f2cf358ed..677e3baf0 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/define/AnalysisJVMModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-analysis/analysis-jvm/jvm-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/AnalysisJVMModuleProvider.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/AnalysisJVMModuleProvider.java index d95c43e27..c71f2be6a 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/AnalysisJVMModuleProvider.java +++ b/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 module() { + @Override public Class module() { return AnalysisJVMModule.class; } diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/AnalysisMetricModule.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/AnalysisMetricModule.java index 27e917553..21c47af64 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/define/AnalysisMetricModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-analysis/analysis-metric/metric-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java index 8e33cd3c5..4667c887b 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/AnalysisMetricModuleProvider.java +++ b/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 module() { + @Override public Class module() { return AnalysisMetricModule.class; } diff --git a/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 b/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 index c059f17a0..3a16c5753 100644 --- a/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 +++ b/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); diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/AnalysisRegisterModule.java b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/AnalysisRegisterModule.java index 48f5228ea..2ad68156d 100644 --- a/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/java/org/apache/skywalking/apm/collector/analysis/register/define/AnalysisRegisterModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-analysis/analysis-register/register-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/AnalysisRegisterModuleProvider.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/AnalysisRegisterModuleProvider.java index c56919787..97572dfb3 100644 --- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/AnalysisRegisterModuleProvider.java +++ b/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 module() { + @Override public Class module() { return AnalysisRegisterModule.class; } diff --git a/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 b/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 index 003ada677..4cbcdb2a7 100644 --- a/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 +++ b/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"; diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/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 b/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 index d3363b375..ab8f51d58 100644 --- a/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 +++ b/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 module() { + @Override public Class module() { return AnalysisSegmentParserModule.class; } diff --git a/apm-collector/apm-collector-cache/collector-cache-caffeine-provider/src/main/java/org/apache/skywalking/apm/collector/cache/caffeine/CacheModuleCaffeineProvider.java b/apm-collector/apm-collector-cache/collector-cache-caffeine-provider/src/main/java/org/apache/skywalking/apm/collector/cache/caffeine/CacheModuleCaffeineProvider.java index 687c1bf17..8e8aa6849 100644 --- a/apm-collector/apm-collector-cache/collector-cache-caffeine-provider/src/main/java/org/apache/skywalking/apm/collector/cache/caffeine/CacheModuleCaffeineProvider.java +++ b/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 module() { + @Override public Class module() { return CacheModule.class; } diff --git a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/CacheModule.java b/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/CacheModule.java index b73f30956..1f0e59174 100644 --- a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/apache/skywalking/apm/collector/cache/CacheModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-cache/collector-cache-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-cache/collector-cache-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-cache/collector-cache-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-cache/collector-cache-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/CacheModuleGuavaProvider.java b/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/CacheModuleGuavaProvider.java index ffcc3477b..696d4a2df 100644 --- a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/CacheModuleGuavaProvider.java +++ b/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 module() { + @Override public Class module() { return CacheModule.class; } diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/apache/skywalking/apm/collector/cluster/ClusterModule.java b/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/apache/skywalking/apm/collector/cluster/ClusterModule.java index 92b4acf5b..74cd5f409 100644 --- a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/apache/skywalking/apm/collector/cluster/ClusterModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-cluster/collector-cluster-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-cluster/collector-cluster-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/redis/ClusterModuleRedisProvider.java b/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/redis/ClusterModuleRedisProvider.java index 3aa9eb495..fc694de17 100644 --- a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/redis/ClusterModuleRedisProvider.java +++ b/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 module() { + @Override public Class module() { return ClusterModule.class; } diff --git a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/standalone/ClusterModuleStandaloneProvider.java b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/standalone/ClusterModuleStandaloneProvider.java index e2b5e3619..d6bb126a4 100644 --- a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/standalone/ClusterModuleStandaloneProvider.java +++ b/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 module() { + @Override public Class module() { return ClusterModule.class; } diff --git a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/zookeeper/ClusterModuleZookeeperProvider.java b/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/zookeeper/ClusterModuleZookeeperProvider.java index 65972574e..712bb0a0d 100644 --- a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/zookeeper/ClusterModuleZookeeperProvider.java +++ b/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 module() { + @Override public Class module() { return ClusterModule.class; } diff --git a/apm-collector/apm-collector-configuration/collector-configuration-define/src/main/java/org/apache/skywalking/apm/collector/configuration/ConfigurationModule.java b/apm-collector/apm-collector-configuration/collector-configuration-define/src/main/java/org/apache/skywalking/apm/collector/configuration/ConfigurationModule.java index e4040526a..9e9d0abb1 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-define/src/main/java/org/apache/skywalking/apm/collector/configuration/ConfigurationModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-configuration/collector-configuration-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-configuration/collector-configuration-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-configuration/collector-configuration-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-configuration/collector-configuration-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/ConfigurationModuleProvider.java b/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/ConfigurationModuleProvider.java index d3b49562f..432dd14ea 100644 --- a/apm-collector/apm-collector-configuration/collector-configuration-provider/src/main/java/org/apache/skywalking/apm/collector/configuration/ConfigurationModuleProvider.java +++ b/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 module() { + @Override public Class module() { return ConfigurationModule.class; } diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/BootstrapFlow.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/BootstrapFlow.java index 6dc69de39..ef282d2ff 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/BootstrapFlow.java +++ b/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 loadedModules; + private Map loadedModules; private List startupSequence; - BootstrapFlow(Map loadedModules) throws CycleDependencyException { + BootstrapFlow(Map loadedModules) throws CycleDependencyException { this.loadedModules = loadedModules; startupSequence = new LinkedList<>(); diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/Module.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/ModuleDefine.java similarity index 99% rename from apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/Module.java rename to apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/ModuleDefine.java index 38dea969a..2a492e5c9 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/Module.java +++ b/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 loadedProviders = new LinkedList<>(); diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/ModuleManager.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/ModuleManager.java index 21df5a836..30d7e61ae 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/ModuleManager.java +++ b/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 ModuleManager takes charge of all {@link Module}s in collector. + * The ModuleManager takes charge of all {@link ModuleDefine}s in collector. * * @author wu-sheng, peng-yongsheng */ public class ModuleManager { private boolean isInPrepareStage = true; - private Map loadedModules = new HashMap<>(); + private Map 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 moduleServiceLoader = ServiceLoader.load(Module.class); + ServiceLoader moduleServiceLoader = ServiceLoader.load(ModuleDefine.class); LinkedList 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."); diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/ModuleProvider.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/ModuleProvider.java index 5e2b8853d..1e5171d25 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/ModuleProvider.java +++ b/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 ModuleProvider is an implementation of a {@link Module}. + * The ModuleProvider 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, 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 module(); + public abstract Class 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; } diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/Service.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/Service.java index 45839dde6..65f977b8d 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/module/Service.java +++ b/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 Service 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 */ diff --git a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/BaseModuleA.java b/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/BaseModuleA.java index b9669a8dd..774d51943 100644 --- a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/BaseModuleA.java +++ b/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"; } diff --git a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/BaseModuleB.java b/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/BaseModuleB.java index af7c0245f..63c7fbc68 100644 --- a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/BaseModuleB.java +++ b/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"; } diff --git a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/ModuleAProvider.java b/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/ModuleAProvider.java index ce6eead6e..f73369ebf 100644 --- a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/ModuleAProvider.java +++ b/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 module() { + @Override public Class module() { return BaseModuleA.class; } diff --git a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/ModuleBProvider.java b/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/ModuleBProvider.java index 2ab42fe7e..199f5f8f3 100644 --- a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/ModuleBProvider.java +++ b/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 module() { + @Override public Class module() { return BaseModuleB.class; } diff --git a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/TestModule.java b/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/TestModule.java index 7464e1763..356c3d62a 100644 --- a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/TestModule.java +++ b/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"; } diff --git a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/TestModuleProvider.java b/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/TestModuleProvider.java index a3fa54b03..088975b23 100644 --- a/apm-collector/apm-collector-core/src/test/java/org/apache/skywalking/apm/collector/core/module/TestModuleProvider.java +++ b/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 module() { + @Override public Class module() { return TestModule.class; } diff --git a/apm-collector/apm-collector-core/src/test/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-core/src/test/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-core/src/test/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-core/src/test/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/GRPCManagerModule.java b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/GRPCManagerModule.java index ad5266a42..bf362dd43 100644 --- a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/GRPCManagerModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-grpc-manager/collector-grpc-manager-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/GRPCManagerProvider.java b/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/GRPCManagerProvider.java index bbc4695b6..dddf65b13 100644 --- a/apm-collector/apm-collector-grpc-manager/collector-grpc-manager-provider/src/main/java/org/apache/skywalking/apm/collector/grpc/manager/GRPCManagerProvider.java +++ b/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 module() { + @Override public Class module() { return GRPCManagerModule.class; } diff --git a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/JettyManagerModule.java b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/JettyManagerModule.java index e752e8f7c..20145acd7 100644 --- a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/JettyManagerModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-jetty-manager/collector-jetty-manager-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/JettyManagerProvider.java b/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/JettyManagerProvider.java index 26848e6d9..a1fa901ef 100644 --- a/apm-collector/apm-collector-jetty-manager/collector-jetty-manager-provider/src/main/java/org/apache/skywalking/apm/collector/jetty/manager/JettyManagerProvider.java +++ b/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 module() { + @Override public Class module() { return JettyManagerModule.class; } diff --git a/apm-collector/apm-collector-naming/collector-naming-define/src/main/java/org/apache/skywalking/apm/collector/naming/NamingModule.java b/apm-collector/apm-collector-naming/collector-naming-define/src/main/java/org/apache/skywalking/apm/collector/naming/NamingModule.java index cb48b5a45..1be5377d9 100644 --- a/apm-collector/apm-collector-naming/collector-naming-define/src/main/java/org/apache/skywalking/apm/collector/naming/NamingModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-naming/collector-naming-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-naming/collector-naming-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-naming/collector-naming-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-naming/collector-naming-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-naming/collector-naming-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/naming/jetty/NamingModuleJettyProvider.java b/apm-collector/apm-collector-naming/collector-naming-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/naming/jetty/NamingModuleJettyProvider.java index e42023077..09a46562c 100644 --- a/apm-collector/apm-collector-naming/collector-naming-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/naming/jetty/NamingModuleJettyProvider.java +++ b/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 module() { + @Override public Class module() { return NamingModule.class; } diff --git a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/apache/skywalking/apm/collector/remote/RemoteModule.java b/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/apache/skywalking/apm/collector/remote/RemoteModule.java index af07beacd..646cfc3b6 100644 --- a/apm-collector/apm-collector-remote/collector-remote-define/src/main/java/org/apache/skywalking/apm/collector/remote/RemoteModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-remote/collector-remote-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-remote/collector-remote-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-remote/collector-remote-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-remote/collector-remote-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/RemoteModuleGRPCProvider.java b/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/RemoteModuleGRPCProvider.java index cd22acfaa..2c7866a2c 100644 --- a/apm-collector/apm-collector-remote/collector-remote-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/remote/grpc/RemoteModuleGRPCProvider.java +++ b/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 module() { + @Override public Class module() { return RemoteModule.class; } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java index 72acfb757..32c240ee1 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/StorageModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-storage/collector-storage-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java index cb00fe1ed..dc0300f36 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java +++ b/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 module() { + @Override public Class module() { return StorageModule.class; } diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java index 8b1b2e348..a44c21c7d 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/apache/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java +++ b/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 module() { + @Override public Class module() { return StorageModule.class; } diff --git a/apm-collector/apm-collector-ui/collector-ui-define/src/main/java/org/apache/skywalking/apm/collector/ui/UIModule.java b/apm-collector/apm-collector-ui/collector-ui-define/src/main/java/org/apache/skywalking/apm/collector/ui/UIModule.java index af7360650..fc89696c4 100644 --- a/apm-collector/apm-collector-ui/collector-ui-define/src/main/java/org/apache/skywalking/apm/collector/ui/UIModule.java +++ b/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"; diff --git a/apm-collector/apm-collector-ui/collector-ui-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-ui/collector-ui-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine similarity index 100% rename from apm-collector/apm-collector-ui/collector-ui-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.Module rename to apm-collector/apm-collector-ui/collector-ui-define/src/main/resources/META-INF/services/org.apache.skywalking.apm.collector.core.module.ModuleDefine diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java index c66a5c6eb..b2ef65ddf 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/jetty/UIModuleJettyProvider.java +++ b/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 module() { + @Override public Class module() { return UIModule.class; } diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java index 06105d5d8..d60a89b76 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/test/java/org/apache/skywalking/apm/collector/core/module/MockModule.java +++ b/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);