Skip to content

Commit d979b21

Browse files
CrazyHZMCrazyHZM
authored
[3.3]Use spotless to format the code (apache#13322)
* Use spotless to format the code Signed-off-by: crazyhzm <crazyhzm@gmail.com> * Use spotless to format the code Signed-off-by: crazyhzm <crazyhzm@gmail.com> * Use spotless to format the code Signed-off-by: crazyhzm <crazyhzm@gmail.com> * degrade dubbo version Signed-off-by: crazyhzm <crazyhzm@gmail.com> * degrade dubbo version Signed-off-by: crazyhzm <crazyhzm@gmail.com> * revert degrade dubbo version Signed-off-by: crazyhzm <crazyhzm@gmail.com> * Fix ut Signed-off-by: crazyhzm <crazyhzm@gmail.com> --------- Signed-off-by: crazyhzm <crazyhzm@gmail.com>
1 parent 88deb9b commit d979b21

File tree

3,497 files changed

+58240
-54451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,497 files changed

+58240
-54451
lines changed

‎dubbo-cluster/pom.xml

Lines changed: 101 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
23
Licensed to the Apache Software Foundation (ASF) under one or more
34
contributor license agreements. See the NOTICE file distributed with
@@ -14,110 +15,109 @@
1415
See the License for the specific language governing permissions and
1516
limitations under the License.
1617
-->
17-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
19-
<modelVersion>4.0.0</modelVersion>
20-
<parent>
21-
<groupId>org.apache.dubbo</groupId>
22-
<artifactId>dubbo-parent</artifactId>
23-
<version>${revision}</version>
24-
<relativePath>../pom.xml</relativePath>
25-
</parent>
26-
<artifactId>dubbo-cluster</artifactId>
27-
<packaging>jar</packaging>
28-
<name>${project.artifactId}</name>
29-
<description>The cluster module of dubbo project</description>
30-
<properties>
31-
<skip_maven_deploy>false</skip_maven_deploy>
32-
<nashorn-core.version>15.4</nashorn-core.version>
33-
</properties>
34-
<dependencies>
35-
<dependency>
36-
<groupId>org.apache.dubbo</groupId>
37-
<artifactId>dubbo-rpc-api</artifactId>
38-
<version>${project.parent.version}</version>
39-
</dependency>
40-
<dependency>
41-
<groupId>org.yaml</groupId>
42-
<artifactId>snakeyaml</artifactId>
43-
</dependency>
44-
<dependency>
45-
<groupId>org.apache.dubbo</groupId>
46-
<artifactId>dubbo-rpc-injvm</artifactId>
47-
<version>${project.parent.version}</version>
48-
<scope>test</scope>
49-
</dependency>
50-
<dependency>
51-
<groupId>org.apache.curator</groupId>
52-
<artifactId>curator-framework</artifactId>
53-
<scope>test</scope>
54-
</dependency>
55-
<dependency>
56-
<groupId>org.apache.zookeeper</groupId>
57-
<artifactId>zookeeper</artifactId>
58-
<scope>test</scope>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.apache.dubbo</groupId>
62-
<artifactId>dubbo-serialization-hessian2</artifactId>
63-
<version>${project.parent.version}</version>
64-
<scope>test</scope>
65-
</dependency>
66-
<dependency>
67-
<groupId>org.apache.dubbo</groupId>
68-
<artifactId>dubbo-serialization-fastjson2</artifactId>
69-
<version>${project.parent.version}</version>
70-
<scope>test</scope>
71-
</dependency>
72-
<dependency>
73-
<groupId>org.apache.dubbo</groupId>
74-
<artifactId>dubbo-test-check</artifactId>
75-
<version>${project.parent.version}</version>
76-
<scope>test</scope>
77-
</dependency>
78-
<dependency>
79-
<groupId>org.apache.dubbo</groupId>
80-
<artifactId>dubbo-metrics-registry</artifactId>
81-
<version>${project.parent.version}</version>
82-
<scope>compile</scope>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.apache.dubbo</groupId>
86-
<artifactId>dubbo-metrics-default</artifactId>
87-
<version>${project.parent.version}</version>
88-
<optional>true</optional>
89-
</dependency>
90-
<dependency>
91-
<groupId>io.micrometer</groupId>
92-
<artifactId>micrometer-tracing-integration-test</artifactId>
93-
<scope>test</scope>
94-
</dependency>
95-
<dependency>
96-
<groupId>org.slf4j</groupId>
97-
<artifactId>slf4j-log4j12</artifactId>
98-
<scope>test</scope>
99-
</dependency>
100-
</dependencies>
18+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
19+
<modelVersion>4.0.0</modelVersion>
20+
<parent>
21+
<groupId>org.apache.dubbo</groupId>
22+
<artifactId>dubbo-parent</artifactId>
23+
<version>${revision}</version>
24+
<relativePath>../pom.xml</relativePath>
25+
</parent>
26+
<artifactId>dubbo-cluster</artifactId>
27+
<packaging>jar</packaging>
28+
<name>${project.artifactId}</name>
29+
<description>The cluster module of dubbo project</description>
30+
<properties>
31+
<skip_maven_deploy>false</skip_maven_deploy>
32+
<nashorn-core.version>15.4</nashorn-core.version>
33+
</properties>
34+
<dependencies>
35+
<dependency>
36+
<groupId>org.apache.dubbo</groupId>
37+
<artifactId>dubbo-rpc-api</artifactId>
38+
<version>${project.parent.version}</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.yaml</groupId>
42+
<artifactId>snakeyaml</artifactId>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.apache.dubbo</groupId>
46+
<artifactId>dubbo-rpc-injvm</artifactId>
47+
<version>${project.parent.version}</version>
48+
<scope>test</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.apache.curator</groupId>
52+
<artifactId>curator-framework</artifactId>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.apache.zookeeper</groupId>
57+
<artifactId>zookeeper</artifactId>
58+
<scope>test</scope>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.apache.dubbo</groupId>
62+
<artifactId>dubbo-serialization-hessian2</artifactId>
63+
<version>${project.parent.version}</version>
64+
<scope>test</scope>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.apache.dubbo</groupId>
68+
<artifactId>dubbo-serialization-fastjson2</artifactId>
69+
<version>${project.parent.version}</version>
70+
<scope>test</scope>
71+
</dependency>
72+
<dependency>
73+
<groupId>org.apache.dubbo</groupId>
74+
<artifactId>dubbo-test-check</artifactId>
75+
<version>${project.parent.version}</version>
76+
<scope>test</scope>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.apache.dubbo</groupId>
80+
<artifactId>dubbo-metrics-registry</artifactId>
81+
<version>${project.parent.version}</version>
82+
<scope>compile</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.apache.dubbo</groupId>
86+
<artifactId>dubbo-metrics-default</artifactId>
87+
<version>${project.parent.version}</version>
88+
<optional>true</optional>
89+
</dependency>
90+
<dependency>
91+
<groupId>io.micrometer</groupId>
92+
<artifactId>micrometer-tracing-integration-test</artifactId>
93+
<scope>test</scope>
94+
</dependency>
95+
<dependency>
96+
<groupId>org.slf4j</groupId>
97+
<artifactId>slf4j-log4j12</artifactId>
98+
<scope>test</scope>
99+
</dependency>
100+
</dependencies>
101101

102-
<profiles>
103-
<!--
102+
<profiles>
103+
<!--
104104
https://github.com/openjdk/nashorn
105105
Nashorn used to be part of the JDK until Java 14.
106106
This project provides a standalone version of Nashorn suitable for use with Java 11 and later.
107107
-->
108-
<profile>
109-
<id>nashorn-jdk11</id>
110-
<activation>
111-
<jdk>[11,)</jdk>
112-
</activation>
113-
<dependencies>
114-
<dependency>
115-
<groupId>org.openjdk.nashorn</groupId>
116-
<artifactId>nashorn-core</artifactId>
117-
<version>${nashorn-core.version}</version>
118-
<scope>test</scope>
119-
</dependency>
120-
</dependencies>
121-
</profile>
122-
</profiles>
108+
<profile>
109+
<id>nashorn-jdk11</id>
110+
<activation>
111+
<jdk>[11,)</jdk>
112+
</activation>
113+
<dependencies>
114+
<dependency>
115+
<groupId>org.openjdk.nashorn</groupId>
116+
<artifactId>nashorn-core</artifactId>
117+
<version>${nashorn-core.version}</version>
118+
<scope>test</scope>
119+
</dependency>
120+
</dependencies>
121+
</profile>
122+
</profiles>
123123
</project>

‎dubbo-cluster/src/main/java/org/apache/dubbo/registry/AddressListener.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,5 @@ public interface AddressListener {
3535
*/
3636
List<URL> notify(List<URL> addresses, URL consumerUrl, Directory registryDirectory);
3737

38-
default void destroy(URL consumerUrl, Directory registryDirectory) {
39-
40-
}
41-
38+
default void destroy(URL consumerUrl, Directory registryDirectory) {}
4239
}

‎dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Cluster.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ static Cluster getCluster(ScopeModel scopeModel, String name, boolean wrap) {
5555
if (StringUtils.isEmpty(name)) {
5656
name = Cluster.DEFAULT;
5757
}
58-
return ScopeModelUtil.getApplicationModel(scopeModel).getExtensionLoader(Cluster.class).getExtension(name, wrap);
58+
return ScopeModelUtil.getApplicationModel(scopeModel)
59+
.getExtensionLoader(Cluster.class)
60+
.getExtension(name, wrap);
5961
}
6062
}

