Skip to content

Commit 6973bd2

Browse files
samshosamsho
committed
【Java】 update
1 parent dbecb59 commit 6973bd2

7 files changed

Lines changed: 50 additions & 81 deletions

File tree

‎Guava/Guava.iml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
<output-test url="file://$MODULE_DIR$/target/test-classes" />
66
<content url="file://$MODULE_DIR$">
77
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8-
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
9-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
108
<excludeFolder url="file://$MODULE_DIR$/target" />
119
</content>
1210
<orderEntry type="inheritedJdk" />

‎Guava/src/main/java/com.guava/base/ObjectsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static void test3() {
5151
* toStringHelper
5252
*/
5353
static void test4() {
54-
// Returns "ClassName{x=1}"
54+
// Presider{name=sam}
5555
System.out.println(MoreObjects.toStringHelper(Presider.class).add("name", "sam"));
5656

5757
// Returns "MyObject{x=1}"

‎Guava/src/main/java/com.guava/base/StringTest.java‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,44 +18,44 @@ public static void main(String[] args) {
1818
// test1();
1919
// test2();
2020
// test3();
21-
// test4();
21+
test4();
2222
// test5();
23-
test6();
23+
// test6();
2424
}
2525

2626
/**
2727
* Strings
2828
*/
2929
static void test1(){
30-
Strings.emptyToNull("");
31-
Strings.nullToEmpty("");
32-
Strings.isNullOrEmpty("");
30+
System.out.println(Strings.emptyToNull(""));//null
31+
System.out.println(Strings.nullToEmpty(null));
32+
System.out.println(Strings.isNullOrEmpty(""));//true
3333

3434

3535
// padStart("7", 3, '0') "007"
3636
// padStart("2010", 3, '0') "2010"
37-
Strings.padStart("7", 3, '0');
38-
Strings.padStart("2010", 3, '0');
37+
System.out.println(Strings.padStart("7", 3, '0'));//007
38+
System.out.println(Strings.padStart("2010", 3, '0'));//2010
3939

4040
// padEnd("4.", 5, '0') "4.000"
41-
// padEnd("2010", 3, '!') "2010"
42-
Strings.padEnd("4.", 5, '0');
43-
Strings.padEnd("2010.", 5, '0');
41+
// padEnd("2010", 3, '!') "2010."
42+
System.out.println(Strings.padEnd("4.", 5, '0'));//4.000
43+
System.out.println(Strings.padEnd("2010.", 6, '0'));//2010.0
4444
}
4545

4646
/**
4747
* Splitter
4848
*
4949
*/
5050
static void test2(){
51-
System.out.println(Splitter.on(',').split("foo,bar,qux"));
52-
System.out.println(Splitter.on(',').splitToList("foo,bar,qux"));
51+
System.out.println(Splitter.on(',').split("foo,bar,qux"));//[foo, bar, qux]
52+
System.out.println(Splitter.on(',').splitToList("foo,bar,qux"));//[foo, bar, qux]
5353

5454
System.out.println(Splitter.on(',')
5555
.trimResults()//移除结果字符串的前导空白和尾部空白
5656
.omitEmptyStrings()//从结果中自动忽略空字符串
5757
.limit(2)//限制拆分出的字符串数量
58-
.split("foo,bar,, qux"));
58+
.split("foo,bar,, qux"));//[foo, bar,, qux]
5959

6060
Lists.newArrayList(Splitter.on(',').split("foo,bar,qux"));
6161
}
@@ -85,13 +85,19 @@ static void test3(){
8585
static void test4(){
8686

8787
String noControl = CharMatcher.JAVA_ISO_CONTROL.removeFrom(""); //移除control字符
88-
String theDigits = CharMatcher.DIGIT.retainFrom(""); //只保留数字字符
88+
String theDigits = CharMatcher.DIGIT.retainFrom("a10,er,kk;45"); //只保留数字字符
89+
System.out.println(theDigits);//1045
8990

9091
//去除两端的空格，并把中间的连续空格替换成单个空格
91-
String spaced = CharMatcher.WHITESPACE.trimAndCollapseFrom("", ' ');
92-
String noDigits = CharMatcher.JAVA_DIGIT.replaceFrom("", "*"); //用*号替换所有数字
92+
String spaced = CharMatcher.WHITESPACE.trimAndCollapseFrom(" hello trim nijij ", ' ');
93+
System.out.println(spaced);//hello trim nijij
94+
95+
String noDigits = CharMatcher.JAVA_DIGIT.replaceFrom("df1f23gh45ghj6fgh", "*"); //用*号替换所有数字
96+
System.out.println(noDigits);//df*f**gh**ghj*fgh
97+
9398
// 只保留数字和小写字母
94-
String lowerAndDigit = CharMatcher.JAVA_DIGIT.or(CharMatcher.JAVA_LOWER_CASE).retainFrom("");
99+
String lowerAndDigit = CharMatcher.JAVA_DIGIT.or(CharMatcher.JAVA_LOWER_CASE).retainFrom("AAAabfh17665jhhsAAAGHJ");
100+
System.out.println(lowerAndDigit);//abfh17665jhhs
95101
}
96102

97103
/**

‎Guava/src/main/java/com.guava/cache/CacheTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,6 @@ static void test5() {
226226
比如，遍历Cache.asMap().entrySet()不会重置缓存项的读取时间。
227227
**/
228228
cache.asMap().values();
229-
230-
231-
232229
}
233230

234231

‎Guava/src/main/java/com.guava/collect/immutable/ImmutableTest.java‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public static void main(String[] args) {
2020
// test1();
2121
// test2();
2222
test3();
23+
// test4();
2324
}
2425

2526
/**
@@ -35,31 +36,34 @@ public static void test1() {
3536
list.add("a");
3637
list.add("b");
3738
list.add("c");
38-
System.out.println("list：" + list);
39+
System.out.println("list：" + list);//list：[a, b, c]
3940

41+
// 用copyOf方法
4042
ImmutableList<String> imlist = ImmutableList.copyOf(list);//defensive copy
41-
System.out.println("imlist：" + imlist);
43+
System.out.println("imlist：" + imlist);//imlist：[a, b, c]
4244

45+
// 使用of方法
4346
ImmutableList<String> imOflist = ImmutableList.of("peida", "jerry", "harry");
44-
System.out.println("imOflist：" + imOflist);
45-
47+
System.out.println("imOflist：" + imOflist);//imOflist：[peida, jerry, harry]
48+
// 对有序不可变集合来说
4649
ImmutableSortedSet<String> imSortList = ImmutableSortedSet.of("a", "b", "c", "a", "d", "b");
47-
System.out.println("imSortList：" + imSortList);
50+
System.out.println("imSortList：" + imSortList);//imSortList：[a, b, c, d]
4851

4952
list.add("baby");
50-
System.out.println("list add a item after list:" + list);
51-
System.out.println("list add a item after imlist:" + imlist);
53+
System.out.println("list add a item after list:" + list);//[a, b, c, baby]
54+
System.out.println("list add a item after imlist:" + imlist);//[a, b, c],不可变
5255

5356
list.clear();
54-
System.out.println("list add a item after list:" + list);
55-
System.out.println("list add a item after imlist:" + imlist);
57+
System.out.println("list add a item after list:" + list);//[]
58+
System.out.println("list add a item after imlist:" + imlist);//[a, b, c]
5659

60+
// 使用Builder类
5761
ImmutableSet<Color> imColorSet = ImmutableSet.<Color>builder()
5862
.add(new Color(0, 255, 255))
5963
.add(new Color(0, 191, 255))
6064
.build();
6165

62-
System.out.println("imColorSet:" + imColorSet);
66+
System.out.println("imColorSet:" + imColorSet);//[java.awt.Color[r=0,g=255,b=255], java.awt.Color[r=0,g=191,b=255]]
6367
}
6468

6569
public static void test2() {
@@ -70,13 +74,10 @@ public static void test2() {
7074

7175
ImmutableList<String> imlist = ImmutableList.copyOf(list);//defensive copy
7276

73-
System.out.println(imlist.get(1));
74-
System.out.println(imlist.asList());
75-
System.out.println(imlist.asList().get(2));
76-
System.out.println(imlist.reverse().asList());
77-
78-
79-
77+
System.out.println(imlist.get(1));//b
78+
System.out.println(imlist.asList());//[a, b, c]
79+
System.out.println(imlist.asList().get(2));//c
80+
System.out.println(imlist.reverse().asList());//[c, b, a]
8081
}
8182

8283
public static void test3() {
@@ -87,12 +88,16 @@ public static void test3() {
8788
.add("c")
8889
.add("b")
8990
.build();
90-
System.out.println("imColorSet:" + imColorSet);
91-
System.out.println(imColorSet.asList().get(2));// set转成list
91+
System.out.println("imColorSet:" + imColorSet);//imColorSet:[a, f, d, c, b]
92+
System.out.println(imColorSet.asList().get(2));// set转成list,d
9293
}
9394

95+
/**
96+
* 对有序不可变集合来说
97+
*/
9498
public static void test4() {
95-
99+
ImmutableSortedSet<String> sortedSet = ImmutableSortedSet.of("a", "b", "c", "a", "d", "b");
100+
System.out.println(sortedSet);//[a, b, c, d]
96101
}
97102

98103
}

