Skip to content

Commit 21e7b06

Browse files
dunwudunwu
committed
format codes
1 parent d33c95e commit 21e7b06

File tree

76 files changed

+3463
-2476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+3463
-2476
lines changed

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
> :coffee: Java Tutorial 是本人在 Java 技术领域的十年积累。
44
>
5-
> - :repeat: 项目同步维护：[Github](https://github.com/dunwu/java-tutorial/) | [Gitee](https://gitee.com/turnon/java-tutorial/)
6-
> - :book: 电子书阅读：[Github Pages](https://dunwu.github.io/java-tutorial/) | [Gitee Pages](https://turnon.gitee.io/java-tutorial/)
5+
> - 🔁 项目同步维护：[Github](https://github.com/dunwu/java-tutorial/) | [Gitee](https://gitee.com/turnon/java-tutorial/)
6+
> - 📖 电子书阅读：[Github Pages](https://dunwu.github.io/java-tutorial/) | [Gitee Pages](https://turnon.gitee.io/java-tutorial/)
77
88
## [JavaCore 教程](https://dunwu.github.io/javacore/)
99

@@ -46,6 +46,7 @@
4646
- [Maven 教程之 settings.xml 详解](docs/javatool/build/maven/maven-settings.md)
4747
- [Maven 实战问题和最佳实践](docs/javatool/build/maven/maven-action.md)
4848
- [Maven 教程之发布 jar 到私服或中央仓库](docs/javatool/build/maven/maven-deploy.md)
49+
- [Maven 插件之代码检查](docs/javatool/build/maven/plugins/maven-checkstyle.md)
4950
- [Ant 简易教程](docs/javatool/build/ant.md)
5051
- Java IDE
5152

‎codes/javalib/bean/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
2-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
3-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>io.github.dunwu.javalib</groupId>

‎codes/javalib/bean/src/main/java/io/github/dunwu/javalib/bean/Company.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
package io.github.dunwu.javalib.bean;
22

3-
import java.util.List;
4-
53
import lombok.Data;
6-
import lombok.NonNull;
4+
5+
import java.util.List;
76

87
/**
98
* Lombok 示例
9+
*
1010
* @see http://jnb.ociweb.com/jnb/jnbJan2010.html
1111
* @author Zhang Peng
1212
*/
1313
@Data(staticConstructor = "of")
1414
public class Company {
15-
private final Person founder;
16-
private String name;
17-
protected List<Person> employees;
15+
16+
private final Person founder;
17+
protected List<Person> employees;
18+
private String name;
19+
1820
}

‎codes/javalib/bean/src/main/java/io/github/dunwu/javalib/bean/Person.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,19 @@
66

77
/**
88
* Lombok 示例
9+
*
910
* @see http://jnb.ociweb.com/jnb/jnbJan2010.html
1011
* @author Zhang Peng
1112
*/
1213
@Data
1314
@ToString(exclude = "age")
1415
@EqualsAndHashCode(exclude = { "age", "sex" })
1516
public class Person {
16-
private String name;
17-
private Integer age;
18-
private String sex;
17+
18+
private String name;
19+
20+
private Integer age;
21+
22+
private String sex;
23+
1924
}

‎codes/javalib/bean/src/test/java/io/github/dunwu/javalib/bean/LombokTest.java‎

Lines changed: 72 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,95 @@
11
package io.github.dunwu.javalib.bean;
22

3+
import lombok.Cleanup;
4+
import org.junit.Assert;
5+
import org.junit.Test;
6+
37
import java.io.ByteArrayOutputStream;
48
import java.io.IOException;
59
import java.util.ArrayList;
610
import java.util.List;
711

8-
import org.junit.Assert;
9-
import org.junit.Test;
10-
11-
import lombok.Cleanup;
12-
1312
/**
1413
* Lombok 单元测试
14+
*
1515
* @see @see http://jnb.ociweb.com/jnb/jnbJan2010.html
1616
* @author Zhang Peng
1717
*/
1818
public class LombokTest {
19-
@Test
20-
public void testData() {
21-
Person huangshiren = new Person();
22-
huangshiren.setName("黄世仁");
23-
huangshiren.setAge(30);
24-
huangshiren.setSex("男");
25-
Person yangbailao = new Person();
26-
yangbailao.setName("杨白劳");
27-
yangbailao.setAge(50);
28-
yangbailao.setSex("男");
29-
Person xiaobaicai = new Person();
30-
xiaobaicai.setName("小白菜");
31-
xiaobaicai.setAge(20);
32-
xiaobaicai.setSex("女");
3319

34-
List<Person> personList = new ArrayList<>();
35-
personList.add(yangbailao);
36-
personList.add(xiaobaicai);
20+
@Test
21+
public void testData() {
22+
Person huangshiren = new Person();
23+
huangshiren.setName("黄世仁");
24+
huangshiren.setAge(30);
25+
huangshiren.setSex("男");
26+
Person yangbailao = new Person();
27+
yangbailao.setName("杨白劳");
28+
yangbailao.setAge(50);
29+
yangbailao.setSex("男");
30+
Person xiaobaicai = new Person();
31+
xiaobaicai.setName("小白菜");
32+
xiaobaicai.setAge(20);
33+
xiaobaicai.setSex("女");
34+
35+
List<Person> personList = new ArrayList<>();
36+
personList.add(yangbailao);
37+
personList.add(xiaobaicai);
38+
39+
Company company = Company.of(huangshiren);
40+
company.setName("黑心农产品公司");
41+
company.setEmployees(personList);
3742

38-
Company company = Company.of(huangshiren);
39-
company.setName("黑心农产品公司");
40-
company.setEmployees(personList);
43+
System.out.println("公司名：" + company.getName());
44+
System.out.println("创始人：" + company.getFounder());
45+
System.out.println("员工信息");
46+
company.getEmployees().forEach(person -> {
47+
System.out.println(person.toString());
48+
});
49+
}
4150

42-
System.out.println("公司名：" + company.getName());
43-
System.out.println("创始人：" + company.getFounder());
44-
System.out.println("员工信息");
45-
company.getEmployees().forEach(person -> {
46-
System.out.println(person.toString());
47-
});
48-
}
51+
@Test
52+
public void testCleanUp() {
53+
try {
54+
@Cleanup
55+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
56+
baos.write(new byte[] { 'Y', 'e', 's' });
57+
System.out.println(baos.toString());
58+
}
59+
catch (IOException e) {
60+
e.printStackTrace();
61+
}
62+
}
4963

50-
@Test
51-
public void testCleanUp() {
52-
try {
53-
@Cleanup
54-
ByteArrayOutputStream baos = new ByteArrayOutputStream();
55-
baos.write(new byte[] { 'Y', 'e', 's' });
56-
System.out.println(baos.toString());
57-
} catch (IOException e) {
58-
e.printStackTrace();
59-
}
60-
}
64+
@Test
65+
public void testToString() {
66+
Person person = new Person();
67+
person.setName("张三");
68+
person.setAge(20);
69+
person.setSex("男");
70+
System.out.println(person.toString());
71+
// output: Person(name=张三, sex=男)
72+
}
6173

62-
@Test
63-
public void testToString() {
64-
Person person = new Person();
65-
person.setName("张三");
66-
person.setAge(20);
67-
person.setSex("男");
68-
System.out.println(person.toString());
69-
// output: Person(name=张三, sex=男)
70-
}
74+
@Test
75+
public void testEqualsAndHashCode() {
76+
Person person = new Person();
77+
person.setName("张三");
78+
person.setAge(20);
79+
person.setSex("男");
7180

72-
@Test
73-
public void testEqualsAndHashCode() {
74-
Person person = new Person();
75-
person.setName("张三");
76-
person.setAge(20);
77-
person.setSex("男");
81+
Person person2 = new Person();
82+
person2.setName("张三");
83+
person2.setAge(18);
84+
person2.setSex("男");
7885

79-
Person person2 = new Person();
80-
person2.setName("张三");
81-
person2.setAge(18);
82-
person2.setSex("男");
86+
Person person3 = new Person();
87+
person3.setName("李四");
88+
person3.setAge(20);
89+
person3.setSex("男");
8390

84-
Person person3 = new Person();
85-
person3.setName("李四");
86-
person3.setAge(20);
87-
person3.setSex("男");
91+
Assert.assertEquals(person, person2);
92+
Assert.assertNotEquals(person, person3);
93+
}
8894

89-
Assert.assertEquals(person, person2);
90-
Assert.assertNotEquals(person, person3);
91-
}
9295
}

‎codes/javalib/bean/src/test/java/io/github/dunwu/javalib/test/JUnitTest.java‎

Lines changed: 54 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,72 @@
11
package io.github.dunwu.javalib.test;
22

3-
import org.junit.After;
4-
import org.junit.AfterClass;
5-
import org.junit.Assert;
6-
import org.junit.Before;
7-
import org.junit.BeforeClass;
8-
import org.junit.FixMethodOrder;
9-
import org.junit.Ignore;
10-
import org.junit.Test;
3+
import org.junit.*;
114
import org.junit.runners.MethodSorters;
125

136
/**
147
* JUnit 使用示例。 请注意各个方法的执行顺序。
8+
*
159
* @author Zhang Peng
1610
*/
1711
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
1812
public class JUnitTest {
19-
/**
20-
* @BeforeClass 注解指出这是附着在静态方法必须执行一次并在类的所有测试之前。 一般用于共享配置方法(如连接到数据库)。
21-
*/
22-
@BeforeClass
23-
public static void beforeClass() {
24-
System.out.println("call @BeforeClass");
25-
}
2613

27-
/**
28-
* @Before 注解修饰的方法必须在类中的每个测试之前执行，以便执行测试某些必要的先决条件。
29-
*/
30-
@Before
31-
public void before() {
32-
System.out.println("call @Before");
33-
}
14+
/**
15+
* @BeforeClass 注解指出这是附着在静态方法必须执行一次并在类的所有测试之前。 一般用于共享配置方法(如连接到数据库)。
16+
*/
17+
@BeforeClass
18+
public static void beforeClass() {
19+
System.out.println("call @BeforeClass");
20+
}
3421

35-
@Test
36-
public void testA() {
37-
System.out.println("call @Test testA");
38-
int sum = 1 + 2 + 3;
39-
Assert.assertEquals(6, sum);
40-
}
22+
/**
23+
* 当需要执行所有的测试在JUnit测试用例类后执行，@AfterClass注解可以使用以清理建立方法，(从数据库如断开连接)。
24+
* 注意：附有此批注(类似于BeforeClass)的方法必须定义为静态。
25+
*/
26+
@AfterClass
27+
public static void afterClass() {
28+
System.out.println("call @AfterClass");
29+
}
4130

42-
@Test
43-
public void testC() {
44-
System.out.println("call @Test testC");
45-
}
31+
/**
32+
* @Before 注解修饰的方法必须在类中的每个测试之前执行，以便执行测试某些必要的先决条件。
33+
*/
34+
@Before
35+
public void before() {
36+
System.out.println("call @Before");
37+
}
4638

47-
@Test
48-
public void testB() {
49-
System.out.println("call @Test testB");
50-
}
39+
@Test
40+
public void testA() {
41+
System.out.println("call @Test testA");
42+
int sum = 1 + 2 + 3;
43+
Assert.assertEquals(6, sum);
44+
}
5145

52-
/**
53-
* @After 注解修饰的方法在执行每项测试后执行(如执行每一个测试后重置某些变量，删除临时变量等)
54-
*/
55-
@After
56-
public void after() {
57-
System.out.println("call @After");
58-
}
46+
@Test
47+
public void testC() {
48+
System.out.println("call @Test testC");
49+
}
5950

60-
/**
61-
* 当需要执行所有的测试在JUnit测试用例类后执行，@AfterClass注解可以使用以清理建立方法，(从数据库如断开连接)。 注意：附有此批注(类似于BeforeClass)的方法必须定义为静态。
62-
*/
63-
@AfterClass
64-
public static void afterClass() {
65-
System.out.println("call @AfterClass");
66-
}
51+
@Test
52+
public void testB() {
53+
System.out.println("call @Test testB");
54+
}
55+
56+
/**
57+
* @After 注解修饰的方法在执行每项测试后执行(如执行每一个测试后重置某些变量，删除临时变量等)
58+
*/
59+
@After
60+
public void after() {
61+
System.out.println("call @After");
62+
}
63+
64+
/**
65+
* 当想暂时禁用特定的测试执行可以使用忽略注释。每个被注解为@Ignore的方法将不被执行。
66+
*/
67+
@Ignore
68+
public void ignore() {
69+
System.out.println("call @Ignore");
70+
}
6771

68-
/**
69-
* 当想暂时禁用特定的测试执行可以使用忽略注释。每个被注解为@Ignore的方法将不被执行。
70-
*/
71-
@Ignore
72-
public void ignore() {
73-
System.out.println("call @Ignore");
74-
}
7572
}

‎codes/javalib/json/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
2-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
3-
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
44
<modelVersion>4.0.0</modelVersion>
55

66
<groupId>io.github.dunwu.javalib</groupId>

0 commit comments

Comments
 (0)