‎dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ClusterScopeModelInitializer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,5 @@ public void initializeApplicationModel(ApplicationModel applicationModel) {
3838
}
3939

4040
@Override
41-
public void initializeModuleModel(ModuleModel moduleModel) {
42-
}
41+
public void initializeModuleModel(ModuleModel moduleModel) {}
4342
}

‎dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public interface Configurator extends Comparable<Configurator> {
5151
*/
5252
URL configure(URL url);
5353

54-
5554
/**
5655
* Convert override urls to map for use when re-refer. Send all rules every time, the urls will be reassembled and
5756
* calculated
@@ -73,7 +72,9 @@ static Optional<List<Configurator>> toConfigurators(List<URL> urls) {
7372
return Optional.empty();
7473
}
7574

76-
ConfiguratorFactory configuratorFactory = urls.get(0).getOrDefaultApplicationModel().getExtensionLoader(ConfiguratorFactory.class)
75+
ConfiguratorFactory configuratorFactory = urls.get(0)
76+
.getOrDefaultApplicationModel()
77+
.getExtensionLoader(ConfiguratorFactory.class)
7778
.getAdaptiveExtension();
7879

7980
List<Configurator> configurators = new ArrayList<>(urls.size());
@@ -83,7 +84,8 @@ static Optional<List<Configurator>> toConfigurators(List<URL> urls) {
8384
break;
8485
}
8586
Map<String, String> override = new HashMap<>(url.getParameters());
86-
//The anyhost parameter of override may be added automatically, it can't change the judgement of changing url
87+
// The anyhost parameter of override may be added automatically, it can't change the judgement of changing
88+
// url
8789
override.remove(ANYHOST_KEY);
8890
if (CollectionUtils.isEmptyMap(override)) {
8991
continue;

‎dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ConfiguratorFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,4 @@ public interface ConfiguratorFactory {
3636
*/
3737
@Adaptive(CommonConstants.PROTOCOL_KEY)
3838
Configurator getConfigurator(URL url);
39-
4039
}

