From 1edd40a5e4455d7a28e145bac6fd94ac64bac12f Mon Sep 17 00:00:00 2001 From: Sxci Date: Fri, 15 Mar 2019 12:34:49 +0800 Subject: [PATCH 1/2] format [ci skip] --- .../java/com/qiniu/common/AutoRegion.java | 91 +++---- src/main/java/com/qiniu/common/Region.java | 248 +++++++++--------- src/main/java/com/qiniu/common/Zone.java | 76 +++--- .../java/com/qiniu/common/ZoneReqInfo.java | 14 +- .../qiniu/linking/LinkingDeviceManager.java | 9 +- .../qiniu/processing/OperationManager.java | 2 +- .../java/com/qiniu/storage/Configuration.java | 40 +-- .../java/com/qiniu/storage/UploadManager.java | 41 +-- src/main/java/com/qiniu/util/Auth.java | 1 - src/main/java/com/qiniu/util/IOUtils.java | 23 +- src/test/java/test/com/qiniu/CdnTest.java | 46 ++-- src/test/java/test/com/qiniu/DnsTest.java | 1 - src/test/java/test/com/qiniu/HttpTest.java | 1 - src/test/java/test/com/qiniu/TestConfig.java | 27 +- .../test/com/qiniu/linking/DeviceTest.java | 25 +- .../test/com/qiniu/processing/PfopTest.java | 14 +- src/test/java/test/com/qiniu/rtc/RtcTest.java | 1 - .../test/com/qiniu/storage/BucketTest.java | 14 +- .../com/qiniu/storage/FormUploadTest.java | 93 +++---- .../com/qiniu/storage/RecordUploadTest.java | 17 +- .../test/com/qiniu/storage/RegionTest.java | 3 +- .../com/qiniu/storage/ResumeUploadTest.java | 22 +- .../com/qiniu/storage/StreamUploadTest.java | 12 +- .../com/qiniu/streaming/StreamingTest.java | 9 +- .../test/com/qiniu/streaming/UrlTest.java | 1 - 25 files changed, 421 insertions(+), 410 deletions(-) diff --git a/src/main/java/com/qiniu/common/AutoRegion.java b/src/main/java/com/qiniu/common/AutoRegion.java index e4593ddef..9c9c31d5b 100644 --- a/src/main/java/com/qiniu/common/AutoRegion.java +++ b/src/main/java/com/qiniu/common/AutoRegion.java @@ -1,30 +1,30 @@ package com.qiniu.common; +import com.qiniu.http.Client; +import com.qiniu.http.Response; + import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import com.qiniu.http.Client; -import com.qiniu.http.Response; - public class AutoRegion extends Region { - - /** - * uc接口域名 - */ + + /** + * uc接口域名 + */ private final String ucServer; /** * 空间机房，域名信息缓存 */ private Map regions; - + /** * 根据API返回的上传域名推导出其他资源管理域名 */ private Map inferDomainsMap; - + /** * 定义HTTP请求管理相关方法 */ @@ -107,7 +107,7 @@ public RegionInfo queryRegionInfo(RegionReqInfo regionReqInfo) { } return null; } - + /** * 获取源站直传域名 */ @@ -118,7 +118,7 @@ public String getSrcUpHost(RegionReqInfo regionReqInfo) { } return info.srcUpHosts.get(0); } - + /** * 获取加速上传域名 */ @@ -193,48 +193,49 @@ public String getApiHost(RegionReqInfo regionReqInfo) { * 从接口获取的域名信息 */ static class RegionInfo { - final List srcUpHosts; + final List srcUpHosts; final List accUpHosts; final String iovipHost; protected RegionInfo(List srcUpHosts, List accUpHosts, String iovipHost) { - this.srcUpHosts = srcUpHosts; - this.accUpHosts = accUpHosts; - this.iovipHost = iovipHost; + this.srcUpHosts = srcUpHosts; + this.accUpHosts = accUpHosts; + this.iovipHost = iovipHost; } /** - { - "io": {"src": {"main": ["iovip.qbox.me"]}}, - "up": { - "acc": { - "main": ["upload.qiniup.com"], - "backup": ["upload-jjh.qiniup.com", "upload-xs.qiniup.com"] - }, - "src": { - "main": ["up.qiniup.com"], - "backup": ["up-jjh.qiniup.com", "up-xs.qiniup.com"] - } - } - } + * { + * "io": {"src": {"main": ["iovip.qbox.me"]}}, + * "up": { + * "acc": { + * "main": ["upload.qiniup.com"], + * "backup": ["upload-jjh.qiniup.com", "upload-xs.qiniup.com"] + * }, + * "src": { + * "main": ["up.qiniup.com"], + * "backup": ["up-jjh.qiniup.com", "up-xs.qiniup.com"] + * } + * } + * } + * * @param ret * @return */ static RegionInfo buildFromUcRet(UCRet ret) { - List srcUpHosts = new ArrayList<>(); - addAll(srcUpHosts, ret.up.src.get("main")); - addAll(srcUpHosts, ret.up.src.get("backup")); - List accUpHosts = new ArrayList<>(); - addAll(accUpHosts, ret.up.acc.get("main")); - addAll(accUpHosts, ret.up.acc.get("backup")); - String iovipHost = ret.io.src.get("main").get(0); + List srcUpHosts = new ArrayList<>(); + addAll(srcUpHosts, ret.up.src.get("main")); + addAll(srcUpHosts, ret.up.src.get("backup")); + List accUpHosts = new ArrayList<>(); + addAll(accUpHosts, ret.up.acc.get("main")); + addAll(accUpHosts, ret.up.acc.get("backup")); + String iovipHost = ret.io.src.get("main").get(0); return new RegionInfo(srcUpHosts, accUpHosts, iovipHost); } - + static void addAll(List s, List p) { - if (p != null) { - s.addAll(p); - } + if (p != null) { + s.addAll(p); + } } } @@ -261,14 +262,14 @@ private class UCRet { UPRet up; IORet io; } - + private class UPRet { - Map> acc; - Map> src; + Map> acc; + Map> src; } - + private class IORet { - Map> src; + Map> src; } - + } diff --git a/src/main/java/com/qiniu/common/Region.java b/src/main/java/com/qiniu/common/Region.java index d283f68b6..b49d62763 100644 --- a/src/main/java/com/qiniu/common/Region.java +++ b/src/main/java/com/qiniu/common/Region.java @@ -4,17 +4,17 @@ import java.util.List; public class Region { - + // 区域名称：z0 华东 z1 华北 z2 华南 na0 北美 as0 东南亚 private String region; - + /* * 源站直传，加速上传，源站下载 使用各个机房对应的域名 */ private List srcUpHosts; private List accUpHosts; private String iovipHost; - + /* * 资源管理，资源列表，资源处理类域名 * 默认的这组域名是国内国外共用域名，无论海外国内都可以访问 @@ -23,7 +23,7 @@ public class Region { private String rsHost = "rs.qbox.me"; private String rsfHost = "rsf.qbox.me"; private String apiHost = "api.qiniu.com"; - + /* * 获取成员变量 */ @@ -31,29 +31,29 @@ public String getRegion() { return this.region; } - public List getSrcUpHosts() { - return srcUpHosts; - } + public List getSrcUpHosts() { + return srcUpHosts; + } - public List getAccUpHosts() { - return accUpHosts; - } + public List getAccUpHosts() { + return accUpHosts; + } - public String getIovipHost() { - return iovipHost; - } + public String getIovipHost() { + return iovipHost; + } - public String getRsHost() { - return rsHost; - } + public String getRsHost() { + return rsHost; + } - public String getRsfHost() { - return rsfHost; - } + public String getRsfHost() { + return rsfHost; + } - public String getApiHost() { - return apiHost; - } + public String getApiHost() { + return apiHost; + } /** * 域名构造器 @@ -81,45 +81,45 @@ protected void init() { } public Builder region(String region) { - this.region.region = region; + this.region.region = region; return this; } public Builder srcUpHost(String... srcUpHosts) { - this.region.srcUpHosts = Arrays.asList(srcUpHosts); - return this; + this.region.srcUpHosts = Arrays.asList(srcUpHosts); + return this; } - + public Builder accUpHost(String... accUpHosts) { - this.region.accUpHosts = Arrays.asList(accUpHosts); - return this; + this.region.accUpHosts = Arrays.asList(accUpHosts); + return this; } - + public Builder iovipHost(String iovipHost) { - this.region.iovipHost = iovipHost; - return this; + this.region.iovipHost = iovipHost; + return this; } - + public Builder rsHost(String rsHost) { - this.region.rsHost = rsHost; - return this; + this.region.rsHost = rsHost; + return this; } - + public Builder rsfHost(String rsfHost) { - this.region.rsfHost = rsfHost; - return this; + this.region.rsfHost = rsfHost; + return this; } public Builder apiHost(String apiHost) { - this.region.apiHost = apiHost; - return this; + this.region.apiHost = apiHost; + return this; } /** * 自动选择,其它参数设置无效 */ public Region autoRegion() { - return new AutoRegion(); + return new AutoRegion(); } /** @@ -134,15 +134,15 @@ public Region build() { * 华东机房相关域名 */ public static Region region0() { - return new Builder(). - region("z0"). - srcUpHost("up.qiniup.com", "up-jjh.qiniup.com", "up-xs.qiniup.com"). - accUpHost("upload.qiniup.com", "upload-jjh.qiniup.com", "upload-xs.qiniup.com"). - iovipHost("iovip.qbox.me"). - rsHost("rs.qbox.me"). - rsfHost("rsf.qbox.me"). - apiHost("api.qiniu.com"). - build(); + return new Builder(). + region("z0"). + srcUpHost("up.qiniup.com", "up-jjh.qiniup.com", "up-xs.qiniup.com"). + accUpHost("upload.qiniup.com", "upload-jjh.qiniup.com", "upload-xs.qiniup.com"). + iovipHost("iovip.qbox.me"). + rsHost("rs.qbox.me"). + rsfHost("rsf.qbox.me"). + apiHost("api.qiniu.com"). + build(); } /** @@ -157,15 +157,15 @@ public static Region huadong() { * 华东机房内网上传相关域名 */ public static Region qvmRegion0() { - return new Builder(). - region("z0"). - srcUpHost("free-qvm-z0-xs.qiniup.com"). - accUpHost("free-qvm-z0-xs.qiniup.com"). - iovipHost("iovip.qbox.me"). - rsHost("rs.qbox.me"). - rsfHost("rsf.qbox.me"). - apiHost("api.qiniu.com"). - build(); + return new Builder(). + region("z0"). + srcUpHost("free-qvm-z0-xs.qiniup.com"). + accUpHost("free-qvm-z0-xs.qiniup.com"). + iovipHost("iovip.qbox.me"). + rsHost("rs.qbox.me"). + rsfHost("rsf.qbox.me"). + apiHost("api.qiniu.com"). + build(); } /** @@ -180,15 +180,15 @@ public static Region qvmHuadong() { * 华北机房相关域名 */ public static Region region1() { - return new Builder(). - region("z1"). - srcUpHost("up-z1.qiniup.com"). - accUpHost("upload-z1.qiniup.com"). - iovipHost("iovip-z1.qbox.me"). - rsHost("rs-z1.qbox.me"). - rsfHost("rsf-z1.qbox.me"). - apiHost("api-z1.qiniu.com"). - build(); + return new Builder(). + region("z1"). + srcUpHost("up-z1.qiniup.com"). + accUpHost("upload-z1.qiniup.com"). + iovipHost("iovip-z1.qbox.me"). + rsHost("rs-z1.qbox.me"). + rsfHost("rsf-z1.qbox.me"). + apiHost("api-z1.qiniu.com"). + build(); } /** @@ -203,15 +203,15 @@ public static Region huabei() { * 华北机房内网上传相关域名 */ public static Region qvmRegion1() { - return new Builder(). - region("z1"). - srcUpHost("free-qvm-z1-zz.qiniup.com"). - accUpHost("free-qvm-z1-zz.qiniup.com"). - iovipHost("iovip-z1.qbox.me"). - rsHost("rs-z1.qbox.me"). - rsfHost("rsf-z1.qbox.me"). - apiHost("api-z1.qiniu.com"). - build(); + return new Builder(). + region("z1"). + srcUpHost("free-qvm-z1-zz.qiniup.com"). + accUpHost("free-qvm-z1-zz.qiniup.com"). + iovipHost("iovip-z1.qbox.me"). + rsHost("rs-z1.qbox.me"). + rsfHost("rsf-z1.qbox.me"). + apiHost("api-z1.qiniu.com"). + build(); } /** @@ -225,15 +225,15 @@ public static Region qvmHuabei() { * 华南机房相关域名 */ public static Region region2() { - return new Builder(). - region("z2"). - srcUpHost("up-z2.qiniup.com", "up-dg.qiniup.com", "up-fs.qiniup.com"). - accUpHost("upload-z2.qiniup.com", "upload-dg.qiniup.com", "upload-fs.qiniup.com"). - iovipHost("iovip-z2.qbox.me"). - rsHost("rs-z2.qbox.me"). - rsfHost("rsf-z2.qbox.me"). - apiHost("api-z2.qiniu.com"). - build(); + return new Builder(). + region("z2"). + srcUpHost("up-z2.qiniup.com", "up-dg.qiniup.com", "up-fs.qiniup.com"). + accUpHost("upload-z2.qiniup.com", "upload-dg.qiniup.com", "upload-fs.qiniup.com"). + iovipHost("iovip-z2.qbox.me"). + rsHost("rs-z2.qbox.me"). + rsfHost("rsf-z2.qbox.me"). + apiHost("api-z2.qiniu.com"). + build(); } /** @@ -247,15 +247,15 @@ public static Region huanan() { * 北美机房相关域名 */ public static Region regionNa0() { - return new Builder(). - region("na0"). - srcUpHost("up-na0.qiniup.com"). - accUpHost("upload-na0.qiniup.com"). - iovipHost("iovip-na0.qbox.me"). - rsHost("rs-na0.qbox.me"). - rsfHost("rsf-na0.qbox.me"). - apiHost("api-na0.qiniu.com"). - build(); + return new Builder(). + region("na0"). + srcUpHost("up-na0.qiniup.com"). + accUpHost("upload-na0.qiniup.com"). + iovipHost("iovip-na0.qbox.me"). + rsHost("rs-na0.qbox.me"). + rsfHost("rsf-na0.qbox.me"). + apiHost("api-na0.qiniu.com"). + build(); } /** @@ -269,15 +269,15 @@ public static Region beimei() { * 新加坡相关域名 */ public static Region regionAs0() { - return new Builder(). - region("na0"). - srcUpHost("up-as0.qiniup.com"). - accUpHost("upload-as0.qiniup.com"). - iovipHost("iovip-as0.qbox.me"). - rsHost("rs-as0.qbox.me"). - rsfHost("rsf-as0.qbox.me"). - apiHost("api-as0.qiniu.com"). - build(); + return new Builder(). + region("na0"). + srcUpHost("up-as0.qiniup.com"). + accUpHost("upload-as0.qiniup.com"). + iovipHost("iovip-as0.qbox.me"). + rsHost("rs-as0.qbox.me"). + rsfHost("rsf-as0.qbox.me"). + apiHost("api-as0.qiniu.com"). + build(); } /** @@ -300,41 +300,41 @@ public String getRegion(RegionReqInfo regionReqInfo) { } public String getSrcUpHost(RegionReqInfo regionReqInfo) { - return this.srcUpHosts.get(0); + return this.srcUpHosts.get(0); } - + public String getAccUpHost(RegionReqInfo regionReqInfo) { - return this.accUpHosts.get(0); + return this.accUpHosts.get(0); } - + public String getSrcUpHostBackup(RegionReqInfo regionReqInfo) { - if (srcUpHosts.size() > 1) { - return srcUpHosts.get(1); - } - return getSrcUpHost(regionReqInfo); + if (srcUpHosts.size() > 1) { + return srcUpHosts.get(1); + } + return getSrcUpHost(regionReqInfo); } - + public String getAccUpHostBackup(RegionReqInfo regionReqInfo) { - if (accUpHosts.size() > 1) { - return accUpHosts.get(1); - } - return getAccUpHost(regionReqInfo); + if (accUpHosts.size() > 1) { + return accUpHosts.get(1); + } + return getAccUpHost(regionReqInfo); } - + public String getIovipHost(RegionReqInfo regionReqInfo) { - return iovipHost; + return iovipHost; } - + public String getRsHost(RegionReqInfo regionReqInfo) { - return rsHost; + return rsHost; } - + public String getRsfHost(RegionReqInfo regionReqInfo) { - return rsfHost; + return rsfHost; } - + public String getApiHost(RegionReqInfo regionReqInfo) { - return apiHost; + return apiHost; } } diff --git a/src/main/java/com/qiniu/common/Zone.java b/src/main/java/com/qiniu/common/Zone.java index 6e372a2e3..1d4cb708e 100644 --- a/src/main/java/com/qiniu/common/Zone.java +++ b/src/main/java/com/qiniu/common/Zone.java @@ -5,106 +5,106 @@ */ @Deprecated public class Zone extends Region { - - @Deprecated - public static class Builder extends Region.Builder { - - @Deprecated - public Builder() { - } - - @Deprecated - public Builder(Region originZone) { - super(originZone); - } + + @Deprecated + public static class Builder extends Region.Builder { + + @Deprecated + public Builder() { + } + + @Deprecated + public Builder(Region originZone) { + super(originZone); + } @Override protected void init() { region = new Zone(); } - @Deprecated + @Deprecated public Region autoZone() { - return super.autoRegion(); + return super.autoRegion(); } - - @Deprecated - public Zone build() { - return (Zone) super.build(); - } - } - - @Deprecated + + @Deprecated + public Zone build() { + return (Zone) super.build(); + } + } + + @Deprecated public static Zone zone0() { return zone(Region.region0()); } - - @Deprecated + + @Deprecated public static Zone huadong() { return zone0(); } - @Deprecated + @Deprecated public static Zone qvmZone0() { return zone(Region.qvmRegion0()); } - @Deprecated + @Deprecated public static Zone qvmHuadong() { return qvmZone0(); } - @Deprecated + @Deprecated public static Zone zone1() { return zone(Region.region1()); } - @Deprecated + @Deprecated public static Zone huabei() { return zone1(); } - @Deprecated + @Deprecated public static Zone qvmZone1() { return zone(Region.qvmRegion1()); } - @Deprecated + @Deprecated public static Zone qvmHuabei() { return qvmZone1(); } - @Deprecated + @Deprecated public static Zone zone2() { return zone(Region.region2()); } - @Deprecated + @Deprecated public static Zone huanan() { return zone2(); } - @Deprecated + @Deprecated public static Zone zoneNa0() { return zone(Region.regionNa0()); } - @Deprecated + @Deprecated public static Zone beimei() { return zoneNa0(); } - @Deprecated + @Deprecated public static Zone zoneAs0() { return zone(Region.regionAs0()); } - @Deprecated + @Deprecated public static Zone xinjiapo() { return zoneAs0(); } - @Deprecated + @Deprecated public static Region autoZone() { return Region.autoRegion(); } @@ -113,5 +113,5 @@ public static Region autoZone() { private static Zone zone(Region region) { return new Builder(region).build(); } - + } diff --git a/src/main/java/com/qiniu/common/ZoneReqInfo.java b/src/main/java/com/qiniu/common/ZoneReqInfo.java index 287d28a49..80cc9432e 100644 --- a/src/main/java/com/qiniu/common/ZoneReqInfo.java +++ b/src/main/java/com/qiniu/common/ZoneReqInfo.java @@ -6,13 +6,13 @@ @Deprecated public class ZoneReqInfo extends RegionReqInfo { - @Deprecated - public ZoneReqInfo(String token) throws QiniuException { - super(token); - } - - @Deprecated + @Deprecated + public ZoneReqInfo(String token) throws QiniuException { + super(token); + } + + @Deprecated public ZoneReqInfo(String accessKey, String bucket) { - super(accessKey, bucket); + super(accessKey, bucket); } } diff --git a/src/main/java/com/qiniu/linking/LinkingDeviceManager.java b/src/main/java/com/qiniu/linking/LinkingDeviceManager.java index a33fbffab..36c60e3ae 100644 --- a/src/main/java/com/qiniu/linking/LinkingDeviceManager.java +++ b/src/main/java/com/qiniu/linking/LinkingDeviceManager.java @@ -5,7 +5,10 @@ import com.qiniu.http.Client; import com.qiniu.http.Response; import com.qiniu.linking.model.*; -import com.qiniu.util.*; +import com.qiniu.util.Auth; +import com.qiniu.util.Json; +import com.qiniu.util.StringMap; +import com.qiniu.util.UrlSafeBase64; public class LinkingDeviceManager { @@ -53,8 +56,8 @@ public DeviceListing listDevice(String appid, String prefix, .putNotEmpty("prefix", prefix).putWhen("limit", limit, limit > 0) .putWhen("online", online, online); String queryString = map.formString(); - if (map.size()>0){ - queryString="?"+queryString; + if (map.size() > 0) { + queryString = "?" + queryString; } String url = String.format("%s/v1/apps/%s/devices%s", host, appid, queryString); Response res = get(url); diff --git a/src/main/java/com/qiniu/processing/OperationManager.java b/src/main/java/com/qiniu/processing/OperationManager.java index b72dd0292..260d3b0a1 100644 --- a/src/main/java/com/qiniu/processing/OperationManager.java +++ b/src/main/java/com/qiniu/processing/OperationManager.java @@ -148,7 +148,7 @@ public String pfop(String bucket, String key, String fops, String pipeline, bool public String pfop(String bucket, String key, String fops, String pipeline, String notifyURL, boolean force) throws QiniuException { StringMap params = new StringMap().putNotEmpty("pipeline", pipeline). - putNotEmpty("notifyURL", notifyURL).putWhen("force", 1, force); + putNotEmpty("notifyURL", notifyURL).putWhen("force", 1, force); return pfop(bucket, key, fops, params); } diff --git a/src/main/java/com/qiniu/storage/Configuration.java b/src/main/java/com/qiniu/storage/Configuration.java index 4fe499807..84ebf4d74 100644 --- a/src/main/java/com/qiniu/storage/Configuration.java +++ b/src/main/java/com/qiniu/storage/Configuration.java @@ -16,7 +16,7 @@ public final class Configuration implements Cloneable { * 使用的Region */ public Region region; - + /** * 空间相关上传管理操作是否优先使用 https , 默认 是 */ @@ -83,11 +83,11 @@ public final class Configuration implements Cloneable { public Configuration() { } - + public Configuration(Region region) { this.region = region; } - + public Configuration clone() { try { return (Configuration) super.clone(); @@ -98,35 +98,35 @@ public Configuration clone() { } public String upHost(String upToken) throws QiniuException { - RegionReqInfo regionReqInfo = new RegionReqInfo(upToken); + RegionReqInfo regionReqInfo = new RegionReqInfo(upToken); if (region == null) { - region = Region.autoRegion(); + region = Region.autoRegion(); } return useAccUpHost ? getScheme() + region.getAccUpHost(regionReqInfo) - : getScheme() + region.getSrcUpHost(regionReqInfo); + : getScheme() + region.getSrcUpHost(regionReqInfo); } public String upHostBackup(String upToken) throws QiniuException { - RegionReqInfo regionReqInfo = new RegionReqInfo(upToken); + RegionReqInfo regionReqInfo = new RegionReqInfo(upToken); if (region == null) { - region = Region.autoRegion(); + region = Region.autoRegion(); } return useAccUpHost ? getScheme() + region.getAccUpHostBackup(regionReqInfo) - : getScheme() + region.getSrcUpHostBackup(regionReqInfo); + : getScheme() + region.getSrcUpHostBackup(regionReqInfo); } public String ioHost(String ak, String bucket) { - RegionReqInfo regionReqInfo = new RegionReqInfo(ak, bucket); + RegionReqInfo regionReqInfo = new RegionReqInfo(ak, bucket); if (region == null) { - region = Region.autoRegion(); + region = Region.autoRegion(); } return getScheme() + region.getIovipHost(regionReqInfo); } public String apiHost(String ak, String bucket) { - RegionReqInfo regionReqInfo = new RegionReqInfo(ak, bucket); + RegionReqInfo regionReqInfo = new RegionReqInfo(ak, bucket); if (region == null) { - region = Region.autoRegion(); + region = Region.autoRegion(); } return getScheme() + region.getApiHost(regionReqInfo); } @@ -134,19 +134,19 @@ public String apiHost(String ak, String bucket) { public String rsHost(String ak, String bucket) { RegionReqInfo regionReqInfo = new RegionReqInfo(ak, bucket); if (region == null) { - region = Region.autoRegion(); + region = Region.autoRegion(); } return getScheme() + region.getRsHost(regionReqInfo); } public String rsfHost(String ak, String bucket) { - RegionReqInfo regionReqInfo = new RegionReqInfo(ak, bucket); + RegionReqInfo regionReqInfo = new RegionReqInfo(ak, bucket); if (region == null) { - region = Region.autoRegion(); + region = Region.autoRegion(); } return getScheme() + region.getRsfHost(regionReqInfo); } - + public String rsHost() { return getScheme() + defaultRsHost; } @@ -158,9 +158,9 @@ public String apiHost() { public String ucHost() { return getScheme() + defaultUcHost; } - + String getScheme() { - return useHttpsDomains ? "https://" : "http://"; + return useHttpsDomains ? "https://" : "http://"; } - + } diff --git a/src/main/java/com/qiniu/storage/UploadManager.java b/src/main/java/com/qiniu/storage/UploadManager.java index c8911fba3..1b24ca51f 100644 --- a/src/main/java/com/qiniu/storage/UploadManager.java +++ b/src/main/java/com/qiniu/storage/UploadManager.java @@ -87,27 +87,28 @@ public void accept(String key, Object value) { }); return ret; } - - /** - * 上传字节流，小文件走表单，大文件走分片 - * @param inputStream - * @param size - * @param key - * @param token - * @param params - * @param mime - * @param checkCrc - * @return - * @throws QiniuException - * @throws IOException - */ + + /** + * 上传字节流，小文件走表单，大文件走分片 + * + * @param inputStream + * @param size + * @param key + * @param token + * @param params + * @param mime + * @param checkCrc + * @return + * @throws QiniuException + * @throws IOException + */ public Response put(InputStream inputStream, long size, String key, String token, StringMap params, - String mime, boolean checkCrc) throws QiniuException, IOException { - if (size < 0 || size > configuration.putThreshold) { - return put(inputStream, key, token, params, mime); - } - byte[] data = IOUtils.toByteArray(inputStream); - return put(data, key, token, params, mime, checkCrc); + String mime, boolean checkCrc) throws QiniuException, IOException { + if (size < 0 || size > configuration.putThreshold) { + return put(inputStream, key, token, params, mime); + } + byte[] data = IOUtils.toByteArray(inputStream); + return put(data, key, token, params, mime, checkCrc); } /** diff --git a/src/main/java/com/qiniu/util/Auth.java b/src/main/java/com/qiniu/util/Auth.java index 01b9ecd16..a7175c9d6 100755 --- a/src/main/java/com/qiniu/util/Auth.java +++ b/src/main/java/com/qiniu/util/Auth.java @@ -8,7 +8,6 @@ import java.net.URI; import java.security.GeneralSecurityException; import java.security.SecureRandom; -import java.security.Timestamp; import java.util.Date; public final class Auth { diff --git a/src/main/java/com/qiniu/util/IOUtils.java b/src/main/java/com/qiniu/util/IOUtils.java index e56fd2248..286573512 100644 --- a/src/main/java/com/qiniu/util/IOUtils.java +++ b/src/main/java/com/qiniu/util/IOUtils.java @@ -1,20 +1,21 @@ package com.qiniu.util; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.ByteArrayOutputStream; public class IOUtils { - - private static final int DEFAULT_BUFFER_SIZE = 1024 * 4; - /** - * 输入InputSteam，返回byte[]. - * 参考：https://github.com/apache/commons-io/blob/master/src/main/java/org/apache/commons/io/IOUtils.java
- * @param input - * @return - * @throws IOException - */ + private static final int DEFAULT_BUFFER_SIZE = 1024 * 4; + + /** + * 输入InputSteam，返回byte[]. + * 参考：https://github.com/apache/commons-io/blob/master/src/main/java/org/apache/commons/io/IOUtils.java
+ * + * @param input + * @return + * @throws IOException + */ public static byte[] toByteArray(final InputStream input) throws IOException { try (final ByteArrayOutputStream output = new ByteArrayOutputStream()) { byte[] buffer = new byte[DEFAULT_BUFFER_SIZE]; @@ -25,5 +26,5 @@ public static byte[] toByteArray(final InputStream input) throws IOException { return output.toByteArray(); } } - + } diff --git a/src/test/java/test/com/qiniu/CdnTest.java b/src/test/java/test/com/qiniu/CdnTest.java index 5f82a9471..6fa96f3f3 100644 --- a/src/test/java/test/com/qiniu/CdnTest.java +++ b/src/test/java/test/com/qiniu/CdnTest.java @@ -17,12 +17,13 @@ * Updated by panyuan on 19/03/07 */ public class CdnTest { - - /** - * 获取日期 - * @param daysBefore - * @return - */ + + /** + * 获取日期 + * + * @param daysBefore + * @return + */ private String getDate(int daysBefore) { Calendar c = Calendar.getInstance(); c.add(Calendar.DAY_OF_MONTH, -daysBefore); @@ -146,14 +147,14 @@ public void testCreateTimestampAntiLeechUrlSimple() { long deadline3 = 1551966091; // 2019-03-07 21:41:31 +0800 CST String testUrl_z0_timeStamp_outdate = "http://javasdk-timestamp.peterpy.cn/peter/1.png?sign=00500d45e6fe0bf62b9814e3959841d1&t=5c811f8b"; try { - URL url = new URL(TestConfig.testUrl_z0_timeStamp); - Assert.assertEquals(403, getResponse(url.toString()).statusCode); - String signedUrl1 = CdnManager.createTimestampAntiLeechUrl(host, fileName, queryStringMap, encryptKey1, deadline1); - String signedUrl2 = CdnManager.createTimestampAntiLeechUrl(url, encryptKey2, deadline2); - String signedUrl3 = CdnManager.createTimestampAntiLeechUrl(host, fileName, null, encryptKey1, deadline3); - System.out.println(signedUrl1); - System.out.println(signedUrl2); - System.out.println(signedUrl3); + URL url = new URL(TestConfig.testUrl_z0_timeStamp); + Assert.assertEquals(403, getResponse(url.toString()).statusCode); + String signedUrl1 = CdnManager.createTimestampAntiLeechUrl(host, fileName, queryStringMap, encryptKey1, deadline1); + String signedUrl2 = CdnManager.createTimestampAntiLeechUrl(url, encryptKey2, deadline2); + String signedUrl3 = CdnManager.createTimestampAntiLeechUrl(host, fileName, null, encryptKey1, deadline3); + System.out.println(signedUrl1); + System.out.println(signedUrl2); + System.out.println(signedUrl3); Assert.assertEquals(200, getResponse(signedUrl1).statusCode); Assert.assertEquals(200, getResponse(signedUrl2).statusCode); Assert.assertEquals(403, getResponse(signedUrl3).statusCode); @@ -163,20 +164,21 @@ public void testCreateTimestampAntiLeechUrlSimple() { Assert.fail(); } } - + /** * 获取Response + * * @param url * @return */ public static Response getResponse(String url) { - try { - Client client = new Client(); - Response response = client.get(url); - return response; - } catch (QiniuException ex) { - return ex.response; - } + try { + Client client = new Client(); + Response response = client.get(url); + return response; + } catch (QiniuException ex) { + return ex.response; + } } } diff --git a/src/test/java/test/com/qiniu/DnsTest.java b/src/test/java/test/com/qiniu/DnsTest.java index 8053d8e67..f19df64ca 100644 --- a/src/test/java/test/com/qiniu/DnsTest.java +++ b/src/test/java/test/com/qiniu/DnsTest.java @@ -4,7 +4,6 @@ import com.qiniu.http.Dns; import com.qiniu.storage.Configuration; import com.qiniu.storage.UploadManager; -import org.junit.Test; import qiniu.happydns.DnsClient; import qiniu.happydns.Domain; import qiniu.happydns.IResolver; diff --git a/src/test/java/test/com/qiniu/HttpTest.java b/src/test/java/test/com/qiniu/HttpTest.java index 7d9671e2b..f2b9fd486 100644 --- a/src/test/java/test/com/qiniu/HttpTest.java +++ b/src/test/java/test/com/qiniu/HttpTest.java @@ -6,7 +6,6 @@ import com.qiniu.http.ProxyConfiguration; import com.qiniu.http.Response; import org.junit.Assert; -import org.junit.Test; public class HttpTest { private Client httpManager = new Client(); diff --git a/src/test/java/test/com/qiniu/TestConfig.java b/src/test/java/test/com/qiniu/TestConfig.java index da1b34a5d..e02d4bf84 100644 --- a/src/test/java/test/com/qiniu/TestConfig.java +++ b/src/test/java/test/com/qiniu/TestConfig.java @@ -1,11 +1,10 @@ package test.com.qiniu; import com.qiniu.util.Auth; - import test.com.qiniu.storage.FormUploadTest; public final class TestConfig { - + //dummy: ak, sk, ... public static final String dummyAccessKey = "abcdefghklmnopq"; public static final String dummySecretKey = "1234567890"; @@ -15,7 +14,7 @@ public final class TestConfig { public static final String dummyDomain = "dummy.qiniudn.com"; public static final String dummyUptoken = "ak:token:putpolicy"; public static final String dummyInvalidUptoken = "invalidtoken"; - + //test: ak, sk, auth public static final String testAccessKey = System.getenv("QINIU_ACCESS_KEY"); public static final String testSecretKey = System.getenv("QINIU_SECRET_KEY"); @@ -39,22 +38,22 @@ public final class TestConfig { public static final int ERROR_CODE_KEY_NOT_EXIST = 612; public static final String testLinkingAppid = System.getenv("QINIU_LINKING_APPID"); - + private TestConfig() { } - + public static boolean isTravis() { return "travis".equals(System.getenv("QINIU_TEST_ENV")); } - + public static void main(String[] args) { - try { - FormUploadTest t = new FormUploadTest(); - t.testFormUploadWithInputStream(); - System.out.println("done"); - } catch (Exception e) { - e.printStackTrace(); - } + try { + FormUploadTest t = new FormUploadTest(); + t.testFormUploadWithInputStream(); + System.out.println("done"); + } catch (Exception e) { + e.printStackTrace(); + } } - + } diff --git a/src/test/java/test/com/qiniu/linking/DeviceTest.java b/src/test/java/test/com/qiniu/linking/DeviceTest.java index f69199c35..0886df14b 100644 --- a/src/test/java/test/com/qiniu/linking/DeviceTest.java +++ b/src/test/java/test/com/qiniu/linking/DeviceTest.java @@ -3,24 +3,23 @@ import com.qiniu.common.QiniuException; import com.qiniu.http.Client; import com.qiniu.http.Response; -import com.qiniu.linking.*; +import com.qiniu.linking.LinkingDeviceManager; import com.qiniu.linking.model.*; import com.qiniu.util.Auth; - -import java.util.Date; - import com.qiniu.util.StringMap; -import com.qiniu.util.UrlSafeBase64; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; import test.com.qiniu.TestConfig; +import java.util.Date; + public class DeviceTest { private final static String testDeviceName1 = "test1"; private final static String testDeviceName2 = "test2"; private final static Client client = new Client(); + @Test @Ignore public void testDevice() throws QiniuException { @@ -37,24 +36,24 @@ public void testDevice() throws QiniuException { { //添加dak DeviceKey[] keys = deviceManager.addDeviceKey(testAppid, testDeviceName1); - Assert.assertNotEquals(keys.length,0); + Assert.assertNotEquals(keys.length, 0); } { //查询设备 DeviceKey[] keys = deviceManager.queryDeviceKey(testAppid, testDeviceName1); - Assert.assertEquals(keys.length,1); + Assert.assertEquals(keys.length, 1); //删除设备 deviceManager.deleteDeviceKey(testAppid, testDeviceName1, keys[0].getAccessKey()); keys = deviceManager.queryDeviceKey(testAppid, testDeviceName1); - Assert.assertEquals(keys.length,0); + Assert.assertEquals(keys.length, 0); } - { + { //列出设备 DeviceListing deviceslist = deviceManager.listDevice(testAppid, "", "", 1, false); - Assert.assertNotEquals(deviceslist.items.length,0); + Assert.assertNotEquals(deviceslist.items.length, 0); } @@ -62,7 +61,7 @@ public void testDevice() throws QiniuException { //修改设备字段 PatchOperation[] operations = {new PatchOperation("replace", "segmentExpireDays", 9)}; Device device = deviceManager.updateDevice(testAppid, testDeviceName1, operations); - Assert.assertEquals(device.getSegmentExpireDays(),9); + Assert.assertEquals(device.getSegmentExpireDays(), 9); } { @@ -122,14 +121,14 @@ public void testLinkingDeviceToken() throws QiniuException { LinkingDeviceManager deviceManager = new LinkingDeviceManager(TestConfig.testAuth); try { deviceManager.createDevice(testAppid, testDeviceName1); - StringMap map = new StringMap().put("dtoken",statusToken); + StringMap map = new StringMap().put("dtoken", statusToken); String queryString = map.formString(); String url = String.format("%s/v1/device/resource/status?%s", "http://linking.qiniuapi.com", queryString); Response res = client.get(url); int code = res.statusCode; res.close(); - Assert.assertNotEquals(code,401); + Assert.assertNotEquals(code, 401); } finally { deviceManager.deleteDevice(testAppid, testDeviceName1); } diff --git a/src/test/java/test/com/qiniu/processing/PfopTest.java b/src/test/java/test/com/qiniu/processing/PfopTest.java index 842bcc048..7af67af43 100644 --- a/src/test/java/test/com/qiniu/processing/PfopTest.java +++ b/src/test/java/test/com/qiniu/processing/PfopTest.java @@ -14,14 +14,14 @@ import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.fail; public class PfopTest { - - /** - * 测试pfop - * 检测jobid是否不为空 - */ + + /** + * 测试pfop + * 检测jobid是否不为空 + */ @Test public void testPfop() { Map cases = new HashMap(); @@ -65,7 +65,7 @@ public void testPfop() { @Test public void testPrefop() { try { - String jobid = "z0.5c81361a38b9f349c8bb5288"; + String jobid = "z0.5c81361a38b9f349c8bb5288"; Configuration cfg = new Configuration(Region.autoRegion()); OperationManager operationManager = new OperationManager(TestConfig.testAuth, cfg); OperationStatus status = operationManager.prefop(jobid); diff --git a/src/test/java/test/com/qiniu/rtc/RtcTest.java b/src/test/java/test/com/qiniu/rtc/RtcTest.java index 256d62dd9..86e5adb9c 100644 --- a/src/test/java/test/com/qiniu/rtc/RtcTest.java +++ b/src/test/java/test/com/qiniu/rtc/RtcTest.java @@ -5,7 +5,6 @@ import com.qiniu.rtc.RtcAppManager; import com.qiniu.rtc.RtcRoomManager; import com.qiniu.util.Auth; -import org.junit.Test; import test.com.qiniu.TestConfig; diff --git a/src/test/java/test/com/qiniu/storage/BucketTest.java b/src/test/java/test/com/qiniu/storage/BucketTest.java index e82e00615..1dedd87b4 100644 --- a/src/test/java/test/com/qiniu/storage/BucketTest.java +++ b/src/test/java/test/com/qiniu/storage/BucketTest.java @@ -23,6 +23,7 @@ public class BucketTest { /** * 初始化 + * * @throws Exception */ @Before @@ -218,13 +219,13 @@ public void testDelete() { String key = entry.getValue(); String copyKey = "delete" + Math.random(); try { - bucketManager.copy(bucket, key, bucket, copyKey, true); - bucketManager.delete(bucket, copyKey); + bucketManager.copy(bucket, key, bucket, copyKey, true); + bucketManager.delete(bucket, copyKey); } catch (QiniuException e) { - Assert.fail(bucket + ":" + key + "==> " + e.response.toString()); + Assert.fail(bucket + ":" + key + "==> " + e.response.toString()); } } - + Map entryCodeMap = new HashMap(); entryCodeMap.put(new String[]{TestConfig.testBucket_z0, TestConfig.dummyKey}, TestConfig.ERROR_CODE_KEY_NOT_EXIST); @@ -752,6 +753,7 @@ public void testChangeFileType() { /** * 测试设置空间私有化、公有化 + * * @throws QiniuException */ @Test @@ -773,6 +775,7 @@ public void testAcl() throws QiniuException { /** * 测试获取bucketinfo + * * @throws QiniuException */ @Test @@ -784,12 +787,13 @@ public void testBucketInfo() throws QiniuException { try { bucketManager.getBucketInfo("javasdk2"); } catch (QiniuException e) { - e.printStackTrace(); + e.printStackTrace(); } } /** * 测试noIndexPage + * * @throws QiniuException */ @Test diff --git a/src/test/java/test/com/qiniu/storage/FormUploadTest.java b/src/test/java/test/com/qiniu/storage/FormUploadTest.java index 595f0cb7a..32f570123 100644 --- a/src/test/java/test/com/qiniu/storage/FormUploadTest.java +++ b/src/test/java/test/com/qiniu/storage/FormUploadTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.*; public class FormUploadTest { - + UploadManager uploadManager = new UploadManager(new Configuration()); /** @@ -132,7 +132,7 @@ public void testInvalidToken() { } } } - + /** * 空data上传 * 检测Exception是否为IllegalArgumentException一类 @@ -151,6 +151,7 @@ public void testNoData() { /** * NULL token上传 * 检测Exception是否为IllegalArgumentException一类 + * * @throws Throwable */ @Test @@ -400,7 +401,7 @@ public void testFormLargeSize() { } String token = TestConfig.testAuth.uploadToken(bucket, expectKey); try { - uploadManager.put(f, expectKey, token, null, null, false); + uploadManager.put(f, expectKey, token, null, null, false); } catch (QiniuException e) { try { assertEquals("_", e.response.bodyString()); @@ -415,7 +416,7 @@ public void testFormLargeSize() { * 检测putThreshold是否生效 */ @SuppressWarnings("resource") - @Test + @Test public void testFormLargeSize2() { Map bucketKeyMap = new HashMap(); bucketKeyMap.put(TestConfig.testBucket_z0, Region.region0()); @@ -441,7 +442,7 @@ public void testFormLargeSize2() { String token = TestConfig.testAuth.uploadToken(bucket, expectKey); try { - uploadManager.put(bb, expectKey, token, null, null, false); + uploadManager.put(bb, expectKey, token, null, null, false); } catch (QiniuException e) { try { assertEquals("_", e.response.bodyString()); @@ -451,47 +452,47 @@ public void testFormLargeSize2() { } } } - - /** - * 测试inputStream 表单上传 - * 检测reqid是否为Null - * 检测状态码是否为200 - */ - @Test - public void testFormUploadWithInputStream() { - testFormUploadWithInputStream(1, -1); - testFormUploadWithInputStream(1, 0); - testFormUploadWithInputStream(1, 1000); - testFormUploadWithInputStream(4 * 1024, 4 * 1024 * 1024); - testFormUploadWithInputStream(5 * 1024, -1); - testFormUploadWithInputStream(5 * 1024, 5 * 1024 * 1024); - } - - /** - * 测试inputStream 表单上传 - * 检测reqid是否为Null - * 检测状态码是否为200 - */ - public void testFormUploadWithInputStream(long kiloSize, long size) { - - String token = TestConfig.testAuth.uploadToken(TestConfig.testBucket_z0, TestConfig.testBucket_z0, 3600, null); - System.out.println("token="+token); - - try { - File file = TempFile.createFile(kiloSize); - InputStream inputStream = new FileInputStream(file); - System.out.println("length=" + file.length()); - System.out.println("size=" + size); - Response response = uploadManager.put(inputStream, size, TestConfig.testBucket_z0, token, null, null, false); - System.out.println("code="+response.statusCode); - System.out.println("reqid="+response.reqId); - System.out.println(response.bodyString()); - assertNotNull(response.reqId); - assertEquals(200, response.statusCode); - } catch (Exception e) { - e.printStackTrace(); - } - } + + /** + * 测试inputStream 表单上传 + * 检测reqid是否为Null + * 检测状态码是否为200 + */ + @Test + public void testFormUploadWithInputStream() { + testFormUploadWithInputStream(1, -1); + testFormUploadWithInputStream(1, 0); + testFormUploadWithInputStream(1, 1000); + testFormUploadWithInputStream(4 * 1024, 4 * 1024 * 1024); + testFormUploadWithInputStream(5 * 1024, -1); + testFormUploadWithInputStream(5 * 1024, 5 * 1024 * 1024); + } + + /** + * 测试inputStream 表单上传 + * 检测reqid是否为Null + * 检测状态码是否为200 + */ + public void testFormUploadWithInputStream(long kiloSize, long size) { + + String token = TestConfig.testAuth.uploadToken(TestConfig.testBucket_z0, TestConfig.testBucket_z0, 3600, null); + System.out.println("token=" + token); + + try { + File file = TempFile.createFile(kiloSize); + InputStream inputStream = new FileInputStream(file); + System.out.println("length=" + file.length()); + System.out.println("size=" + size); + Response response = uploadManager.put(inputStream, size, TestConfig.testBucket_z0, token, null, null, false); + System.out.println("code=" + response.statusCode); + System.out.println("reqid=" + response.reqId); + System.out.println(response.bodyString()); + assertNotNull(response.reqId); + assertEquals(200, response.statusCode); + } catch (Exception e) { + e.printStackTrace(); + } + } class MyRet { public String hash; diff --git a/src/test/java/test/com/qiniu/storage/RecordUploadTest.java b/src/test/java/test/com/qiniu/storage/RecordUploadTest.java index 01a9faeb9..c40ac3c11 100644 --- a/src/test/java/test/com/qiniu/storage/RecordUploadTest.java +++ b/src/test/java/test/com/qiniu/storage/RecordUploadTest.java @@ -36,6 +36,7 @@ public class RecordUploadTest { /** * 断点续传 + * * @param size * @throws IOException */ @@ -172,32 +173,32 @@ public void test600k() throws Throwable { @Test public void test4M() throws Throwable { - if (TestConfig.isTravis()) { - return; + if (TestConfig.isTravis()) { + return; } template(1024 * 4); } @Test public void test4M1K() throws Throwable { - if (TestConfig.isTravis()) { - return; + if (TestConfig.isTravis()) { + return; } template(1024 * 4 + 1); } @Test public void test8M1k() throws Throwable { - if (TestConfig.isTravis()) { - return; + if (TestConfig.isTravis()) { + return; } template(1024 * 8 + 1); } @Test public void test25M1k() throws Throwable { - if (TestConfig.isTravis()) { - return; + if (TestConfig.isTravis()) { + return; } template(1024 * 25 + 1); } diff --git a/src/test/java/test/com/qiniu/storage/RegionTest.java b/src/test/java/test/com/qiniu/storage/RegionTest.java index f54163718..3fc988fbd 100644 --- a/src/test/java/test/com/qiniu/storage/RegionTest.java +++ b/src/test/java/test/com/qiniu/storage/RegionTest.java @@ -2,9 +2,8 @@ import com.qiniu.common.Region; import com.qiniu.common.Zone; -import org.junit.Test; - import org.junit.Assert; +import org.junit.Test; public class RegionTest { @Test diff --git a/src/test/java/test/com/qiniu/storage/ResumeUploadTest.java b/src/test/java/test/com/qiniu/storage/ResumeUploadTest.java index a6adf58ed..ff0c52961 100644 --- a/src/test/java/test/com/qiniu/storage/ResumeUploadTest.java +++ b/src/test/java/test/com/qiniu/storage/ResumeUploadTest.java @@ -23,10 +23,11 @@ public class ResumeUploadTest { - /** - * 检测自定义变量foo是否生效 - * @throws IOException - */ + /** + * 检测自定义变量foo是否生效 + * + * @throws IOException + */ @Test public void testXVar() throws IOException { @@ -67,6 +68,7 @@ public void testXVar() throws IOException { /** * 分片上传 * 检测key、hash、fszie、fname是否符合预期 + * * @param size * @param https * @throws IOException @@ -122,24 +124,24 @@ public void test600k2() throws IOException { @Test public void test4M() throws Throwable { - if (TestConfig.isTravis()) { - return; + if (TestConfig.isTravis()) { + return; } template(1024 * 4, false); } @Test public void test8M1k() throws Throwable { - if (TestConfig.isTravis()) { - return; + if (TestConfig.isTravis()) { + return; } template(1024 * 8 + 1, false); } @Test public void test8M1k2() throws Throwable { - if (TestConfig.isTravis()) { - return; + if (TestConfig.isTravis()) { + return; } template(1024 * 8 + 1, true); } diff --git a/src/test/java/test/com/qiniu/storage/StreamUploadTest.java b/src/test/java/test/com/qiniu/storage/StreamUploadTest.java index 3ed354d3d..c1995b339 100644 --- a/src/test/java/test/com/qiniu/storage/StreamUploadTest.java +++ b/src/test/java/test/com/qiniu/storage/StreamUploadTest.java @@ -119,24 +119,24 @@ public void test600k2() throws IOException { @Test public void test4M() throws Throwable { - if (TestConfig.isTravis()) { - return; + if (TestConfig.isTravis()) { + return; } template(1024 * 4, false); } @Test public void test8M1k() throws Throwable { - if (TestConfig.isTravis()) { - return; + if (TestConfig.isTravis()) { + return; } template(1024 * 8 + 1, false); } @Test public void test8M1k2() throws Throwable { - if (TestConfig.isTravis()) { - return; + if (TestConfig.isTravis()) { + return; } template(1024 * 8 + 1, true); } diff --git a/src/test/java/test/com/qiniu/streaming/StreamingTest.java b/src/test/java/test/com/qiniu/streaming/StreamingTest.java index e3b49cac1..f3c12f648 100644 --- a/src/test/java/test/com/qiniu/streaming/StreamingTest.java +++ b/src/test/java/test/com/qiniu/streaming/StreamingTest.java @@ -16,7 +16,7 @@ * Updated by panyuan on 19/3/12 */ public class StreamingTest { - + private Auth auth = TestConfig.testAuth; private String hub = "pilisdktest"; private String stream = "javasdk"; @@ -40,6 +40,7 @@ public void testGetNoExistStream() { /** * 测试创建、禁用、启用、获取流信息、列举 + * * @throws QiniuException */ @Test @@ -121,6 +122,7 @@ public void testStreamOperation() throws QiniuException { /** * 测试saveas * 检测返回状态码是否是404 + * * @throws QiniuException */ @Test @@ -128,13 +130,14 @@ public void testSaveAs() throws QiniuException { try { manager.saveAs(streamNoExist, "f\"ff.m3u8"); } catch (QiniuException e) { - assertEquals(404, e.response.statusCode); + assertEquals(404, e.response.statusCode); } } /** * 测试创建流 * 检测返回状态码是否为614 + * * @throws QiniuException */ @Test @@ -142,7 +145,7 @@ public void testCreate() throws QiniuException { try { manager.create(stream); } catch (QiniuException e) { - assertEquals(614, e.code()); + assertEquals(614, e.code()); } } diff --git a/src/test/java/test/com/qiniu/streaming/UrlTest.java b/src/test/java/test/com/qiniu/streaming/UrlTest.java index f04af04d9..5c7c23b18 100644 --- a/src/test/java/test/com/qiniu/streaming/UrlTest.java +++ b/src/test/java/test/com/qiniu/streaming/UrlTest.java @@ -1,7 +1,6 @@ package test.com.qiniu.streaming; import com.qiniu.streaming.UrlFactory; -import org.junit.Test; import test.com.qiniu.TestConfig; import static org.junit.Assert.assertTrue; From b62692dbfce6291aa50bbc038a0e8db230ff71ca Mon Sep 17 00:00:00 2001 From: Sxci Date: Fri, 15 Mar 2019 12:51:42 +0800 Subject: [PATCH 2/2] format [ci skip] --- .../java/com/qiniu/linking/LinkingDeviceManager.java | 3 ++- src/main/java/com/qiniu/storage/UploadManager.java | 9 +++++++-- src/main/java/com/qiniu/util/Auth.java | 3 ++- src/main/java/com/qiniu/util/IOUtils.java | 4 ++++ src/test/java/test/com/qiniu/CdnTest.java | 9 ++++++--- src/test/java/test/com/qiniu/linking/DeviceTest.java | 9 ++++++--- src/test/java/test/com/qiniu/processing/PfopTest.java | 9 ++++++--- src/test/java/test/com/qiniu/storage/FormUploadTest.java | 6 ++++-- 8 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/qiniu/linking/LinkingDeviceManager.java b/src/main/java/com/qiniu/linking/LinkingDeviceManager.java index 36c60e3ae..aeb1b5ef8 100644 --- a/src/main/java/com/qiniu/linking/LinkingDeviceManager.java +++ b/src/main/java/com/qiniu/linking/LinkingDeviceManager.java @@ -109,7 +109,8 @@ public Device updateDevice(String appid, String deviceName, PatchOperation[] ope } public DeviceHistoryListing listDeviceHistory(String appid, String deviceName, - long start, long end, String marker, int limit) throws QiniuException { + long start, long end, String marker, + int limit) throws QiniuException { String encodedDeviceName = UrlSafeBase64.encodeToString(deviceName); StringMap map = new StringMap().putNotEmpty("marker", marker). put("start", start).put("end", end).putWhen("limit", limit, limit > 0); diff --git a/src/main/java/com/qiniu/storage/UploadManager.java b/src/main/java/com/qiniu/storage/UploadManager.java index 1b24ca51f..c93a3e23d 100644 --- a/src/main/java/com/qiniu/storage/UploadManager.java +++ b/src/main/java/com/qiniu/storage/UploadManager.java @@ -103,11 +103,16 @@ public void accept(String key, Object value) { * @throws IOException */ public Response put(InputStream inputStream, long size, String key, String token, StringMap params, - String mime, boolean checkCrc) throws QiniuException, IOException { + String mime, boolean checkCrc) throws QiniuException { if (size < 0 || size > configuration.putThreshold) { return put(inputStream, key, token, params, mime); } - byte[] data = IOUtils.toByteArray(inputStream); + byte[] data = null; + try { + data = IOUtils.toByteArray(inputStream); + } catch (IOException e) { + throw new QiniuException(e); + } return put(data, key, token, params, mime, checkCrc); } diff --git a/src/main/java/com/qiniu/util/Auth.java b/src/main/java/com/qiniu/util/Auth.java index a7175c9d6..dbcf30d39 100755 --- a/src/main/java/com/qiniu/util/Auth.java +++ b/src/main/java/com/qiniu/util/Auth.java @@ -376,7 +376,8 @@ public String generateLinkingDeviceToken(String appid, String deviceName, long d return signWithData(StringUtils.utf8Bytes(s)); } - public String generateLinkingDeviceTokenWithExpires(String appid, String deviceName, long expires, String[] actions) { + public String generateLinkingDeviceTokenWithExpires(String appid, String deviceName, + long expires, String[] actions) { long deadline = (new Date().getTime() / 1000) + expires; return generateLinkingDeviceToken(appid, deviceName, deadline, actions); } diff --git a/src/main/java/com/qiniu/util/IOUtils.java b/src/main/java/com/qiniu/util/IOUtils.java index 286573512..4e13d0e23 100644 --- a/src/main/java/com/qiniu/util/IOUtils.java +++ b/src/main/java/com/qiniu/util/IOUtils.java @@ -8,6 +8,10 @@ public class IOUtils { private static final int DEFAULT_BUFFER_SIZE = 1024 * 4; + private IOUtils() { + + } + /** * 输入InputSteam，返回byte[]. * 参考：https://github.com/apache/commons-io/blob/master/src/main/java/org/apache/commons/io/IOUtils.java
diff --git a/src/test/java/test/com/qiniu/CdnTest.java b/src/test/java/test/com/qiniu/CdnTest.java index 6fa96f3f3..97b041a4d 100644 --- a/src/test/java/test/com/qiniu/CdnTest.java +++ b/src/test/java/test/com/qiniu/CdnTest.java @@ -145,13 +145,16 @@ public void testCreateTimestampAntiLeechUrlSimple() { long deadline1 = System.currentTimeMillis() / 1000 + 3600; long deadline2 = deadline1; long deadline3 = 1551966091; // 2019-03-07 21:41:31 +0800 CST - String testUrl_z0_timeStamp_outdate = "http://javasdk-timestamp.peterpy.cn/peter/1.png?sign=00500d45e6fe0bf62b9814e3959841d1&t=5c811f8b"; + String testUrl_z0_timeStamp_outdate = + "http://javasdk-timestamp.peterpy.cn/peter/1.png?sign=00500d45e6fe0bf62b9814e3959841d1&t=5c811f8b"; try { URL url = new URL(TestConfig.testUrl_z0_timeStamp); Assert.assertEquals(403, getResponse(url.toString()).statusCode); - String signedUrl1 = CdnManager.createTimestampAntiLeechUrl(host, fileName, queryStringMap, encryptKey1, deadline1); + String signedUrl1 = CdnManager.createTimestampAntiLeechUrl(host, fileName, queryStringMap, + encryptKey1, deadline1); String signedUrl2 = CdnManager.createTimestampAntiLeechUrl(url, encryptKey2, deadline2); - String signedUrl3 = CdnManager.createTimestampAntiLeechUrl(host, fileName, null, encryptKey1, deadline3); + String signedUrl3 = CdnManager.createTimestampAntiLeechUrl(host, fileName, null, + encryptKey1, deadline3); System.out.println(signedUrl1); System.out.println(signedUrl2); System.out.println(signedUrl3); diff --git a/src/test/java/test/com/qiniu/linking/DeviceTest.java b/src/test/java/test/com/qiniu/linking/DeviceTest.java index 0886df14b..b8e70fe01 100644 --- a/src/test/java/test/com/qiniu/linking/DeviceTest.java +++ b/src/test/java/test/com/qiniu/linking/DeviceTest.java @@ -16,9 +16,9 @@ public class DeviceTest { - private final static String testDeviceName1 = "test1"; - private final static String testDeviceName2 = "test2"; - private final static Client client = new Client(); + private static final String testDeviceName1 = "test1"; + private static final String testDeviceName2 = "test2"; + private static final Client client = new Client(); @Test @Ignore @@ -27,6 +27,7 @@ public void testDevice() throws QiniuException { String testAppid = TestConfig.testLinkingAppid; LinkingDeviceManager deviceManager = new LinkingDeviceManager(auth); try { + // CHECKSTYLE:OFF { //创建设备 @@ -69,6 +70,8 @@ public void testDevice() throws QiniuException { DeviceHistoryListing history = deviceManager.listDeviceHistory(testAppid, testDeviceName1, 0, (new Date().getTime()) / 1000, "", 0); } + + // CHECKSTYLE:ON } finally { //删除设备信息 deviceManager.deleteDevice(testAppid, testDeviceName1); diff --git a/src/test/java/test/com/qiniu/processing/PfopTest.java b/src/test/java/test/com/qiniu/processing/PfopTest.java index 7af67af43..0683ff0d3 100644 --- a/src/test/java/test/com/qiniu/processing/PfopTest.java +++ b/src/test/java/test/com/qiniu/processing/PfopTest.java @@ -36,10 +36,12 @@ public void testPfop() { boolean force = true; String m3u8SaveEntry = String.format("%s:%s", bucket, TestConfig.testMp4FileKey + "_320x240.m3u8"); - String fopM3u8 = String.format("avthumb/m3u8/segtime/10/vcodec/libx264/s/320x240|saveas/%s", UrlSafeBase64.encodeToString(String.format(m3u8SaveEntry))); + String fopM3u8 = String.format("avthumb/m3u8/segtime/10/vcodec/libx264/s/320x240|saveas/%s", + UrlSafeBase64.encodeToString(String.format(m3u8SaveEntry))); String mp4SaveEntry = String.format("%s:%s", bucket, TestConfig.testMp4FileKey + "_320x240.mp4"); - String fopMp4 = String.format("avthumb/mp4/vcodec/libx264/s/320x240|saveas/%s", UrlSafeBase64.encodeToString(mp4SaveEntry)); + String fopMp4 = String.format("avthumb/mp4/vcodec/libx264/s/320x240|saveas/%s", + UrlSafeBase64.encodeToString(mp4SaveEntry)); String fops = StringUtils.join(new String[]{fopM3u8, fopMp4}, ";"); System.out.println(fops); @@ -47,7 +49,8 @@ public void testPfop() { try { Configuration cfg = new Configuration(region); OperationManager operationManager = new OperationManager(TestConfig.testAuth, cfg); - String jobid = operationManager.pfop(bucket, TestConfig.testMp4FileKey, fops, null, notifyURL, force); + String jobid = operationManager.pfop(bucket, TestConfig.testMp4FileKey, fops, null, + notifyURL, force); Assert.assertNotNull(jobid); Assert.assertNotEquals("", jobid); String purl = "https://api.qiniu.com/status/get/prefop?id=" + jobid; diff --git a/src/test/java/test/com/qiniu/storage/FormUploadTest.java b/src/test/java/test/com/qiniu/storage/FormUploadTest.java index 32f570123..69d05d202 100644 --- a/src/test/java/test/com/qiniu/storage/FormUploadTest.java +++ b/src/test/java/test/com/qiniu/storage/FormUploadTest.java @@ -475,7 +475,8 @@ public void testFormUploadWithInputStream() { */ public void testFormUploadWithInputStream(long kiloSize, long size) { - String token = TestConfig.testAuth.uploadToken(TestConfig.testBucket_z0, TestConfig.testBucket_z0, 3600, null); + String token = TestConfig.testAuth.uploadToken(TestConfig.testBucket_z0, TestConfig.testBucket_z0, + 3600, null); System.out.println("token=" + token); try { @@ -483,7 +484,8 @@ public void testFormUploadWithInputStream(long kiloSize, long size) { InputStream inputStream = new FileInputStream(file); System.out.println("length=" + file.length()); System.out.println("size=" + size); - Response response = uploadManager.put(inputStream, size, TestConfig.testBucket_z0, token, null, null, false); + Response response = uploadManager.put(inputStream, size, TestConfig.testBucket_z0, token, null, + null, false); System.out.println("code=" + response.statusCode); System.out.println("reqid=" + response.reqId); System.out.println(response.bodyString());