kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modify code style (#2041) 

* modify code style

* ci
This commit is contained in:
Jared Tan 2018-12-13 21:59:17 +08:00 committed by GitHub
parent dfe2b08599
commit 2f37158e41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oap-server/server-cluster-plugin/cluster_consul_plugin/pom.xml → oap-server/server-cluster-plugin/cluster-consul-plugin/pom.xml
View File

@ -27,7 +27,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cluster_consul_plugin</artifactId>
<artifactId>cluster-consul-plugin</artifactId>
<packaging>jar</packaging>
<dependencies>
@ -52,4 +52,4 @@
</exclusions>
</dependency>
</dependencies>
</project>
</project>

0
oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java → oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulConfig.java
View File

20
oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java → oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ClusterModuleConsulProvider.java
View File

@ -20,12 +20,20 @@ package org.apache.skywalking.oap.server.cluster.plugin.consul;
import com.google.common.net.HostAndPort;
import com.orbitz.consul.Consul;
import java.util.*;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.cluster.*;
import org.apache.skywalking.oap.server.library.module.*;
import org.apache.skywalking.oap.server.library.util.*;
import org.slf4j.*;
import org.apache.skywalking.oap.server.core.cluster.ClusterModule;
import org.apache.skywalking.oap.server.core.cluster.ClusterNodesQuery;
import org.apache.skywalking.oap.server.core.cluster.ClusterRegister;
import org.apache.skywalking.oap.server.library.module.ModuleConfig;
import org.apache.skywalking.oap.server.library.module.ModuleProvider;
import org.apache.skywalking.oap.server.library.module.ModuleStartException;
import org.apache.skywalking.oap.server.library.module.ServiceNotProvidedException;
import org.apache.skywalking.oap.server.library.util.Address;
import org.apache.skywalking.oap.server.library.util.ConnectStringParseException;
import org.apache.skywalking.oap.server.library.util.ConnectUtils;
import java.util.ArrayList;
import java.util.List;
/**
* Use consul to manage all service instances in SkyWalking cluster.
@ -34,8 +42,6 @@ import org.slf4j.*;
*/
public class ClusterModuleConsulProvider extends ModuleProvider {
private static final Logger logger = LoggerFactory.getLogger(ClusterModuleConsulProvider.class);
private final ClusterModuleConsulConfig config;
private Consul client;

20
oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java → oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/consul/ConsulCoordinator.java
View File

@ -19,22 +19,28 @@
package org.apache.skywalking.oap.server.cluster.plugin.consul;
import com.google.common.base.Strings;
import com.orbitz.consul.*;
import com.orbitz.consul.model.agent.*;
import com.orbitz.consul.AgentClient;
import com.orbitz.consul.Consul;
import com.orbitz.consul.HealthClient;
import com.orbitz.consul.model.agent.ImmutableRegistration;
import com.orbitz.consul.model.agent.Registration;
import com.orbitz.consul.model.health.ServiceHealth;
import java.util.*;
import org.apache.skywalking.oap.server.core.cluster.*;
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 org.apache.skywalking.oap.server.core.cluster.ServiceRegisterException;
import org.apache.skywalking.oap.server.core.remote.client.Address;
import org.apache.skywalking.oap.server.library.util.CollectionUtils;
import org.slf4j.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
/**
* @author peng-yongsheng
*/
public class ConsulCoordinator implements ClusterRegister, ClusterNodesQuery {
private static final Logger logger = LoggerFactory.getLogger(ConsulCoordinator.class);
private final Consul client;
private final String serviceName;
private volatile Address selfAddress;

0
oap-server/server-cluster-plugin/cluster_consul_plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider → oap-server/server-cluster-plugin/cluster-consul-plugin/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
View File

4
oap-server/server-cluster-plugin/pom.xml
View File

@ -31,7 +31,7 @@
<module>cluster-zookeeper-plugin</module>
<module>cluster-standalone-plugin</module>
<module>cluster-kubernetes-plugin</module>
<module>cluster_consul_plugin</module>
<module>cluster-consul-plugin</module>
</modules>
<dependencies>
@ -46,4 +46,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
</project>

4
oap-server/server-starter/pom.xml
View File

@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>cluster_consul_plugin</artifactId>
<artifactId>cluster-consul-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<!-- cluster module -->
@ -186,4 +186,4 @@
</plugin>
</plugins>
</build>
</project>
</project>