You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by il...@apache.org on 2018/06/15 07:48:27 UTC

[incubator-dubbo] branch master updated: Revert "reformat the code style (#1948)" (#1951)

This is an automated email from the ASF dual-hosted git repository.

iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git


The following commit(s) were added to refs/heads/master by this push:
     new 27e6fdb  Revert "reformat the code style (#1948)" (#1951)
27e6fdb is described below

commit 27e6fdb729a6362ae2a18a2b2b9e99ea13f12acb
Author: Ian Luo <ia...@gmail.com>
AuthorDate: Fri Jun 15 15:48:24 2018 +0800

    Revert "reformat the code style (#1948)" (#1951)
    
    This reverts commit 9758809b3ab9f78f076592a288ccc530c590fb6d.
---
 .../src/main/java/org/apache/dubbo/qos/command/BaseCommand.java   | 2 +-
 .../main/java/org/apache/dubbo/qos/command/CommandContext.java    | 2 +-
 .../java/org/apache/dubbo/qos/command/CommandContextFactory.java  | 6 +++---
 .../java/org/apache/dubbo/qos/command/DefaultCommandExecutor.java | 2 +-
 .../org/apache/dubbo/qos/command/decoder/HttpCommandDecoder.java  | 4 ++--
 .../apache/dubbo/qos/command/decoder/TelnetCommandDecoder.java    | 2 +-
 .../src/main/java/org/apache/dubbo/qos/command/impl/Quit.java     | 2 +-
 .../java/org/apache/dubbo/qos/command/util/CommandHelper.java     | 8 ++++----
 .../java/org/apache/dubbo/qos/protocol/QosProtocolWrapper.java    | 6 +++---
 .../src/main/java/org/apache/dubbo/qos/server/DubboLogo.java      | 2 +-
 .../apache/dubbo/qos/server/handler/LocalHostPermitHandler.java   | 2 +-
 .../src/main/java/org/apache/dubbo/qos/textui/TTable.java         | 2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/BaseCommand.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/BaseCommand.java
index d0652eb..ac9a3fe 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/BaseCommand.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/BaseCommand.java
@@ -20,5 +20,5 @@ import org.apache.dubbo.common.extension.SPI;
 
 @SPI
 public interface BaseCommand {
-    String execute(CommandContext commandContext, String[] args);
+    String execute(CommandContext commandContext,String[] args);
 }
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContext.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContext.java
index 5081baf..744a8c6 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContext.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContext.java
@@ -29,7 +29,7 @@ public class CommandContext {
         this.commandName = commandName;
     }
 
-    public CommandContext(String commandName, String[] args, boolean isHttp) {
+    public CommandContext(String commandName, String[] args,boolean isHttp) {
         this.commandName = commandName;
         this.args = args;
         this.isHttp = isHttp;
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContextFactory.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContextFactory.java
index 5cc3b5d..7f3ce9a 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContextFactory.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContextFactory.java
@@ -17,11 +17,11 @@
 package org.apache.dubbo.qos.command;
 
 public class CommandContextFactory {
-    public static CommandContext newInstance(String commandName) {
+    public static CommandContext newInstance(String commandName){
         return new CommandContext(commandName);
     }
 
-    public static CommandContext newInstance(String commandName, String[] args, boolean isHttp) {
-        return new CommandContext(commandName, args, isHttp);
+    public static CommandContext newInstance(String commandName, String[] args,boolean isHttp){
+        return new CommandContext(commandName,args,isHttp);
     }
 }
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/DefaultCommandExecutor.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/DefaultCommandExecutor.java
index 469996e..342f256 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/DefaultCommandExecutor.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/DefaultCommandExecutor.java
@@ -25,7 +25,7 @@ public class DefaultCommandExecutor implements CommandExecutor {
         try {
             command = ExtensionLoader.getExtensionLoader(BaseCommand.class).getExtension(commandContext.getCommandName());
         } catch (Throwable throwable) {
-            //can't find command
+                //can't find command
         }
         if (command == null) {
             throw new NoSuchCommandException(commandContext.getCommandName());
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/HttpCommandDecoder.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/HttpCommandDecoder.java
index 8059fef..5a16a13 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/HttpCommandDecoder.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/HttpCommandDecoder.java
@@ -50,7 +50,7 @@ public class HttpCommandDecoder {
                         for (List<String> values : queryStringDecoder.parameters().values()) {
                             valueList.addAll(values);
                         }
-                        commandContext = CommandContextFactory.newInstance(name, valueList.toArray(new String[]{}), true);
+                        commandContext = CommandContextFactory.newInstance(name, valueList.toArray(new String[]{}),true);
                     }
                 } else if (request.getMethod() == HttpMethod.POST) {
                     HttpPostRequestDecoder httpPostRequestDecoder = new HttpPostRequestDecoder(request);
@@ -69,7 +69,7 @@ public class HttpCommandDecoder {
                         commandContext = CommandContextFactory.newInstance(name);
                         commandContext.setHttp(true);
                     } else {
-                        commandContext = CommandContextFactory.newInstance(name, valueList.toArray(new String[]{}), true);
+                        commandContext = CommandContextFactory.newInstance(name, valueList.toArray(new String[]{}),true);
                     }
                 }
             }
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/TelnetCommandDecoder.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/TelnetCommandDecoder.java
index 478c18f..8dfd039 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/TelnetCommandDecoder.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/TelnetCommandDecoder.java
@@ -30,7 +30,7 @@ public class TelnetCommandDecoder {
                 String name = array[0];
                 String[] targetArgs = new String[array.length - 1];
                 System.arraycopy(array, 1, targetArgs, 0, array.length - 1);
-                commandContext = CommandContextFactory.newInstance(name, targetArgs, false);
+                commandContext = CommandContextFactory.newInstance( name, targetArgs,false);
                 commandContext.setOrginRequest(str);
             }
         }
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Quit.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Quit.java
index 84a82c7..9539db9 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Quit.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Quit.java
@@ -21,7 +21,7 @@ import org.apache.dubbo.qos.command.CommandContext;
 import org.apache.dubbo.qos.command.annotation.Cmd;
 import org.apache.dubbo.qos.common.QosConstants;
 
-@Cmd(name = "quit", summary = "quit telnet console")
+@Cmd(name = "quit",summary = "quit telnet console")
 public class Quit implements BaseCommand {
     @Override
     public String execute(CommandContext commandContext, String[] args) {
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/CommandHelper.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/CommandHelper.java
index ea9db7d..46da57b 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/CommandHelper.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/CommandHelper.java
@@ -37,7 +37,7 @@ public class CommandHelper {
 
     }
 
-    public static List<Class<?>> getAllCommandClass() {
+    public static List<Class<?>> getAllCommandClass(){
         final Set<String> commandList = ExtensionLoader.getExtensionLoader(BaseCommand.class).getSupportedExtensions();
         final List<Class<?>> classes = new ArrayList<Class<?>>();
 
@@ -50,10 +50,10 @@ public class CommandHelper {
     }
 
 
-    public static Class<?> getCommandClass(String commandName) {
-        if (hasCommand(commandName)) {
+    public static Class<?> getCommandClass(String commandName){
+        if (hasCommand(commandName)){
             return ExtensionLoader.getExtensionLoader(BaseCommand.class).getExtension(commandName).getClass();
-        } else {
+        }else {
             return null;
         }
     }
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/protocol/QosProtocolWrapper.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/protocol/QosProtocolWrapper.java
index a9b450e..05656f9 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/protocol/QosProtocolWrapper.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/protocol/QosProtocolWrapper.java
@@ -76,13 +76,13 @@ public class QosProtocolWrapper implements Protocol {
         }
 
         try {
-            boolean qosEnable = Boolean.parseBoolean(url.getParameter(QOS_ENABLE, "true"));
+            boolean qosEnable = Boolean.parseBoolean(url.getParameter(QOS_ENABLE,"true"));
             if (!qosEnable) {
                 return;
             }
 
-            int port = Integer.parseInt(url.getParameter(QOS_PORT, "22222"));
-            boolean acceptForeignIp = Boolean.parseBoolean(url.getParameter(ACCEPT_FOREIGN_IP, "true"));
+            int port = Integer.parseInt(url.getParameter(QOS_PORT,"22222"));
+            boolean acceptForeignIp = Boolean.parseBoolean(url.getParameter(ACCEPT_FOREIGN_IP,"true"));
             Server server = org.apache.dubbo.qos.server.Server.getInstance();
             server.setPort(port);
             server.setAcceptForeignIp(acceptForeignIp);
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/DubboLogo.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/DubboLogo.java
index 7200b57..e25613a 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/DubboLogo.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/DubboLogo.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.qos.server;
 
 public class DubboLogo {
     public static String dubbo =
-            "  ████████▄  ███    █▄  ▀█████████▄  ▀█████████▄   ▄██████▄  \n" +
+                    "  ████████▄  ███    █▄  ▀█████████▄  ▀█████████▄   ▄██████▄  \n" +
                     "  ███   ▀███ ███    ███   ███    ███   ███    ███ ███    ███ \n" +
                     "  ███    ███ ███    ███   ███    ███   ███    ███ ███    ███ \n" +
                     "  ███    ███ ███    ███  ▄███▄▄▄██▀   ▄███▄▄▄██▀  ███    ███ \n" +
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/LocalHostPermitHandler.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/LocalHostPermitHandler.java
index 65dccb8..2194b72 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/LocalHostPermitHandler.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/LocalHostPermitHandler.java
@@ -30,7 +30,7 @@ import java.net.InetSocketAddress;
 public class LocalHostPermitHandler extends ChannelHandlerAdapter {
 
     // true means to accept foreign IP
-    private boolean acceptForeignIp;
+    private  boolean acceptForeignIp;
 
     public LocalHostPermitHandler(boolean acceptForeignIp) {
         this.acceptForeignIp = acceptForeignIp;
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TTable.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TTable.java
index 7cdc72c..74372e5 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TTable.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TTable.java
@@ -411,7 +411,7 @@ public class TTable implements TComponent {
 
     /**
      * visible width for the given string.
-     * <p>
+     *
      * for example: "abc\n1234"'s width is 4.
      *
      * @param string the given string

-- 
To stop receiving notification emails like this one, please contact
iluo@apache.org.