Skip to content

Commit 84d355f

Browse files
x-ultimateralf0131
x-ultimate
authored and
ralf0131
committed
code rule (#3651)
1 parent fa8aabf commit 84d355f

File tree

15 files changed

+243
-76
lines changed

15 files changed

+243
-76
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
/**
3030
* AbstractOverrideConfigurator
31-
*
3231
*/
3332
public abstract class AbstractConfigurator implements Configurator {
3433

‎dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public interface Invoker<T> extends org.apache.dubbo.rpc.Invoker<T> {
2424

2525
Result invoke(Invocation invocation) throws RpcException;
2626

27+
@Override
2728
URL getUrl();
2829

2930
default org.apache.dubbo.rpc.Invoker<T> getOriginal() {

‎dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractBuilder.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ protected static Map<String, String> appendParameters(Map<String, String> parame
6363
}
6464

6565
protected void build(T instance) {
66-
if (!StringUtils.isEmpty(id)) instance.setId(id);
67-
if (!StringUtils.isEmpty(prefix)) instance.setPrefix(prefix);
66+
if (!StringUtils.isEmpty(id)) {
67+
instance.setId(id);
68+
}
69+
if (!StringUtils.isEmpty(prefix)) {
70+
instance.setPrefix(prefix);
71+
}
6872
}
6973
}

‎dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractInterfaceBuilder.java‎

Lines changed: 61 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -267,28 +267,69 @@ public B scope(String scope) {
267267
return getThis();
268268
}
269269

270+
@Override
270271
public void build(T instance) {
271272
super.build(instance);
272273

273-
if (!StringUtils.isEmpty(local)) instance.setLocal(local);
274-
if (!StringUtils.isEmpty(stub)) instance.setStub(stub);
275-
if (monitor != null) instance.setMonitor(monitor);
276-
if (!StringUtils.isEmpty(proxy)) instance.setProxy(proxy);
277-
if (!StringUtils.isEmpty(cluster)) instance.setCluster(cluster);
278-
if (!StringUtils.isEmpty(filter)) instance.setFilter(filter);
279-
if (!StringUtils.isEmpty(listener)) instance.setListener(listener);
280-
if (!StringUtils.isEmpty(owner)) instance.setOwner(owner);
281-
if (connections != null) instance.setConnections(connections);
282-
if (!StringUtils.isEmpty(layer)) instance.setLayer(layer);
283-
if (application != null) instance.setApplication(application);
284-
if (module != null) instance.setModule(module);
285-
if (registries != null) instance.setRegistries(registries);
286-
if (!StringUtils.isEmpty(registryIds)) instance.setRegistryIds(registryIds);
287-
if (!StringUtils.isEmpty(onconnect)) instance.setOnconnect(onconnect);
288-
if (!StringUtils.isEmpty(ondisconnect)) instance.setOndisconnect(ondisconnect);
289-
if (metadataReportConfig != null) instance.setMetadataReportConfig(metadataReportConfig);
290-
if (configCenter != null) instance.setConfigCenter(configCenter);
291-
if (callbacks != null) instance.setCallbacks(callbacks);
292-
if (!StringUtils.isEmpty(scope)) instance.setScope(scope);
274+
if (!StringUtils.isEmpty(local)) {
275+
instance.setLocal(local);
276+
}
277+
if (!StringUtils.isEmpty(stub)) {
278+
instance.setStub(stub);
279+
}
280+
if (monitor != null) {
281+
instance.setMonitor(monitor);
282+
}
283+
if (!StringUtils.isEmpty(proxy)) {
284+
instance.setProxy(proxy);
285+
}
286+
if (!StringUtils.isEmpty(cluster)) {
287+
instance.setCluster(cluster);
288+
}
289+
if (!StringUtils.isEmpty(filter)) {
290+
instance.setFilter(filter);
291+
}
292+
if (!StringUtils.isEmpty(listener)) {
293+
instance.setListener(listener);
294+
}
295+
if (!StringUtils.isEmpty(owner)) {
296+
instance.setOwner(owner);
297+
}
298+
if (connections != null) {
299+
instance.setConnections(connections);
300+
}
301+
if (!StringUtils.isEmpty(layer)) {
302+
instance.setLayer(layer);
303+
}
304+
if (application != null) {
305+
instance.setApplication(application);
306+
}
307+
if (module != null) {
308+
instance.setModule(module);
309+
}
310+
if (registries != null) {
311+
instance.setRegistries(registries);
312+
}
313+
if (!StringUtils.isEmpty(registryIds)) {
314+
instance.setRegistryIds(registryIds);
315+
}
316+
if (!StringUtils.isEmpty(onconnect)) {
317+
instance.setOnconnect(onconnect);
318+
}
319+
if (!StringUtils.isEmpty(ondisconnect)) {
320+
instance.setOndisconnect(ondisconnect);
321+
}
322+
if (metadataReportConfig != null) {
323+
instance.setMetadataReportConfig(metadataReportConfig);
324+
}
325+
if (configCenter != null) {
326+
instance.setConfigCenter(configCenter);
327+
}
328+
if (callbacks != null) {
329+
instance.setCallbacks(callbacks);
330+
}
331+
if (!StringUtils.isEmpty(scope)) {
332+
instance.setScope(scope);
333+
}
293334
}
294335
}

‎dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractMethodBuilder.java‎

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -168,21 +168,46 @@ public B forks(Integer forks) {
168168
return getThis();
169169
}
170170

171+
@Override
171172
@SuppressWarnings("unchecked")
172173
public void build(T instance) {
173174
super.build(instance);
174175

175-
if (actives != null) instance.setActives(actives);
176-
if (async != null) instance.setAsync(async);
177-
if (!StringUtils.isEmpty(cache)) instance.setCache(cache);
178-
if (forks != null) instance.setForks(forks);
179-
if (!StringUtils.isEmpty(loadbalance)) instance.setLoadbalance(loadbalance);
180-
if (!StringUtils.isEmpty(merger)) instance.setMerger(merger);
181-
if(!StringUtils.isEmpty(mock)) instance.setMock(mock);
182-
if (retries != null) instance.setRetries(retries);
183-
if (sent != null) instance.setSent(sent);
184-
if (timeout != null) instance.setTimeout(timeout);
185-
if (!StringUtils.isEmpty(validation)) instance.setValidation(validation);
186-
if (parameters != null) instance.setParameters(parameters);
176+
if (actives != null) {
177+
instance.setActives(actives);
178+
}
179+
if (async != null) {
180+
instance.setAsync(async);
181+
}
182+
if (!StringUtils.isEmpty(cache)) {
183+
instance.setCache(cache);
184+
}
185+
if (forks != null) {
186+
instance.setForks(forks);
187+
}
188+
if (!StringUtils.isEmpty(loadbalance)) {
189+
instance.setLoadbalance(loadbalance);
190+
}
191+
if (!StringUtils.isEmpty(merger)) {
192+
instance.setMerger(merger);
193+
}
194+
if(!StringUtils.isEmpty(mock)) {
195+
instance.setMock(mock);
196+
}
197+
if (retries != null) {
198+
instance.setRetries(retries);
199+
}
200+
if (sent != null) {
201+
instance.setSent(sent);
202+
}
203+
if (timeout != null) {
204+
instance.setTimeout(timeout);
205+
}
206+
if (!StringUtils.isEmpty(validation)) {
207+
instance.setValidation(validation);
208+
}
209+
if (parameters != null) {
210+
instance.setParameters(parameters);
211+
}
187212
}
188213
}

‎dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractReferenceBuilder.java‎

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,17 +126,36 @@ public B group(String group) {
126126
return getThis();
127127
}
128128

129+
@Override
129130
public void build(T instance) {
130131
super.build(instance);
131132

132-
if (check != null) instance.setCheck(check);
133-
if (init != null) instance.setInit(init);
134-
if (!StringUtils.isEmpty(generic)) instance.setGeneric(generic);
135-
if (injvm != null) instance.setInjvm(injvm);
136-
if (lazy != null) instance.setLazy(lazy);
137-
if (!StringUtils.isEmpty(reconnect)) instance.setReconnect(reconnect);
138-
if (sticky != null) instance.setSticky(sticky);
139-
if (!StringUtils.isEmpty(version)) instance.setVersion(version);
140-
if (!StringUtils.isEmpty(group)) instance.setGroup(group);
133+
if (check != null) {
134+
instance.setCheck(check);
135+
}
136+
if (init != null) {
137+
instance.setInit(init);
138+
}
139+
if (!StringUtils.isEmpty(generic)) {
140+
instance.setGeneric(generic);
141+
}
142+
if (injvm != null) {
143+
instance.setInjvm(injvm);
144+
}
145+
if (lazy != null) {
146+
instance.setLazy(lazy);
147+
}
148+
if (!StringUtils.isEmpty(reconnect)) {
149+
instance.setReconnect(reconnect);
150+
}
151+
if (sticky != null) {
152+
instance.setSticky(sticky);
153+
}
154+
if (!StringUtils.isEmpty(version)) {
155+
instance.setVersion(version);
156+
}
157+
if (!StringUtils.isEmpty(group)) {
158+
instance.setGroup(group);
159+
}
141160
}
142161
}

