Skip to content

Commit d9f51cd

Browse files
缘潘缘潘
authored andcommitted
fix Travis CI and bugs
1 parent 46b5b86 commit d9f51cd

File tree

4 files changed

+169
-99
lines changed

4 files changed

+169
-99
lines changed

src/main/java/com/qiniu/processing/OperationManager.java

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -165,21 +165,7 @@ public OperationStatus prefop(String persistentId) throws QiniuException {
165165
public <T> T prefop(String persistentId, Class<T> retClass) throws QiniuException {
166166
StringMap params = new StringMap().put("id", persistentId);
167167
byte[] data = StringUtils.utf8Bytes(params.formString());
168-
String apiHost;
169-
170-
if (this.configuration.region != null) {
171-
apiHost = this.configuration.region.getApiHost();
172-
if (this.configuration.useHttpsDomains) {
173-
apiHost = this.configuration.region.getApiHost();
174-
}
175-
} else {
176-
apiHost = "http://api.qiniu.com";
177-
if (this.configuration.useHttpsDomains) {
178-
apiHost = "https://api.qiniu.com";
179-
}
180-
}
181-
182-
String url = String.format("%s/status/get/prefop", apiHost);
168+
String url = String.format("%s/status/get/prefop", configuration.apiHost());
183169
Response response = this.client.post(url, data, null, Client.FormMime);
184170
return response.jsonToObject(retClass);
185171
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,7 @@ public void prefetch(String bucket, String key) throws QiniuException {
546546
* @param bucket 空间名称
547547
* @param srcSiteUrl 镜像回源地址
548548
*/
549+
// TODO:准备干掉setImage、unsetImage,重写
549550
public Response setImage(String bucket, String srcSiteUrl) throws QiniuException {
550551
return setImage(bucket, srcSiteUrl, null);
551552
}
@@ -557,6 +558,7 @@ public Response setImage(String bucket, String srcSiteUrl) throws QiniuException
557558
* @param srcSiteUrl 镜像回源地址
558559
* @param host 镜像回源Host
559560
*/
561+
// TODO:准备干掉setImage、unsetImage,重写
560562
public Response setImage(String bucket, String srcSiteUrl, String host) throws QiniuException {
561563
String encodedSiteUrl = UrlSafeBase64.encodeToString(srcSiteUrl);
562564
String encodedHost = null;
@@ -575,6 +577,7 @@ public Response setImage(String bucket, String srcSiteUrl, String host) throws Q
575577
*
576578
* @param bucket 空间名称
577579
*/
580+
// TODO:准备干掉setImage、unsetImage,重写
578581
public Response unsetImage(String bucket) throws QiniuException {
579582
String path = String.format("/unimage/%s", bucket);
580583
return pubPost(path);

src/test/java/test/com/qiniu/processing/PfopTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void testPfop() {
6666
public void testPrefop() {
6767
try {
6868
String jobid = "z0.5c81361a38b9f349c8bb5288";
69-
Configuration cfg = new Configuration();
69+
Configuration cfg = new Configuration(Region.autoRegion());
7070
OperationManager operationManager = new OperationManager(TestConfig.testAuth, cfg);
7171
OperationStatus status = operationManager.prefop(jobid);
7272
Assert.assertEquals(0, status.code);

0 commit comments

Comments
 (0)