‎SpringStudy/SpringStudy.iml‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3-
<component name="FacetManager">
4-
<facet type="web" name="Web">
5-
<configuration>
6-
<descriptors>
7-
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
8-
</descriptors>
9-
<webroots>
10-
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
11-
</webroots>
12-
<sourceRoots>
13-
<root url="file://$MODULE_DIR$/src/main/java" />
14-
<root url="file://$MODULE_DIR$/src/main/resources" />
15-
</sourceRoots>
16-
</configuration>
17-
</facet>
18-
<facet type="Spring" name="Spring">
19-
<configuration>
20-
<fileset id="fileset" name="Spring Application Context" removed="false">
21-
<file>file://$MODULE_DIR$/src/main/resources/spring/applicationContext.xml</file>
22-
<file>file://$MODULE_DIR$/src/main/resources/spring/spring-beans.xml</file>
23-
<file>file://$MODULE_DIR$/src/main/resources/spring/spring-mvc.xml</file>
24-
</fileset>
25-
</configuration>
26-
</facet>
27-
</component>
283
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
294
<output url="file://$MODULE_DIR$/target/classes" />
305
<output-test url="file://$MODULE_DIR$/target/test-classes" />
316
<content url="file://$MODULE_DIR$">
327
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
338
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
34-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
359
<excludeFolder url="file://$MODULE_DIR$/target" />
3610
</content>
3711
<orderEntry type="inheritedJdk" />
3812
<orderEntry type="sourceFolder" forTests="false" />
39-
<orderEntry type="module-library">
40-
<library name="JUnit4">
41-
<CLASSES>
42-
<root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.11.jar!/" />
43-
<root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
44-
<root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-library-1.3.jar!/" />
45-
</CLASSES>
46-
<JAVADOC />
47-
<SOURCES />
48-
</library>
49-
</orderEntry>
5013
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
5114
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
5215
<orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />

‎SpringStudy/src/main/resources/log4j2.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Configuration>
33
<Properties>
4-
<Property name="log.dir">/data/logs/JavaStudy/SpringStudy</Property>
4+
<Property name="log.dir">/myLogs/JavaStudy/SpringStudy</Property>
55
</Properties>
66

77
<Appenders>

0 commit comments

Comments
 (0)