‎dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/AbstractServiceBuilder.java‎

Lines changed: 52 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -222,25 +222,60 @@ public B serialization(String serialization) {
222222
return getThis();
223223
}
224224

225+
@Override
225226
public void build(T instance) {
226227
super.build(instance);
227228

228-
if (!StringUtils.isEmpty(version)) instance.setVersion(version);
229-
if (!StringUtils.isEmpty(group)) instance.setGroup(group);
230-
if (deprecated != null) instance.setDeprecated(deprecated);
231-
if (delay != null) instance.setDelay(delay);
232-
if (export != null) instance.setExport(export);
233-
if (weight != null) instance.setWeight(weight);
234-
if (!StringUtils.isEmpty(document)) instance.setDocument(document);
235-
if (dynamic != null) instance.setDynamic(dynamic);
236-
if (!StringUtils.isEmpty(token)) instance.setToken(token);
237-
if (!StringUtils.isEmpty(accesslog)) instance.setAccesslog(accesslog);
238-
if (protocols != null) instance.setProtocols(protocols);
239-
if (!StringUtils.isEmpty(protocolIds)) instance.setProtocolIds(protocolIds);
240-
if (tag != null) instance.setTag(tag);
241-
if (executes != null) instance.setExecutes(executes);
242-
if (register != null) instance.setRegister(register);
243-
if (warmup != null) instance.setWarmup(warmup);
244-
if (!StringUtils.isEmpty(serialization)) instance.setSerialization(serialization);
229+
if (!StringUtils.isEmpty(version)) {
230+
instance.setVersion(version);
231+
}
232+
if (!StringUtils.isEmpty(group)) {
233+
instance.setGroup(group);
234+
}
235+
if (deprecated != null) {
236+
instance.setDeprecated(deprecated);
237+
}
238+
if (delay != null) {
239+
instance.setDelay(delay);
240+
}
241+
if (export != null) {
242+
instance.setExport(export);
243+
}
244+
if (weight != null) {
245+
instance.setWeight(weight);
246+
}
247+
if (!StringUtils.isEmpty(document)) {
248+
instance.setDocument(document);
249+
}
250+
if (dynamic != null) {
251+
instance.setDynamic(dynamic);
252+
}
253+
if (!StringUtils.isEmpty(token)) {
254+
instance.setToken(token);
255+
}
256+
if (!StringUtils.isEmpty(accesslog)) {
257+
instance.setAccesslog(accesslog);
258+
}
259+
if (protocols != null) {
260+
instance.setProtocols(protocols);
261+
}
262+
if (!StringUtils.isEmpty(protocolIds)) {
263+
instance.setProtocolIds(protocolIds);
264+
}
265+
if (tag != null) {
266+
instance.setTag(tag);
267+
}
268+
if (executes != null) {
269+
instance.setExecutes(executes);
270+
}
271+
if (register != null) {
272+
instance.setRegister(register);
273+
}
274+
if (warmup != null) {
275+
instance.setWarmup(warmup);
276+
}
277+
if (!StringUtils.isEmpty(serialization)) {
278+
instance.setSerialization(serialization);
279+
}
245280
}
246281
}

