reformat codes

dunwu · dunwu · commit cc13ef4bf29b · 2019-10-24T18:11:06.000+08:00
diff --git a/codes/javalib/bean/src/main/java/io/github/dunwu/javalib/bean/Company.java b/codes/javalib/bean/src/main/java/io/github/dunwu/javalib/bean/Company.java
@@ -1,8 +1,9 @@
 package io.github.dunwu.javalib.bean;
 
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Lombok 示例
  *
diff --git a/codes/javalib/bean/src/test/java/io/github/dunwu/javalib/bean/LombokTest.java b/codes/javalib/bean/src/test/java/io/github/dunwu/javalib/bean/LombokTest.java
@@ -1,12 +1,13 @@
 package io.github.dunwu.javalib.bean;
 
+import lombok.Cleanup;
+import org.junit.Assert;
+import org.junit.Test;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import lombok.Cleanup;
-import org.junit.Assert;
-import org.junit.Test;
 
 /**
  * Lombok 单元测试
diff --git a/codes/javalib/json/src/test/java/io/github/dunwu/javalib/json/fastjson/FastjsonAnnotationBean.java b/codes/javalib/json/src/test/java/io/github/dunwu/javalib/json/fastjson/FastjsonAnnotationBean.java
@@ -1,6 +1,7 @@
 package io.github.dunwu.javalib.json.fastjson;
 
 import com.alibaba.fastjson.annotation.JSONField;
+
 import java.util.Date;
 
 /**
diff --git a/codes/javalib/json/src/test/java/io/github/dunwu/javalib/json/fastjson/FastjsonTests.java b/codes/javalib/json/src/test/java/io/github/dunwu/javalib/json/fastjson/FastjsonTests.java
@@ -2,10 +2,11 @@
 
 import com.alibaba.fastjson.JSON;
 import io.github.dunwu.javalib.json.Person;
-import java.util.Date;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.Date;
+
 /**
  * Fastjson 使用示例
  *
diff --git a/codes/javalib/json/src/test/java/io/github/dunwu/javalib/json/jackson/JacksonTests.java b/codes/javalib/json/src/test/java/io/github/dunwu/javalib/json/jackson/JacksonTests.java
@@ -3,13 +3,14 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.github.dunwu.javalib.json.Person;
+import org.junit.Assert;
+import org.junit.Test;
+
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Test;
 
 /**
  * Jackson 使用示例
diff --git a/codes/javalib/mvel/src/main/java/io/github/dunwu/javalib/mvel/DefaultRuleEngine.java b/codes/javalib/mvel/src/main/java/io/github/dunwu/javalib/mvel/DefaultRuleEngine.java
@@ -1,12 +1,13 @@
 package io.github.dunwu.javalib.mvel;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class DefaultRuleEngine implements RuleEngine {
 
diff --git a/codes/javalib/mvel/src/main/java/io/github/dunwu/javalib/mvel/MvelRule.java b/codes/javalib/mvel/src/main/java/io/github/dunwu/javalib/mvel/MvelRule.java
@@ -1,8 +1,9 @@
 package io.github.dunwu.javalib.mvel;
 
-import java.io.Serializable;
 import org.mvel2.MVEL;
 
+import java.io.Serializable;
+
 public class MvelRule extends BasicRule {
 
 	/**
diff --git a/codes/javalib/mvel/src/test/java/io/github/dunwu/javalib/mvel/ClassTests.java b/codes/javalib/mvel/src/test/java/io/github/dunwu/javalib/mvel/ClassTests.java
@@ -1,13 +1,14 @@
 package io.github.dunwu.javalib.mvel;
 
+import org.junit.Assert;
+import org.junit.Test;
+import org.mvel2.MVEL;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Assert;
-import org.junit.Test;
-import org.mvel2.MVEL;
 
 /**
  * @author Mike Brock
diff --git a/codes/javalib/mvel/src/test/java/io/github/dunwu/javalib/mvel/SalaryRuleTest.java b/codes/javalib/mvel/src/test/java/io/github/dunwu/javalib/mvel/SalaryRuleTest.java
@@ -1,15 +1,16 @@
 package io.github.dunwu.javalib.mvel;
 
 import com.alibaba.fastjson.JSON;
-import java.io.File;
-import java.io.IOException;
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
+
 import static org.junit.Assert.assertEquals;
 
 public class SalaryRuleTest {
diff --git a/codes/javalib/office/src/main/java/io/github/dunwu/javalib/office/WordUtil.java b/codes/javalib/office/src/main/java/io/github/dunwu/javalib/office/WordUtil.java
@@ -1,16 +1,17 @@
 package io.github.dunwu.javalib.office;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import org.apache.poi.hpsf.DocumentSummaryInformation;
 import org.apache.poi.hpsf.SummaryInformation;
 import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.ooxml.POIXMLProperties;
 import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
 import org.apache.poi.xwpf.usermodel.*;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
 /**
  * @author Zhang Peng
  * @see <a href="https://poi.apache.org/">https://poi.apache.org/</a>
diff --git a/codes/javalib/office/src/test/java/io/github/dunwu/javalib/office/WordUtilTest.java b/codes/javalib/office/src/test/java/io/github/dunwu/javalib/office/WordUtilTest.java
@@ -1,8 +1,9 @@
 package io.github.dunwu.javalib.office;
 
+import org.junit.Test;
+
 import java.io.File;
 import java.io.IOException;
-import org.junit.Test;
 
 /**
  * @author Zhang Peng
diff --git a/codes/javalib/test/src/test/java/io/github/dunwu/javalib/junit5/DynamicTests.java b/codes/javalib/test/src/test/java/io/github/dunwu/javalib/junit5/DynamicTests.java
@@ -1,13 +1,14 @@
 package io.github.dunwu.javalib.junit5;
 
-import java.util.function.Function;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
 import org.junit.jupiter.api.DynamicNode;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.jupiter.api.function.ThrowingConsumer;
 
+import java.util.function.Function;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.DynamicContainer.dynamicContainer;
 import static org.junit.jupiter.api.DynamicTest.dynamicTest;
diff --git a/codes/javalib/test/src/test/java/io/github/dunwu/javalib/junit5/NestedTests.java b/codes/javalib/test/src/test/java/io/github/dunwu/javalib/junit5/NestedTests.java
@@ -1,12 +1,13 @@
 package io.github.dunwu.javalib.junit5;
 
-import java.util.EmptyStackException;
-import java.util.Stack;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
+import java.util.EmptyStackException;
+import java.util.Stack;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 @DisplayName("A stack")
diff --git a/codes/javalib/test/src/test/java/io/github/dunwu/javalib/mockito/MockitoTest.java b/codes/javalib/test/src/test/java/io/github/dunwu/javalib/mockito/MockitoTest.java
@@ -1,11 +1,12 @@
 package io.github.dunwu.javalib.mockito;
 
-import java.util.LinkedList;
-import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InOrder;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import static org.mockito.Mockito.*;
 
 class MockitoTest {
diff --git a/codes/javatool/examples/src/main/java/io/github/dunwu/javatool/ElasticDemo.java b/codes/javatool/examples/src/main/java/io/github/dunwu/javatool/ElasticDemo.java
@@ -1,10 +1,11 @@
 package io.github.dunwu.javatool;
 
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 /**
  * 向 Elastic 日志中心传输日志 Logback logstash-logback-encoder jar 包会根据 logback 中的配置，将日志数据定向传输到 logstash 详见
  * src/main/resources/logback.xml appender 配置 使用 udp 方式传输时，有丢失日志的情况（ELK-UDP） 使用 tcp 方式传输时，不会丢失日志（ELK-TCP） Log4j 通过
diff --git a/codes/javatool/server/src/main/java/io/github/dunwu/javatool/server/SimpleTomcatServer.java b/codes/javatool/server/src/main/java/io/github/dunwu/javatool/server/SimpleTomcatServer.java
@@ -1,8 +1,9 @@
 package io.github.dunwu.javatool.server;
 
-import java.util.Optional;
 import org.apache.catalina.startup.Tomcat;
 
+import java.util.Optional;
+
 /**
  * 简单的嵌入式 Tomcat 启动类 启动后可访问 http://localhost:8080/javatool-server/
  *
diff --git a/codes/javatool/server/src/main/java/io/github/dunwu/javatool/server/TomcatServer.java b/codes/javatool/server/src/main/java/io/github/dunwu/javatool/server/TomcatServer.java
@@ -1,6 +1,5 @@
 package io.github.dunwu.javatool.server;
 
-import java.io.File;
 import org.apache.catalina.Server;
 import org.apache.catalina.startup.Catalina;
 import org.apache.catalina.startup.Tomcat;
@@ -10,6 +9,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.util.StringUtils;
 
+import java.io.File;
+
 public class TomcatServer {
 
 	private static final Logger log = LoggerFactory.getLogger(TomcatServer.class);
diff --git a/codes/javatool/server/src/main/resources/properties/application-develop.properties b/codes/javatool/server/src/main/resources/properties/application-develop.properties
@@ -1,11 +1,11 @@
 # jdbc
-jdbc.driver=
-jdbc.url=
-jdbc.username=
-jdbc.password=
+jdbc.driver =
+jdbc.url =
+jdbc.username =
+jdbc.password =
 # redis
-redis.name=
-redis.host=
-redis.port=
-redis.password=
-redis.database=
+redis.name =
+redis.host =
+redis.port =
+redis.password =
+redis.database =
diff --git a/codes/javatool/server/src/main/resources/properties/application-test.properties b/codes/javatool/server/src/main/resources/properties/application-test.properties
@@ -1,11 +1,11 @@
 # jdbc
-jdbc.driver=
-jdbc.url=
-jdbc.username=
-jdbc.password=
+jdbc.driver =
+jdbc.url =
+jdbc.username =
+jdbc.password =
 # redis
-redis.name=
-redis.host=
-redis.port=
-redis.password=
-redis.database=
+redis.name =
+redis.host =
+redis.port =
+redis.password =
+redis.database =

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`package io.github.dunwu.javalib.bean;`
`2`	`2`
`3`		`-import java.util.List;`
`4`	`3`	`import lombok.Data;`
`5`	`4`
	`5`	`+import java.util.List;`
	`6`	`+`
`6`	`7`	`/**`
`7`	`8`	`* Lombok 示例`
`8`	`9`	`*`