beiwei30 closed pull request #1948: reformat the code style
URL: https://github.com/apache/incubator-dubbo/pull/1948
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 ac9a3fede8..d0652eb64f 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 @@
@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 744a8c6dac..5081baffa1 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 CommandContext(String commandName) {
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 7f3ce9a13c..5cc3b5d6e3 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 342f256de1..469996e018 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 String execute(CommandContext commandContext) throws
NoSuchCommandExcepti
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 5a16a136e0..8059fef9dd 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 static CommandContext decode(HttpRequest request) {
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 static CommandContext decode(HttpRequest request) {
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 8dfd039a1d..478c18fd4a 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 static final CommandContext decode(String str) {
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 9539db9dea..84a82c7ea5 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.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 46da57b776..ea9db7d354 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 static boolean hasCommand(String commandName) {
}
- 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 static boolean hasCommand(String commandName) {
}
- 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 05656f9ae6..a9b450ef43 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 @@ private void startQosServer(URL url) {
}
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 e25613a160..7200b578e1 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 @@
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 2194b728e0..65dccb89ac 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 @@
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 74372e5c57..7cdc72ca54 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 @@ private static String replaceTab(String string) {
/**
* visible width for the given string.
- *
+ * <p>
* for example: "abc\n1234"'s width is 4.
*
* @param string the given string
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
