Skip to content

Commit f5c2658

Browse files
authored
Merge pull request #381 from sxci/format
update code format
2 parents 70e72cf + 63a383a commit f5c2658

File tree

17 files changed

+105
-97
lines changed

17 files changed

+105
-97
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ jdk:
88

99
before_script:
1010
- export QINIU_TEST_ENV="travis"
11+
12+
script:
13+
- ./gradlew --info clean check

config/checkstyle/checkstyle.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE module PUBLIC
3-
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
4-
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
3+
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
4+
"https://checkstyle.org/dtds/configuration_1_3.dtd">
55

66
<module name="Checker">
77
<module name="NewlineAtEndOfFile"/>
@@ -113,7 +113,9 @@
113113
<!--module name="InnerAssignment"/-->
114114
<!--module name="MagicNumber"/-->
115115
<!--module name="MissingSwitchDefault"/-->
116-
<module name="RedundantThrows"/>
116+
<module name="RedundantThrows">
117+
<property name="suppressLoadErrors" value="true"/>
118+
</module>
117119
<module name="SimplifyBooleanExpression"/>
118120
<module name="SimplifyBooleanReturn"/>
119121

libs/okhttp-2.3.0-SNAPSHOT.jar

-309 KB
Binary file not shown.

libs/okio-1.3.0-SNAPSHOT.jar

-56.5 KB
Binary file not shown.

src/main/java/com/qiniu/rtc/RtcRoomManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public RtcRoomManager(Auth auth) {
1818
this(auth, "http://rtc.qiniuapi.com");
1919
}
2020

21-
public RtcRoomManager(Auth auth, String host) {
21+
public RtcRoomManager(Auth auth, String host) {
2222
this.auth = auth;
2323
this.host = host;
2424
client = new Client();

src/main/java/com/qiniu/storage/BucketManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,8 @@ public BucketInfo getBucketInfo(String bucket) throws QiniuException {
522522

523523

524524
public void setIndexPage(String bucket, IndexPageType type) throws QiniuException {
525-
String url = String.format("%s/noIndexPage?bucket=%s&noIndexPage=%s", configuration.ucHost(), bucket, type.getType());
525+
String url = String.format("%s/noIndexPage?bucket=%s&noIndexPage=%s",
526+
configuration.ucHost(), bucket, type.getType());
526527
Response res = post(url, null);
527528
}
528529

src/test/java/com/qiniu/common/AutoZoneTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.qiniu.common;
22

3-
import test.com.qiniu.TestConfig;
43
import junit.framework.TestCase;
54
import org.junit.Assert;
65
import org.junit.Test;
6+
import test.com.qiniu.TestConfig;
77

88
import java.util.HashMap;
99
import java.util.Map;

src/test/java/test/com/qiniu/DnsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import java.net.InetAddress;
1616
import java.net.UnknownHostException;
1717
import java.util.ArrayList;
18-
import java.util.List;
1918
import java.util.Collections;
19+
import java.util.List;
2020

2121
// example
2222
public class DnsTest {

0 commit comments

Comments
 (0)