‎dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Constants.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ public interface Constants {
100100

101101
String OVERRIDE_PROVIDERS_KEY = "providerAddresses";
102102

103-
104103
/**
105104
* key for router type, for e.g., "script"/"file", corresponding to ScriptRouterFactory.NAME, FileRouterFactory.NAME
106105
*/

‎dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/LoadBalance.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,4 @@ public interface LoadBalance {
4646
*/
4747
@Adaptive("loadbalance")
4848
<T> Invoker<T> select(List<Invoker<T>> invokers, URL url, Invocation invocation) throws RpcException;
49-
5049
}

‎dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Merger.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@
2222
public interface Merger<T> {
2323

2424
T merge(T... items);
25-
2625
}

‎dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ProviderURLMergeProcessor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ public interface ProviderURLMergeProcessor {
3333
*/
3434
URL mergeUrl(URL remoteUrl, Map<String, String> localParametersMap);
3535

36-
default Map<String, String> mergeLocalParams(Map<String, String> localMap) { return localMap; }
36+
default Map<String, String> mergeLocalParams(Map<String, String> localMap) {
37+
return localMap;
38+
}
3739

3840
default boolean accept(URL providerUrl, Map<String, String> localParametersMap) {
3941
return true;

‎dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Router.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ default <T> List<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocatio
6868
* @return state with route result
6969
* @throws RpcException
7070
*/
71-
default <T> RouterResult<Invoker<T>> route(List<Invoker<T>> invokers, URL url, Invocation invocation,
72-
boolean needToPrintMessage) throws RpcException {
71+
default <T> RouterResult<Invoker<T>> route(
72+
List<Invoker<T>> invokers, URL url, Invocation invocation, boolean needToPrintMessage) throws RpcException {
7373
return new RouterResult<>(route(invokers, url, invocation));
7474
}
7575

@@ -80,9 +80,7 @@ default <T> RouterResult<Invoker<T>> route(List<Invoker<T>> invokers, URL url, I
8080
* @param invokers invoker list
8181
* @param <T> invoker's type
8282
*/
83-
default <T> void notify(List<Invoker<T>> invokers) {
84-
85-
}
83+
default <T> void notify(List<Invoker<T>> invokers) {}
8684

8785
/**
8886
* To decide whether this router need to execute every time an RPC comes or should only execute when addresses or
@@ -109,7 +107,7 @@ default <T> void notify(List<Invoker<T>> invokers) {
109107
int getPriority();
110108

111109
default void stop() {
112-
//do nothing by default
110+
// do nothing by default
113111
}
114112

115113
@Override

0 commit comments

Comments
 (0)