Merge remote-tracking branch 'dubbo_remote/master' into upgrade_junt_to_junit5

Author: lovepoem

dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/ReconnectTimerTask.java

@@ -38,24 +38,26 @@ public class ReconnectTimerTask extends AbstractTimerTask {
 
     @Override
     protected void doTask(Channel channel) {
-        try {
-            Long lastRead = lastRead(channel);
-            Long now = now();
-            if (lastRead != null && now - lastRead > heartbeatTimeout) {
-                logger.warn("Close channel " + channel + ", because heartbeat read idle time out: "
-                        + heartbeatTimeout + "ms");
-                if (channel instanceof Client) {
-                    try {
-                        ((Client) channel).reconnect();
-                    } catch (Exception e) {
-                        //do nothing
-                    }
-                } else {
+        Long lastRead = lastRead(channel);
+        Long now = now();
+        if (lastRead != null && now - lastRead > heartbeatTimeout) {
+            if (channel instanceof Client) {
+                try {
+                    logger.warn("Reconnect to remote channel " + channel.getRemoteAddress() + ", because heartbeat read idle time out: "
+                            + heartbeatTimeout + "ms");
+                    ((Client) channel).reconnect();
+                } catch (Throwable t) {
+                    // do nothing
+                }
+            } else {
+                try {
+                    logger.warn("Close channel " + channel + ", because heartbeat read idle time out: "
+                            + heartbeatTimeout + "ms");
                     channel.close();
+                } catch (Throwable t) {
+                    logger.warn("Exception when close channel " + channel, t);
                 }
             }
-        } catch (Throwable t) {
-            logger.warn("Exception when reconnect to remote channel " + channel.getRemoteAddress(), t);
         }
     }
 }

dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AbstractResult.java

@@ -16,6 +16,8 @@
  */
 package org.apache.dubbo.rpc;
 
+import org.apache.dubbo.common.utils.StringUtils;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -58,7 +60,7 @@ public String getAttachment(String key) {
     @Override
     public String getAttachment(String key, String defaultValue) {
         String result = attachments.get(key);
-        if (result == null || result.length() == 0) {
+        if (StringUtils.isEmpty(result)) {
             result = defaultValue;
         }
         return result;

dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcContext.java

@@ -20,6 +20,7 @@
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.threadlocal.InternalThreadLocal;
 import org.apache.dubbo.common.utils.NetUtils;
+import org.apache.dubbo.common.utils.StringUtils;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -364,7 +365,7 @@ public String getLocalAddressString() {
      */
     public String getLocalHostName() {
         String host = localAddress == null ? null : localAddress.getHostName();
-        if (host == null || host.length() == 0) {
+        if (StringUtils.isEmpty(host)) {
             return getLocalHost();
         }
         return host;

dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcException.java

@@ -34,7 +34,10 @@
     public static final int SERIALIZATION_EXCEPTION = 5;
     public static final int NO_INVOKER_AVAILABLE_AFTER_FILTER = 6;
     private static final long serialVersionUID = 7815426752583648734L;
-    private int code; // RpcException cannot be extended, use error code for exception type to keep compatibility
+    /**
+     * RpcException cannot be extended, use error code for exception type to keep compatibility
+     */
+    private int code;
 
     public RpcException() {
         super();

dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java

@@ -18,6 +18,7 @@
 
 import org.apache.dubbo.common.Constants;
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.utils.StringUtils;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -198,7 +199,7 @@ public String getAttachment(String key, String defaultValue) {
             return defaultValue;
         }
         String value = attachments.get(key);
-        if (value == null || value.length() == 0) {
+        if (StringUtils.isEmpty(value)) {
             return defaultValue;
         }
         return value;

dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/service/GenericService.java

@@ -31,7 +31,7 @@ public interface GenericService {
      * @param parameterTypes Parameter types
      * @param args           Arguments
      * @return invocation return value
-     * @throws Throwable potential exception thrown from the invocation
+     * @throws GenericException potential exception thrown from the invocation
      */
     Object $invoke(String method, String[] parameterTypes, Object[] args) throws GenericException;
 

dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/Cleanable.java

@@ -16,7 +16,13 @@
  */
 package org.apache.dubbo.common.serialize;
 
+/**
+ * Interface defines that the object is cleanable.
+ */
 public interface Cleanable {
 
+    /**
+     * Implementations must implement this cleanup method
+     */
     void cleanup();
 }

dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/DataInput.java

@@ -19,7 +19,7 @@
 import java.io.IOException;
 
 /**
- * Data input.
+ * Basic data type input interface.
  */
 public interface DataInput {
 

dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/DataOutput.java

@@ -19,7 +19,7 @@
 import java.io.IOException;
 
 /**
- * Data output.
+ * Basic data type output interface.
  */
 public interface DataOutput {
 
@@ -98,9 +98,9 @@ public interface DataOutput {
     /**
      * Write byte array.
      *
-     * @param v   value.
-     * @param off offset.
-     * @param len length.
+     * @param v value.
+     * @param off the start offset in the data.
+     * @param len the number of bytes that are written.
      * @throws IOException
      */
     void writeBytes(byte[] v, int off, int len) throws IOException;

dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/ObjectInput.java

@@ -20,30 +20,37 @@
 import java.lang.reflect.Type;
 
 /**
- * Object input.
+ * Object input interface.
  */
 public interface ObjectInput extends DataInput {
 
     /**
-     * read object.
+     * read object
      *
-     * @return object.
+     * @return object
+     * @throws IOException if an I/O error occurs
+     * @throws ClassNotFoundException if an ClassNotFoundException occurs
      */
     Object readObject() throws IOException, ClassNotFoundException;
 
     /**
-     * read object.
+     * read object
      *
-     * @param cls object type.
-     * @return object.
+     * @param cls object class
+     * @return object
+     * @throws IOException if an I/O error occurs
+     * @throws ClassNotFoundException if an ClassNotFoundException occurs
      */
     <T> T readObject(Class<T> cls) throws IOException, ClassNotFoundException;
 
     /**
-     * read object.
+     * read object
      *
-     * @param cls object type.
-     * @return object.
+     * @param cls object class
+     * @param type object type
+     * @return object
+     * @throws IOException if an I/O error occurs
+     * @throws ClassNotFoundException if an ClassNotFoundException occurs
      */
     <T> T readObject(Class<T> cls, Type type) throws IOException, ClassNotFoundException;