Skip to content

Commit cc5a154

Browse files
author
admin
committed
fix CI conflit
2 parents 86b6d80 + f961b7a commit cc5a154

Some content is hidden

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

77 files changed

+2311
-756
lines changed

‎CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,32 @@
11
#Changelog
22

3+
## 7.2.1 (2016-11-03)
4+
### 修正
5+
* streaming publish url 过期时间单位问题
6+
7+
## 7.2.0 (2016-11-02)
8+
### 增加
9+
* 为多存储区 增加 autozone, zone2
10+
* 整合 cdn 刷新
11+
* 整合 streaming 服务端SDK
12+
13+
## 7.1.3 (2016-09-02)
14+
### 增加
15+
* 下载方法
16+
* 支持x:foo变量
17+
* batch 增加force
18+
* host first
19+
20+
## 7.1.2 (2016-07-14)
21+
### 增加
22+
* 内部dns 解析支持
23+
* proxy 支持
24+
* add String[] commonPrefixes in FileListing
25+
26+
## 7.1.1 (2016-06-27)
27+
### 修正
28+
* 断点上传,skip 已上传部分
29+
330
## 7.1.0 (2016-04-27)
431
### 增加
532
* 升级到okhttp3, 升级次版本号。

‎build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ apply plugin: 'java'
55
sourceCompatibility = 1.7
66
targetCompatibility = 1.7
77
version = '1.0'
8-
[compileJava,compileTestJava,javadoc]*.options*.encoding = 'UTF-8'
8+
[compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
99

1010
repositories {
1111
mavenCentral()
1212
}
1313

1414
dependencies {
15-
// String version = System.getProperty("java.version")
16-
// println("JDK: " + version)
15+
// String ver = System.getProperty("java.version")
16+
// println("JDK: " + ver)
1717
// int c = version.compareTo("1.7")
1818
// if (c < 0) {
1919
// compile fileTree(dir: 'libs', include: '*.jar')
2020
// } else {
21-
compile group:'com.squareup.okhttp3', name:'okhttp', version:'3.2.0'
21+
compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.3.1'
2222
// }
23-
compile group:'com.google.code.gson', name:'gson', version:'2.6.2'
23+
compile group: 'com.google.code.gson', name: 'gson', version: '2.6.2'
24+
compile group: 'com.qiniu', name: 'happy-dns-java', version: '0.1.4'
2425
testCompile group: 'junit', name: 'junit', version: '4.12'
25-
println("JDK : " + version)
2626
}
2727

2828

@@ -34,7 +34,7 @@ apply plugin: 'checkstyle'
3434

3535

3636
def versionName() {
37-
String config = 'src/main/java/com/qiniu/common/Config.java'
37+
String config = 'src/main/java/com/qiniu/common/Constants.java'
3838
String fileContents = new File(config).text
3939
Matcher myMatcher = fileContents =~ /VERSION = "(.+)";/
4040
String version = myMatcher[0][1]
@@ -57,8 +57,8 @@ apply from: 'mvn_push.gradle'
5757

5858
apply plugin: 'eclipse'
5959

60-
task gen_eclipse(dependsOn:[
61-
'cleanEclipseProject', 'cleanEclipseClasspath',
62-
'eclipseProject', 'eclipseClasspath'])
60+
task gen_eclipse(dependsOn: [
61+
'cleanEclipseProject', 'cleanEclipseClasspath',
62+
'eclipseProject', 'eclipseClasspath'])
6363
eclipseProject.mustRunAfter cleanEclipseProject
6464
eclipseClasspath.mustRunAfter cleanEclipseClasspath

‎config/checkstyle/checkstyle.xml

Lines changed: 125 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,136 @@
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+
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
4+
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
55

66
<module name="Checker">
7-
<module name="NewlineAtEndOfFile"/>
8-
<module name="FileLength"/>
9-
<module name="FileTabCharacter"/>
10-
11-
<!-- Trailing spaces -->
12-
<module name="RegexpSingleline">
13-
<property name="format" value="\s+$"/>
14-
<property name="message" value="Line has trailing spaces."/>
15-
</module>
16-
17-
<!-- Space after 'for' and 'if' -->
18-
<module name="RegexpSingleline">
19-
<property name="format" value="^\s*(for|if)\b[^ ]"/>
20-
<property name="message" value="Space needed before opening parenthesis."/>
21-
</module>
22-
23-
<!-- For each spacing -->
24-
<module name="RegexpSingleline">
25-
<property name="format" value="^\s*for \(.*?([^ ]:|:[^ ])"/>
26-
<property name="message" value="Space needed around ':' character."/>
27-
</module>
28-
29-
<module name="SuppressionCommentFilter">
30-
</module>
31-
32-
<module name="TreeWalker">
33-
<module name="FileContentsHolder"/>
34-
<!-- Checks for Javadoc comments. -->
35-
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
36-
<!--module name="JavadocMethod"/-->
37-
<!--module name="JavadocType"/-->
38-
<!--module name="JavadocVariable"/-->
39-
<module name="JavadocStyle">
40-
<property name="checkFirstSentence" value="false"/>
7+
<module name="NewlineAtEndOfFile"/>
8+
<module name="FileLength"/>
9+
<module name="FileTabCharacter"/>
10+
11+
<!-- Trailing spaces -->
12+
<module name="RegexpSingleline">
13+
<property name="format" value="\s+$"/>
14+
<property name="message" value="Line has trailing spaces."/>
4115
</module>
4216

17+
<!-- Space after 'for' and 'if' -->
18+
<module name="RegexpSingleline">
19+
<property name="format" value="^\s*(for|if)\b[^ ]"/>
20+
<property name="message" value="Space needed before opening parenthesis."/>
21+
</module>
22+
23+
<!-- For each spacing -->
24+
<module name="RegexpSingleline">
25+
<property name="format" value="^\s*for \(.*?([^ ]:|:[^ ])"/>
26+
<property name="message" value="Space needed around ':' character."/>
27+
</module>
4328

44-
<!-- Checks for Naming Conventions. -->
45-
<!-- See http://checkstyle.sf.net/config_naming.html -->
46-
<!--<module name="ConstantName"/>
47-
<module name="LocalFinalVariableName"/>
48-
<module name="LocalVariableName"/>-->
49-
<module name="MemberName"/>
50-
<module name="MethodName"/>
51-
<module name="PackageName"/>
52-
<!--<module name="ParameterName"/>-->
53-
<module name="StaticVariableName"/>
54-
<module name="TypeName"/>
55-
56-
57-
<!-- Checks for imports -->
58-
<!-- See http://checkstyle.sf.net/config_import.html -->
59-
<!--<module name="AvoidStarImport"/> -->
60-
<module name="IllegalImport"/>
61-
<!-- defaults to sun.* packages -->
62-
<module name="RedundantImport"/>
63-
<module name="UnusedImports">
64-
<property name="processJavadoc" value="true"/>
29+
<module name="SuppressionCommentFilter">
6530
</module>
6631

67-
<!-- Checks for Size Violations. -->
68-
<!-- See http://checkstyle.sf.net/config_sizes.html -->
69-
<module name="LineLength">
70-
<property name="max" value="120"/>
32+
<module name="TreeWalker">
33+
<module name="FileContentsHolder"/>
34+
<!-- Checks for Javadoc comments. -->
35+
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
36+
<!--module name="JavadocMethod"/-->
37+
<!--module name="JavadocType"/-->
38+
<!--module name="JavadocVariable"/-->
39+
<module name="JavadocStyle">
40+
<property name="checkFirstSentence" value="false"/>
41+
</module>
42+
43+
44+
<!-- Checks for Naming Conventions. -->
45+
<!-- See http://checkstyle.sf.net/config_naming.html -->
46+
<!--<module name="ConstantName"/>
47+
<module name="LocalFinalVariableName"/>
48+
<module name="LocalVariableName"/>-->
49+
<module name="MemberName"/>
50+
<module name="MethodName"/>
51+
<module name="PackageName"/>
52+
<!--<module name="ParameterName"/>-->
53+
<module name="StaticVariableName"/>
54+
<module name="TypeName"/>
55+
56+
57+
<!-- Checks for imports -->
58+
<!-- See http://checkstyle.sf.net/config_import.html -->
59+
<!--<module name="AvoidStarImport"/> -->
60+
<module name="IllegalImport"/>
61+
<!-- defaults to sun.* packages -->
62+
<module name="RedundantImport"/>
63+
<module name="UnusedImports">
64+
<property name="processJavadoc" value="true"/>
65+
</module>
66+
67+
<!-- Checks for Size Violations. -->
68+
<!-- See http://checkstyle.sf.net/config_sizes.html -->
69+
<module name="LineLength">
70+
<property name="max" value="120"/>
71+
</module>
72+
<module name="MethodLength"/>
73+
74+
75+
<!-- Checks for whitespace -->
76+
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
77+
<module name="GenericWhitespace"/>
78+
<!--<module name="EmptyForIteratorPad"/>-->
79+
<module name="MethodParamPad"/>
80+
<!--<module name="NoWhitespaceAfter"/>-->
81+
<!--<module name="NoWhitespaceBefore"/>-->
82+
<module name="OperatorWrap"/>
83+
<module name="ParenPad"/>
84+
<module name="TypecastParenPad"/>
85+
<module name="WhitespaceAfter"/>
86+
<module name="WhitespaceAround"/>
87+
88+
89+
<!-- Modifier Checks -->
90+
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
91+
<module name="ModifierOrder"/>
92+
<module name="RedundantModifier"/>
93+
94+
95+
<!-- Checks for blocks. You know, those {}'s -->
96+
<!-- See http://checkstyle.sf.net/config_blocks.html -->
97+
<module name="AvoidNestedBlocks"/>
98+
<!--module name="EmptyBlock"/-->
99+
<module name="LeftCurly"/>
100+
<!--<module name="NeedBraces"/>-->
101+
<module name="RightCurly"/>
102+
103+
104+
<!-- Checks for common coding problems -->
105+
<!-- See http://checkstyle.sf.net/config_coding.html -->
106+
<!--module name="AvoidInlineConditionals"/-->
107+
<module name="CovariantEquals"/>
108+
<module name="EmptyStatement"/>
109+
<!--<module name="EqualsAvoidNull"/>-->
110+
<module name="EqualsHashCode"/>
111+
<!--module name="HiddenField"/-->
112+
<module name="IllegalInstantiation"/>
113+
<!--module name="InnerAssignment"/-->
114+
<!--module name="MagicNumber"/-->
115+
<!--module name="MissingSwitchDefault"/-->
116+
<module name="RedundantThrows"/>
117+
<module name="SimplifyBooleanExpression"/>
118+
<module name="SimplifyBooleanReturn"/>
119+
120+
<!-- Checks for class design -->
121+
<!-- See http://checkstyle.sf.net/config_design.html -->
122+
<!--module name="DesignForExtension"/-->
123+
<!--<module name="FinalClass"/>-->
124+
<module name="HideUtilityClassConstructor"/>
125+
<module name="InterfaceIsType"/>
126+
<!--module name="VisibilityModifier"/-->
127+
128+
129+
<!-- Miscellaneous other checks. -->
130+
<!-- See http://checkstyle.sf.net/config_misc.html -->
131+
<module name="ArrayTypeStyle"/>
132+
<!--module name="FinalParameters"/-->
133+
<!--module name="TodoComment"/-->
134+
<module name="UpperEll"/>
71135
</module>
72-
<module name="MethodLength"/>
73-
74-
75-
<!-- Checks for whitespace -->
76-
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
77-
<module name="GenericWhitespace"/>
78-
<!--<module name="EmptyForIteratorPad"/>-->
79-
<module name="MethodParamPad"/>
80-
<!--<module name="NoWhitespaceAfter"/>-->
81-
<!--<module name="NoWhitespaceBefore"/>-->
82-
<module name="OperatorWrap"/>
83-
<module name="ParenPad"/>
84-
<module name="TypecastParenPad"/>
85-
<module name="WhitespaceAfter"/>
86-
<module name="WhitespaceAround"/>
87-
88-
89-
<!-- Modifier Checks -->
90-
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
91-
<module name="ModifierOrder"/>
92-
<module name="RedundantModifier"/>
93-
94-
95-
<!-- Checks for blocks. You know, those {}'s -->
96-
<!-- See http://checkstyle.sf.net/config_blocks.html -->
97-
<module name="AvoidNestedBlocks"/>
98-
<!--module name="EmptyBlock"/-->
99-
<module name="LeftCurly"/>
100-
<!--<module name="NeedBraces"/>-->
101-
<module name="RightCurly"/>
102-
103-
104-
<!-- Checks for common coding problems -->
105-
<!-- See http://checkstyle.sf.net/config_coding.html -->
106-
<!--module name="AvoidInlineConditionals"/-->
107-
<module name="CovariantEquals"/>
108-
<module name="EmptyStatement"/>
109-
<!--<module name="EqualsAvoidNull"/>-->
110-
<module name="EqualsHashCode"/>
111-
<!--module name="HiddenField"/-->
112-
<module name="IllegalInstantiation"/>
113-
<!--module name="InnerAssignment"/-->
114-
<!--module name="MagicNumber"/-->
115-
<!--module name="MissingSwitchDefault"/-->
116-
<module name="RedundantThrows"/>
117-
<module name="SimplifyBooleanExpression"/>
118-
<module name="SimplifyBooleanReturn"/>
119-
120-
<!-- Checks for class design -->
121-
<!-- See http://checkstyle.sf.net/config_design.html -->
122-
<!--module name="DesignForExtension"/-->
123-
<!--<module name="FinalClass"/>-->
124-
<module name="HideUtilityClassConstructor"/>
125-
<module name="InterfaceIsType"/>
126-
<!--module name="VisibilityModifier"/-->
127-
128-
129-
<!-- Miscellaneous other checks. -->
130-
<!-- See http://checkstyle.sf.net/config_misc.html -->
131-
<module name="ArrayTypeStyle"/>
132-
<!--module name="FinalParameters"/-->
133-
<!--module name="TodoComment"/-->
134-
<module name="UpperEll"/>
135-
</module>
136136
</module>

‎examples/BatchDemo.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import com.qiniu.common.QiniuException;
22
import com.qiniu.http.Response;
33
import com.qiniu.storage.BucketManager;
4-
import com.qiniu.storage.model.FileInfo;
5-
import com.qiniu.storage.model.FileListing;
64
import com.qiniu.util.Auth;
75
import com.qiniu.common.Zone;
86
import com.qiniu.storage.Configuration;
97

108

119
public class BatchDemo {
10+
1211
public static void main(String args[]){
1312
//设置需要操作的账号的AK和SK
1413
String ACCESS_KEY = "Access_Key";

‎examples/FetchDemo.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@
66
import com.qiniu.storage.Configuration;
77

88
public class FetchDemo {
9+
910
public static void main(String args[]){
1011
//设置需要操作的账号的AK和SK
1112
String ACCESS_KEY = "Access_Key";
1213
String SECRET_KEY = "Secret_Key";
1314
Auth auth = Auth.create(ACCESS_KEY, SECRET_KEY);
1415

15-
Zone z = Zone.zone0();
16+
Zone z = Zone.zone0();
1617
Configuration c = new Configuration(z);
1718

18-
//实例化一个BucketManager对象
19-
BucketManager bucketManager = new BucketManager(auth,c);
19+
//实例化一个BucketManager对象
20+
BucketManager bucketManager = new BucketManager(auth,c);
2021

2122
//文件保存的空间名和文件名
2223
String bucket = "yourbucket";
@@ -34,4 +35,5 @@ public static void main(String args[]){
3435
System.out.println(r.toString());
3536
}
3637
}
38+
3739
}

0 commit comments

Comments
 (0)