Skip to content

Commit 0f64078

Browse files
authored
Merge pull request #421 from sxci/format2
Format2
2 parents 3264fd7 + b62692d commit 0f64078

25 files changed

+452
-419
lines changed

src/main/java/com/qiniu/common/AutoRegion.java

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
package com.qiniu.common;
22

3+
import com.qiniu.http.Client;
4+
import com.qiniu.http.Response;
5+
36
import java.util.ArrayList;
47
import java.util.List;
58
import java.util.Map;
69
import java.util.concurrent.ConcurrentHashMap;
710

8-
import com.qiniu.http.Client;
9-
import com.qiniu.http.Response;
10-
1111
public class AutoRegion extends Region {
12-
13-
/**
14-
* uc接口域名
15-
*/
12+
13+
/**
14+
* uc接口域名
15+
*/
1616
private final String ucServer;
1717

1818
/**
1919
* 空间机房,域名信息缓存
2020
*/
2121
private Map<RegionIndex, RegionInfo> regions;
22-
22+
2323
/**
2424
* 根据API返回的上传域名推导出其他资源管理域名
2525
*/
2626
private Map<String, Region> inferDomainsMap;
27-
27+
2828
/**
2929
* 定义HTTP请求管理相关方法
3030
*/
@@ -107,7 +107,7 @@ public RegionInfo queryRegionInfo(RegionReqInfo regionReqInfo) {
107107
}
108108
return null;
109109
}
110-
110+
111111
/**
112112
* 获取源站直传域名
113113
*/
@@ -118,7 +118,7 @@ public String getSrcUpHost(RegionReqInfo regionReqInfo) {
118118
}
119119
return info.srcUpHosts.get(0);
120120
}
121-
121+
122122
/**
123123
* 获取加速上传域名
124124
*/
@@ -193,48 +193,49 @@ public String getApiHost(RegionReqInfo regionReqInfo) {
193193
* 从接口获取的域名信息
194194
*/
195195
static class RegionInfo {
196-
final List<String> srcUpHosts;
196+
final List<String> srcUpHosts;
197197
final List<String> accUpHosts;
198198
final String iovipHost;
199199

200200
protected RegionInfo(List<String> srcUpHosts, List<String> accUpHosts, String iovipHost) {
201-
this.srcUpHosts = srcUpHosts;
202-
this.accUpHosts = accUpHosts;
203-
this.iovipHost = iovipHost;
201+
this.srcUpHosts = srcUpHosts;
202+
this.accUpHosts = accUpHosts;
203+
this.iovipHost = iovipHost;
204204
}
205205

206206
/**
207-
{
208-
"io": {"src": {"main": ["iovip.qbox.me"]}},
209-
"up": {
210-
"acc": {
211-
"main": ["upload.qiniup.com"],
212-
"backup": ["upload-jjh.qiniup.com", "upload-xs.qiniup.com"]
213-
},
214-
"src": {
215-
"main": ["up.qiniup.com"],
216-
"backup": ["up-jjh.qiniup.com", "up-xs.qiniup.com"]
217-
}
218-
}
219-
}
207+
* {
208+
* "io": {"src": {"main": ["iovip.qbox.me"]}},
209+
* "up": {
210+
* "acc": {
211+
* "main": ["upload.qiniup.com"],
212+
* "backup": ["upload-jjh.qiniup.com", "upload-xs.qiniup.com"]
213+
* },
214+
* "src": {
215+
* "main": ["up.qiniup.com"],
216+
* "backup": ["up-jjh.qiniup.com", "up-xs.qiniup.com"]
217+
* }
218+
* }
219+
* }
220+
*
220221
* @param ret
221222
* @return
222223
*/
223224
static RegionInfo buildFromUcRet(UCRet ret) {
224-
List<String> srcUpHosts = new ArrayList<>();
225-
addAll(srcUpHosts, ret.up.src.get("main"));
226-
addAll(srcUpHosts, ret.up.src.get("backup"));
227-
List<String> accUpHosts = new ArrayList<>();
228-
addAll(accUpHosts, ret.up.acc.get("main"));
229-
addAll(accUpHosts, ret.up.acc.get("backup"));
230-
String iovipHost = ret.io.src.get("main").get(0);
225+
List<String> srcUpHosts = new ArrayList<>();
226+
addAll(srcUpHosts, ret.up.src.get("main"));
227+
addAll(srcUpHosts, ret.up.src.get("backup"));
228+
List<String> accUpHosts = new ArrayList<>();
229+
addAll(accUpHosts, ret.up.acc.get("main"));
230+
addAll(accUpHosts, ret.up.acc.get("backup"));
231+
String iovipHost = ret.io.src.get("main").get(0);
231232
return new RegionInfo(srcUpHosts, accUpHosts, iovipHost);
232233
}
233-
234+
234235
static void addAll(List<String> s, List<String> p) {
235-
if (p != null) {
236-
s.addAll(p);
237-
}
236+
if (p != null) {
237+
s.addAll(p);
238+
}
238239
}
239240
}
240241

@@ -261,14 +262,14 @@ private class UCRet {
261262
UPRet up;
262263
IORet io;
263264
}
264-
265+
265266
private class UPRet {
266-
Map<String, List<String>> acc;
267-
Map<String, List<String>> src;
267+
Map<String, List<String>> acc;
268+
Map<String, List<String>> src;
268269
}
269-
270+
270271
private class IORet {
271-
Map<String, List<String>> src;
272+
Map<String, List<String>> src;
272273
}
273-
274+
274275
}

0 commit comments

Comments
 (0)