Release/1.5.1 (sofastack#91)

Release/1.5.1

Author: dbl-x

README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/alipay/sofa-bolt.svg?branch=master)](https://travis-ci.org/alipay/sofa-bolt)
 [![Coverage Status](https://codecov.io/gh/alipay/sofa-bolt/branch/master/graph/badge.svg)](https://codecov.io/gh/alipay/sofa-bolt)
 ![license](https://img.shields.io/badge/license-Apache--2.0-green.svg)
-![version](https://img.shields.io/badge/bolt-1.5.0-blue.svg)
+![version](https://img.shields.io/badge/bolt-1.5.1-blue.svg)
 
 # 1. 介绍
 SOFABolt 是蚂蚁金融服务集团开发的一套基于 Netty 实现的网络通信框架。

pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alipay.sofa</groupId>
     <artifactId>bolt</artifactId>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>

src/main/java/com/alipay/remoting/AbstractRemotingServer.java

@@ -37,7 +37,6 @@ public abstract class AbstractRemotingServer extends AbstractConfigurableInstanc
     private static final Logger logger  = BoltLoggerFactory.getLogger("CommonDefault");
 
     private AtomicBoolean       started = new AtomicBoolean(false);
-    private AtomicBoolean       inited  = new AtomicBoolean(false);
     private String              ip;
     private int                 port;
 
@@ -53,25 +52,15 @@ public AbstractRemotingServer(String ip, int port) {
 
     @Override
     public void init() {
-        if (inited.compareAndSet(false, true)) {
-            try {
-                doInit();
-            } catch (Throwable t) {
-                inited.set(false);
-                this.stop(); // do stop to ensure close resources created during doInit()
-                throw new IllegalStateException("ERROR: Failed to init the Server!", t);
-            }
-        } else {
-            String warnMsg = "WARN: The server has already inited, you can call start() method to finish starting a server!";
-            logger.warn(warnMsg);
-        }
+        // Do not call this method, it will be removed in the next version
     }
 
     @Override
     public boolean start() {
         if (started.compareAndSet(false, true)) {
             try {
-                init(); // init server by default, so user can just call start method and complete two procedures: init and start.
+                doInit();
+
                 logger.warn("Prepare to start server on port {} ", port);
                 if (doStart()) {
                     logger.warn("Server started on port {}", port);
@@ -81,7 +70,6 @@ public boolean start() {
                     return false;
                 }
             } catch (Throwable t) {
-                started.set(false);
                 this.stop();// do stop to ensure close resources created during doInit()
                 throw new IllegalStateException("ERROR: Failed to start the Server!", t);
             }
@@ -94,7 +82,7 @@ public boolean start() {
 
     @Override
     public boolean stop() {
-        if (inited.compareAndSet(true, false) || started.compareAndSet(true, false)) {
+        if (started.compareAndSet(true, false)) {
             return this.doStop();
         } else {
             throw new IllegalStateException("ERROR: The server has already stopped!");

src/main/java/com/alipay/remoting/CommandDecoder.java

@@ -36,5 +36,5 @@ public interface CommandDecoder {
      * @param out
      * @throws Exception
      */
-    public void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception;
+    void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception;
 }

src/main/java/com/alipay/remoting/CommandEncoder.java

@@ -37,6 +37,6 @@ public interface CommandEncoder {
      * @param out
      * @throws Exception
      */
-    public void encode(ChannelHandlerContext ctx, Serializable msg, ByteBuf out) throws Exception;
+    void encode(ChannelHandlerContext ctx, Serializable msg, ByteBuf out) throws Exception;
 
 }

src/main/java/com/alipay/remoting/CommandHandler.java

@@ -32,26 +32,26 @@ public interface CommandHandler {
      * @param msg
      * @throws Exception
      */
-    public void handleCommand(RemotingContext ctx, Object msg) throws Exception;
+    void handleCommand(RemotingContext ctx, Object msg) throws Exception;
 
     /**
      * Register processor for command with specified code.
      * 
      * @param cmd
      * @param processor
      */
-    public void registerProcessor(CommandCode cmd, RemotingProcessor<?> processor);
+    void registerProcessor(CommandCode cmd, RemotingProcessor<?> processor);
 
     /**
      * Register default executor for the handler.
      * 
      * @param executor
      */
-    public void registerDefaultExecutor(ExecutorService executor);
+    void registerDefaultExecutor(ExecutorService executor);
 
     /**
      * Get default executor for the handler.
      */
-    public ExecutorService getDefaultExecutor();
+    ExecutorService getDefaultExecutor();
 
 }

src/main/java/com/alipay/remoting/ConnectionHeartbeatManager.java

@@ -29,12 +29,12 @@ public interface ConnectionHeartbeatManager {
      * 
      * @param connection
      */
-    public void disableHeartbeat(Connection connection);
+    void disableHeartbeat(Connection connection);
 
     /**
      * enable heart beat for a certain connection
      * 
      * @param connection
      */
-    public void enableHeartbeat(Connection connection);
+    void enableHeartbeat(Connection connection);
 }

src/main/java/com/alipay/remoting/ConnectionSelectStrategy.java

@@ -31,5 +31,5 @@ public interface ConnectionSelectStrategy {
      * @param conns
      * @return
      */
-    public Connection select(List<Connection> conns);
+    Connection select(List<Connection> conns);
 }

src/main/java/com/alipay/remoting/CustomSerializer.java

@@ -37,8 +37,8 @@ public interface CustomSerializer {
      * @return
      * @throws CodecException
      */
-    public <T extends RequestCommand> boolean serializeHeader(T request, InvokeContext invokeContext)
-                                                                                                     throws SerializationException;
+    <T extends RequestCommand> boolean serializeHeader(T request, InvokeContext invokeContext)
+                                                                                              throws SerializationException;
 
     /**
      * Serialize the header of ResponseCommand.
@@ -47,8 +47,7 @@ public <T extends RequestCommand> boolean serializeHeader(T request, InvokeConte
      * @return
      * @throws CodecException
      */
-    public <T extends ResponseCommand> boolean serializeHeader(T response)
-                                                                          throws SerializationException;
+    <T extends ResponseCommand> boolean serializeHeader(T response) throws SerializationException;
 
     /**
      * Deserialize the header of RequestCommand.
@@ -57,8 +56,7 @@ public <T extends ResponseCommand> boolean serializeHeader(T response)
      * @return
      * @throws CodecException
      */
-    public <T extends RequestCommand> boolean deserializeHeader(T request)
-                                                                          throws DeserializationException;
+    <T extends RequestCommand> boolean deserializeHeader(T request) throws DeserializationException;
 
     /**
      * Deserialize the header of ResponseCommand.
@@ -68,9 +66,8 @@ public <T extends RequestCommand> boolean deserializeHeader(T request)
      * @return
      * @throws CodecException
      */
-    public <T extends ResponseCommand> boolean deserializeHeader(T response,
-                                                                 InvokeContext invokeContext)
-                                                                                             throws DeserializationException;
+    <T extends ResponseCommand> boolean deserializeHeader(T response, InvokeContext invokeContext)
+                                                                                                  throws DeserializationException;
 
     /**
      * Serialize the content of RequestCommand.
@@ -80,9 +77,8 @@ public <T extends ResponseCommand> boolean deserializeHeader(T response,
      * @return
      * @throws CodecException
      */
-    public <T extends RequestCommand> boolean serializeContent(T request,
-                                                               InvokeContext invokeContext)
-                                                                                           throws SerializationException;
+    <T extends RequestCommand> boolean serializeContent(T request, InvokeContext invokeContext)
+                                                                                               throws SerializationException;
 
     /**
      * Serialize the content of ResponseCommand.
@@ -91,8 +87,7 @@ public <T extends RequestCommand> boolean serializeContent(T request,
      * @return
      * @throws CodecException
      */
-    public <T extends ResponseCommand> boolean serializeContent(T response)
-                                                                           throws SerializationException;
+    <T extends ResponseCommand> boolean serializeContent(T response) throws SerializationException;
 
     /**
      * Deserialize the content of RequestCommand.
@@ -101,8 +96,8 @@ public <T extends ResponseCommand> boolean serializeContent(T response)
      * @return
      * @throws CodecException
      */
-    public <T extends RequestCommand> boolean deserializeContent(T request)
-                                                                           throws DeserializationException;
+    <T extends RequestCommand> boolean deserializeContent(T request)
+                                                                    throws DeserializationException;
 
     /**
      * Deserialize the content of ResponseCommand.
@@ -112,7 +107,6 @@ public <T extends RequestCommand> boolean deserializeContent(T request)
      * @return
      * @throws CodecException
      */
-    public <T extends ResponseCommand> boolean deserializeContent(T response,
-                                                                  InvokeContext invokeContext)
-                                                                                              throws DeserializationException;
+    <T extends ResponseCommand> boolean deserializeContent(T response, InvokeContext invokeContext)
+                                                                                                   throws DeserializationException;
 }

src/main/java/com/alipay/remoting/InvokeCallback.java

@@ -31,20 +31,20 @@ public interface InvokeCallback {
      * 
      * @param result
      */
-    public void onResponse(final Object result);
+    void onResponse(final Object result);
 
     /**
      * Exception caught.
      * 
      * @param e
      */
-    public void onException(final Throwable e);
+    void onException(final Throwable e);
 
     /**
      * User defined executor.
      * 
      * @return
      */
-    public Executor getExecutor();
+    Executor getExecutor();
 
 }

src/main/java/com/alipay/remoting/InvokeCallbackListener.java

@@ -28,12 +28,12 @@ public interface InvokeCallbackListener {
      * 
      * @param future
      */
-    public void onResponse(final InvokeFuture future);
+    void onResponse(final InvokeFuture future);
 
     /**
      * Get the remote address.
      * 
      * @return
      */
-    public String getRemoteAddress();
+    String getRemoteAddress();
 }