‎dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/builders/ApplicationBuilder.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ public ApplicationConfig build() {
182182
config.setQosPort(this.qosPort);
183183
config.setQosAcceptForeignIp(this.qosAcceptForeignIp);
184184
config.setParameters(this.parameters);
185-
if (!StringUtils.isEmpty(shutwait)) config.setShutwait(shutwait);
185+
if (!StringUtils.isEmpty(shutwait)) {
186+
config.setShutwait(shutwait);
187+
}
186188
return config;
187189
}
188190

‎dubbo-registry/dubbo-registry-etcd3/src/main/java/org/apache/dubbo/registry/etcd/EtcdRegistry.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public EtcdRegistry(URL url, EtcdTransporter etcdTransporter) {
8686
}
8787
this.root = group;
8888
etcdClient = etcdTransporter.connect(url);
89+
8990
etcdClient.addStateListener(state -> {
9091
if (state == StateListener.CONNECTED) {
9192
try {

‎dubbo-remoting/dubbo-remoting-etcd3/src/main/java/org/apache/dubbo/remoting/etcd/AbstractRetryPolicy.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ protected AbstractRetryPolicy(int maxRetried) {
2424
this.maxRetried = maxRetried;
2525
}
2626

27+
@Override
2728
public boolean shouldRetry(int retried, long elapsed, boolean sleep) {
2829
if (retried < maxRetried) {
2930
try {

0 commit comments

Comments
 (0)
⚡