You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/10/21 08:46:02 UTC
[skywalking] branch refactor-module-config updated: Fix formats.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch refactor-module-config
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/refactor-module-config by this push:
new 683bfcef24 Fix formats.
683bfcef24 is described below
commit 683bfcef24166835d17ab127dd2acd016f6ab22e
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Oct 21 16:45:55 2022 +0800
Fix formats.
---
.../org/apache/skywalking/oap/server/core/CoreModuleProvider.java | 3 +--
.../apache/skywalking/oap/server/library/module/ModuleAProvider.java | 3 +++
.../skywalking/oap/server/library/module/ModuleB3Provider.java | 1 -
.../apache/skywalking/oap/server/library/module/ModuleBProvider.java | 1 -
.../skywalking/oap/server/library/module/ModuleManagerTest.java | 5 +++--
.../skywalking/oap/server/telemetry/none/NoneTelemetryProvider.java | 1 -
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
index c4391d3fa2..b38ae7ae83 100755
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
@@ -55,6 +55,7 @@ import org.apache.skywalking.oap.server.core.oal.rt.OALEngineLoaderService;
import org.apache.skywalking.oap.server.core.profiling.ebpf.EBPFProfilingMutationService;
import org.apache.skywalking.oap.server.core.profiling.ebpf.EBPFProfilingQueryService;
import org.apache.skywalking.oap.server.core.profiling.trace.ProfileTaskMutationService;
+import org.apache.skywalking.oap.server.core.profiling.trace.ProfileTaskQueryService;
import org.apache.skywalking.oap.server.core.query.AggregationQueryService;
import org.apache.skywalking.oap.server.core.query.AlarmQueryService;
import org.apache.skywalking.oap.server.core.query.BrowserLogQueryService;
@@ -63,7 +64,6 @@ import org.apache.skywalking.oap.server.core.query.LogQueryService;
import org.apache.skywalking.oap.server.core.query.MetadataQueryService;
import org.apache.skywalking.oap.server.core.query.MetricsMetadataQueryService;
import org.apache.skywalking.oap.server.core.query.MetricsQueryService;
-import org.apache.skywalking.oap.server.core.profiling.trace.ProfileTaskQueryService;
import org.apache.skywalking.oap.server.core.query.TagAutoCompleteQueryService;
import org.apache.skywalking.oap.server.core.query.TopNRecordsQueryService;
import org.apache.skywalking.oap.server.core.query.TopologyQueryService;
@@ -90,7 +90,6 @@ import org.apache.skywalking.oap.server.core.storage.ttl.DataTTLKeeperTimer;
import org.apache.skywalking.oap.server.core.worker.IWorkerInstanceGetter;
import org.apache.skywalking.oap.server.core.worker.IWorkerInstanceSetter;
import org.apache.skywalking.oap.server.core.worker.WorkerInstancesService;
-import org.apache.skywalking.oap.server.library.module.ModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleDefine;
import org.apache.skywalking.oap.server.library.module.ModuleProvider;
import org.apache.skywalking.oap.server.library.module.ModuleStartException;
diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleAProvider.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleAProvider.java
index 5d6e8fdbd2..c808ba823d 100644
--- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleAProvider.java
+++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleAProvider.java
@@ -18,7 +18,10 @@
package org.apache.skywalking.oap.server.library.module;
+import lombok.Getter;
+
public class ModuleAProvider extends ModuleProvider {
+ @Getter
private ModuleAProviderConfig config;
@Override
diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleB3Provider.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleB3Provider.java
index 927ea698b4..6d181fbc6c 100644
--- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleB3Provider.java
+++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleB3Provider.java
@@ -25,7 +25,6 @@ public class ModuleB3Provider extends ModuleProvider {
return "P-B3";
}
-
@Override
public Class<? extends ModuleDefine> module() {
return BaseModuleB.class;
diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBProvider.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBProvider.java
index 86fe9c37fc..c19557c570 100644
--- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBProvider.java
+++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleBProvider.java
@@ -25,7 +25,6 @@ public class ModuleBProvider extends ModuleProvider {
return "P-B";
}
-
@Override
public Class<? extends ModuleDefine> module() {
return BaseModuleB.class;
diff --git a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleManagerTest.java b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleManagerTest.java
index 323df766fc..d72058b106 100644
--- a/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleManagerTest.java
+++ b/oap-server/server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/ModuleManagerTest.java
@@ -18,6 +18,7 @@
package org.apache.skywalking.oap.server.library.module;
+import java.lang.reflect.InvocationTargetException;
import java.util.Properties;
import org.junit.Assert;
import org.junit.Test;
@@ -40,7 +41,7 @@ public class ModuleManagerTest {
}
@Test
- public void testModuleConfigInit() throws ModuleConfigException, ModuleNotFoundException, ModuleStartException {
+ public void testModuleConfigInit() throws ModuleConfigException, ModuleNotFoundException, ModuleStartException, NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
ApplicationConfiguration configuration = new ApplicationConfiguration();
final Properties settings = new Properties();
settings.put("attr1", "abc");
@@ -55,7 +56,7 @@ public class ModuleManagerTest {
final ModuleServiceHolder provider = manager.find("BaseA").provider();
Assert.assertTrue(provider instanceof ModuleAProvider);
final ModuleAProvider moduleAProvider = (ModuleAProvider) provider;
- final ModuleAProviderConfig config = (ModuleAProviderConfig) moduleAProvider.newConfigCreator();
+ final ModuleAProviderConfig config = moduleAProvider.getConfig();
Assert.assertEquals("abc", config.getAttr1());
Assert.assertEquals(123, config.getAttr2().intValue());
Assert.assertEquals(123L, config.getAttr3().longValue());
diff --git a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/NoneTelemetryProvider.java b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/NoneTelemetryProvider.java
index 8c1e53c6d7..771a3d7226 100644
--- a/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/NoneTelemetryProvider.java
+++ b/oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/none/NoneTelemetryProvider.java
@@ -18,7 +18,6 @@
package org.apache.skywalking.oap.server.telemetry.none;
-import org.apache.skywalking.oap.server.library.module.ModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleDefine;
import org.apache.skywalking.oap.server.library.module.ModuleProvider;
import org.apache.skywalking.oap.server.library.module.ModuleStartException;