code format (apache#2730)

* NullPointerException * code rule * code rule
CrazyHZM · Dec 6, 2018 · 75c2f47 · 75c2f47
1 parent a664d1d
commit 75c2f47
Show file tree

Hide file tree

Showing 16 changed files with 127 additions and 6 deletions.
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/URL.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/URL.java
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/status/StatusChecker.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/status/StatusChecker.java
@@ -20,5 +20,6 @@
 @Deprecated
 public interface StatusChecker extends org.apache.dubbo.common.status.StatusChecker {
 
+    @Override
     Status check();
 }
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/monitor/Monitor.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/monitor/Monitor.java
@@ -25,6 +25,7 @@
 @Deprecated
 public interface Monitor extends org.apache.dubbo.monitor.Monitor {
 
+    @Override
     com.alibaba.dubbo.common.URL getUrl();
 
     void collect(com.alibaba.dubbo.common.URL statistics);

diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/registry/Registry.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/registry/Registry.java
@@ -26,6 +26,7 @@
 @Deprecated
 public interface Registry extends org.apache.dubbo.registry.Registry {
 
+    @Override
     com.alibaba.dubbo.common.URL getUrl();
 
     void register(com.alibaba.dubbo.common.URL url);

diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/Channel.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/remoting/Channel.java
@@ -20,7 +20,9 @@
 @Deprecated
 public interface Channel extends org.apache.dubbo.remoting.Channel {
 
+    @Override
     com.alibaba.dubbo.common.URL getUrl();
 
+    @Override
     com.alibaba.dubbo.remoting.ChannelHandler getChannelHandler();
 }
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Exporter.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Exporter.java
@@ -20,6 +20,7 @@
 @Deprecated
 public interface Exporter<T> extends org.apache.dubbo.rpc.Exporter<T> {
 
+    @Override
     Invoker<T> getInvoker();
 
     class CompatibleExporter<T> implements Exporter<T> {

diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Filter.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Filter.java
@@ -22,6 +22,7 @@ public interface Filter extends org.apache.dubbo.rpc.Filter {
 
     Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException;
 
+    @Override
     default org.apache.dubbo.rpc.Result invoke(org.apache.dubbo.rpc.Invoker<?> invoker,
                                                org.apache.dubbo.rpc.Invocation invocation)
             throws org.apache.dubbo.rpc.RpcException {

diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invocation.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invocation.java
@@ -22,6 +22,7 @@
 @Deprecated
 public interface Invocation extends org.apache.dubbo.rpc.Invocation {
 
+    @Override
     Invoker<?> getInvoker();
 
     default org.apache.dubbo.rpc.Invocation getOriginal() {
@@ -71,6 +72,7 @@ public Invoker<?> getInvoker() {
             return new Invoker.CompatibleInvoker(delegate.getInvoker());
         }
 
+        @Override
         public org.apache.dubbo.rpc.Invocation getOriginal() {
             return delegate;
         }

diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
@@ -22,6 +22,7 @@
 @Deprecated
 public interface Invoker<T> extends org.apache.dubbo.rpc.Invoker<T> {
 
+    @Override
     Result invoke(org.apache.dubbo.rpc.Invocation invocation) throws RpcException;
 
     default org.apache.dubbo.rpc.Invoker<T> getOriginal() {
@@ -61,6 +62,7 @@ public void destroy() {
             invoker.destroy();
         }
 
+        @Override
         public org.apache.dubbo.rpc.Invoker<T> getOriginal() {
             return invoker;
         }

diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/cluster/Directory.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/cluster/Directory.java
@@ -17,18 +17,19 @@
 
 package com.alibaba.dubbo.rpc.cluster;
 
-import com.alibaba.dubbo.common.URL;
-
 import org.apache.dubbo.rpc.Invocation;
 import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.RpcException;
 
+import com.alibaba.dubbo.common.URL;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Deprecated
 public interface Directory<T> extends org.apache.dubbo.rpc.cluster.Directory<T> {
 
+    @Override
     URL getUrl();
 
     List<com.alibaba.dubbo.rpc.Invoker<T>> list(com.alibaba.dubbo.rpc.Invocation invocation) throws com.alibaba.dubbo.rpc.RpcException;

diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/cluster/Router.java b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/cluster/Router.java
@@ -28,6 +28,7 @@
 @Deprecated
 public interface Router extends org.apache.dubbo.rpc.cluster.Router {
 
+    @Override
     com.alibaba.dubbo.common.URL getUrl();
 
     <T> List<com.alibaba.dubbo.rpc.Invoker<T>> route(List<com.alibaba.dubbo.rpc.Invoker<T>> invokers,

diff --git a/...he/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java b/...he/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessor.java
@@ -16,12 +16,13 @@
  */
 package org.apache.dubbo.config.spring.beans.factory.annotation;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.dubbo.common.Constants;
 import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.config.annotation.Reference;
 import org.apache.dubbo.config.spring.ReferenceBean;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyValues;
@@ -581,7 +582,9 @@ private static boolean nullSafeEquals(Object first, Object another) {
     }
 
     private String toPlainString(String[] array) {
-        if (array == null || array.length == 0) return "";
+        if (array == null || array.length == 0) {
+            return "";
+        }
         StringBuilder buffer = new StringBuilder();
         for (int i = 0; i < array.length; i++) {
             if (i > 0) {

diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java
@@ -20,6 +20,7 @@
 @Deprecated
 public interface GenericService extends org.apache.dubbo.rpc.service.GenericService {
 
+    @Override
     Object $invoke(String method, String[] parameterTypes, Object[] args)
             throws com.alibaba.dubbo.rpc.service.GenericException;
 }
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AbstractResult.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AbstractResult.java
@@ -64,6 +64,7 @@ public String getAttachment(String key, String defaultValue) {
         return result;
     }
 
+    @Override
     public void setAttachment(String key, String value) {
         attachments.put(key, value);
     }

diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncContextImpl.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncContextImpl.java
@@ -71,6 +71,7 @@ public void start() {
         this.started.set(true);
     }
 
+    @Override
     public void signalContextSwitch() {
         RpcContext.restoreContext(storedContext);
         RpcContext.restoreServerContext(storedServerContext);

diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java
@@ -162,6 +162,7 @@ public String getAttachment(String key, String defaultValue) {
         return getRpcResult().getAttachment(key, defaultValue);
     }
 
+    @Override
     public void setAttachment(String key, String value) {
         getRpcResult().setAttachment(key, value);
     }