You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/07/20 03:50:54 UTC
[incubator-skywalking] branch 6.0 updated: Fix CI.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch 6.0
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/6.0 by this push:
new 4d56a63 Fix CI.
4d56a63 is described below
commit 4d56a63bd2d3fcde717edf666c4622e262b61f26
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Jul 20 11:50:48 2018 +0800
Fix CI.
---
.../server/cluster/plugin/standalone/StandaloneManager.java | 11 ++++-------
.../cluster/plugin/standalone/StandaloneManagerTest.java | 2 +-
.../zookeeper/ClusterModuleZookeeperProviderTestCase.java | 2 +-
.../apache/skywalking/oap/server/core/CoreModuleProvider.java | 2 +-
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManager.java b/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManager.java
index c266eb4..3535e2b 100644
--- a/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManager.java
+++ b/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManager.java
@@ -18,16 +18,14 @@
package org.apache.skywalking.oap.server.cluster.plugin.standalone;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery;
import org.apache.skywalking.oap.server.core.cluster.ClusterRegister;
import org.apache.skywalking.oap.server.core.cluster.RemoteInstance;
-import java.util.ArrayList;
-import java.util.List;
-
/**
- * A cluster manager simulator. Work in memory only.
- * Also return the current instance.
+ * A cluster manager simulator. Work in memory only. Also return the current instance.
*
* @author peng-yongsheng, Wu Sheng
*/
@@ -35,14 +33,13 @@ public class StandaloneManager implements ClusterNodesQuery, ClusterRegister {
private volatile RemoteInstance remoteInstance;
-
@Override public void registerRemote(RemoteInstance remoteInstance) {
this.remoteInstance = remoteInstance;
}
@Override
public List<RemoteInstance> queryRemoteNodes() {
- if(remoteInstance == null){
+ if (remoteInstance == null) {
return new ArrayList(0);
}
ArrayList remoteList = new ArrayList(1);
diff --git a/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManagerTest.java b/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManagerTest.java
index 2679492..2e69130 100644
--- a/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManagerTest.java
+++ b/oap-server/server-cluster-plugin/cluster-standalone-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/standalone/StandaloneManagerTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
public class StandaloneManagerTest {
@Test
- public void test(){
+ public void test() {
StandaloneManager standaloneManager = new StandaloneManager();
RemoteInstance remote1 = new RemoteInstance();
RemoteInstance remote2 = new RemoteInstance();
diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderTestCase.java b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderTestCase.java
index fafd127..bbffa9f 100644
--- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderTestCase.java
+++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/src/test/java/org/apache/skywalking/oap/server/cluster/plugin/zookeeper/ClusterModuleZookeeperProviderTestCase.java
@@ -67,7 +67,7 @@ public class ClusterModuleZookeeperProviderTestCase {
for (int i = 0; i < 20; i++) {
List<RemoteInstance> detailsList = clusterNodesQuery.queryRemoteNodes();
- if(detailsList.size() == 0){
+ if (detailsList.size() == 0) {
Thread.sleep(500);
continue;
}
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 f58f207..1af3873 100644
--- 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
@@ -82,7 +82,7 @@ public class CoreModuleProvider extends ModuleProvider {
}
- @Override public void notifyAfterCompleted() throws ModuleStartException{
+ @Override public void notifyAfterCompleted() throws ModuleStartException {
try {
grpcServer.start();
jettyServer.start();