Skip to content

Commit 109f868

Browse files
YangSen-qnYangSen-qn
YangSen-qn
and
YangSen-qn
authored
delete fog east host (#606)
Co-authored-by: YangSen-qn <[email protected]>
1 parent 5bfcde4 commit 109f868

File tree

12 files changed

+61
-78
lines changed

12 files changed

+61
-78
lines changed

‎examples/upload_v1_api.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public class UploadDemo {
2828
* 华南机房(region2): up-z2.qiniup.com 或 upload-z2.qiniup.com
2929
* 北美机房(regionNa0): up-na0.qiniup.com 或 upload-na0.qiniup.com
3030
* 新加坡机房(regionAs0): up-as0.qiniup.com 或 upload-as0.qiniup.com
31-
* 雾存储华东一区(regionFogCnEast1): up-fog-cn-east-1.qiniup.com 或 upload-fog-cn-east-1.qiniup.com
3231
*/
3332
String urlPrefix = "urlPrefix"; // http://up.qiniup.com
3433
//要上传的空间

‎examples/upload_v2_api.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public class UploadDemo {
2424
* 华南机房(region2): up-z2.qiniup.com 或 upload-z2.qiniup.com
2525
* 北美机房(regionNa0): up-na0.qiniup.com 或 upload-na0.qiniup.com
2626
* 新加坡机房(regionAs0): up-as0.qiniup.com 或 upload-as0.qiniup.com
27-
* 雾存储华东一区(regionFogCnEast1): up-fog-cn-east-1.qiniup.com 或 upload-fog-cn-east-1.qiniup.com
2827
*/
2928
String urlPrefix = "urlPrefix" // http://up.qiniup.com";
3029
// 要上传的空间

‎src/main/java/com/qiniu/storage/Api.java‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
import com.qiniu.http.Client;
55
import com.qiniu.http.MethodType;
66
import com.qiniu.http.RequestStreamBody;
7-
import com.qiniu.util.Auth;
8-
import com.qiniu.util.Json;
9-
import com.qiniu.util.StringMap;
10-
import com.qiniu.util.StringUtils;
7+
import com.qiniu.util.*;
118
import okhttp3.MediaType;
129
import okhttp3.MultipartBody;
1310
import okhttp3.RequestBody;
@@ -461,7 +458,16 @@ public String getHost() throws QiniuException {
461458
}
462459

463460
void setHost(String host) {
464-
this.host = host;
461+
URL tmpUrl = UrlUtils.parseHost(host);
462+
if (tmpUrl == null) {
463+
this.host = null;
464+
return;
465+
}
466+
467+
this.host = tmpUrl.getHost();
468+
if (tmpUrl.getPort() >= 0) {
469+
this.port = tmpUrl.getPort();
470+
}
465471
}
466472

467473
/**

‎src/main/java/com/qiniu/storage/UpHostHelper.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ private String failedUpHost(String regionKey) {
6767
this.add("upload-z2.qiniup.com");
6868
this.add("upload-na0.qiniup.com");
6969
this.add("upload-as0.qiniup.com");
70-
this.add("upload-fog-cn-east-1.qiniup.com");
7170
}
7271
};
7372
Collections.shuffle(accHosts); // ?

‎src/main/java/com/qiniu/util/UrlUtils.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.qiniu.util;
22

33
import java.io.CharArrayWriter;
4+
import java.net.MalformedURLException;
5+
import java.net.URL;
46
import java.nio.charset.Charset;
57
import java.util.BitSet;
68

@@ -191,6 +193,19 @@ public static String removeHostScheme(String host) {
191193
return host;
192194
}
193195

196+
public static URL parseHost(String host) {
197+
if (StringUtils.isNullOrEmpty(host)) {
198+
return null;
199+
}
200+
201+
String tmpHost = setHostScheme(host, true);
202+
try {
203+
return new URL(tmpHost);
204+
} catch (MalformedURLException e) {
205+
return null;
206+
}
207+
}
208+
194209

195210
/**
196211
* 如果 host 包含 scheme 则优先使用 host 中包含的 scheme

‎src/test/java/test/com/qiniu/TestConfig.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,6 @@ public String getRegionId() {
346346
public Region getRegion() {
347347
return region;
348348
}
349-
350-
public boolean isFog() {
351-
return regionId.equals("fog-cn-east-1");
352-
}
353349
}
354350

355351
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
import org.junit.jupiter.api.Test;
1414
import test.com.qiniu.ResCode;
1515
import test.com.qiniu.TestConfig;
16+
1617
import java.util.*;
18+
1719
import static org.junit.jupiter.api.Assertions.assertEquals;
1820
import static org.junit.jupiter.api.Assertions.assertNotEquals;
1921
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -31,9 +33,7 @@ public void testPfop() throws QiniuException {
3133
Map<String, Region> bucketKeyMap = new HashMap<String, Region>();
3234
TestConfig.TestFile[] files = TestConfig.getTestFileArray();
3335
for (TestConfig.TestFile testFile : files) {
34-
if (!testFile.isFog()) {
35-
bucketKeyMap.put(testFile.getBucketName(), testFile.getRegion());
36-
}
36+
bucketKeyMap.put(testFile.getBucketName(), testFile.getRegion());
3737
}
3838
List<String> ids = new ArrayList<>();
3939

@@ -55,7 +55,7 @@ public void testPfop() throws QiniuException {
5555
String fopMp4 = String.format("avthumb/mp4/vcodec/libx264/s/320x240|saveas/%s",
5656
UrlSafeBase64.encodeToString(mp4SaveEntry));
5757

58-
String fops = StringUtils.join(new String[] { fopM3u8, fopMp4 }, ";");
58+
String fops = StringUtils.join(new String[]{fopM3u8, fopMp4}, ";");
5959
System.out.println(fops);
6060

6161
try {

‎src/test/java/test/com/qiniu/storage/BucketTest.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -509,11 +509,6 @@ public void testFetch() throws Exception {
509509
testFileWithHandler(new TestFileHandler() {
510510
@Override
511511
public void testFile(TestConfig.TestFile file, BucketManager bucketManager) throws IOException {
512-
// 雾存储不支持 fetch
513-
if (file.isFog()) {
514-
return;
515-
}
516-
517512
try {
518513
String resUrl = "http://devtools.qiniu.com/qiniu.png";
519514
String resKey = "qiniu.png";
@@ -972,11 +967,6 @@ public void testPutBucketAccessStyleMode() throws Exception {
972967
testFileWithHandler(new TestFileHandler() {
973968
@Override
974969
public void testFile(TestConfig.TestFile file, BucketManager bucketManager) throws IOException {
975-
// 雾存储没有域名
976-
if (file.isFog()) {
977-
return;
978-
}
979-
980970
String bucket = file.getBucketName();
981971
String url = file.getTestUrl();
982972
System.out.println(bucket + " -- " + url);
@@ -1590,11 +1580,6 @@ public void testChangeFileType() throws Exception {
15901580
testFileWithHandler(new TestFileHandler() {
15911581
@Override
15921582
public void testFile(TestConfig.TestFile file, BucketManager bucketManager) throws IOException {
1593-
// 雾存储不支持 changeType
1594-
if (file.isFog()) {
1595-
return;
1596-
}
1597-
15981583
String bucket = file.getBucketName();
15991584
String key = file.getKey();
16001585
String keyToChangeType = "keyToChangeType" + Math.random();

‎src/test/java/test/com/qiniu/storage/RecordUploadTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ private void template(final int size, boolean isResumeV2, boolean isConcurrent)
5252

5353
TestConfig.TestFile[] files = TestConfig.getTestFileArray();
5454
for (TestConfig.TestFile file : files) {
55-
// 雾存储不支持 v1
56-
if (file.isFog() && !isResumeV2) {
57-
continue;
58-
}
5955
String bucket = file.getBucketName();
6056
final Region region = file.getRegion();
6157

‎src/test/java/test/com/qiniu/storage/ResumeUploadTest.java‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
import org.junit.jupiter.api.Test;
1515
import test.com.qiniu.TempFile;
1616
import test.com.qiniu.TestConfig;
17+
1718
import static org.junit.jupiter.api.Assertions.assertEquals;
1819
import static org.junit.jupiter.api.Assertions.assertNotNull;
1920
import static org.junit.jupiter.api.Assertions.assertTrue;
2021
import static org.junit.jupiter.api.Assertions.fail;
22+
2123
import java.io.File;
2224
import java.io.FileInputStream;
2325
import java.io.IOException;
@@ -33,12 +35,12 @@ public class ResumeUploadTest {
3335

3436
private static boolean[][] testConfigList = {
3537
// isHttps, isResumeV2, isStream, isConcurrent
36-
{ false, true, false, false }, { false, false, false, true }, { false, false, true, false },
37-
{ false, false, true, true }, { false, true, false, false }, { false, true, false, true },
38-
{ false, true, true, false }, { false, true, true, true }, { true, false, false, false },
39-
{ true, false, false, true }, { true, false, true, false }, { true, false, true, true },
40-
{ true, true, false, false }, { true, true, false, true }, { true, true, true, false },
41-
{ true, true, true, true } };
38+
{false, true, false, false}, {false, false, false, true}, {false, false, true, false},
39+
{false, false, true, true}, {false, true, false, false}, {false, true, false, true},
40+
{false, true, true, false}, {false, true, true, true}, {true, false, false, false},
41+
{true, false, false, true}, {true, false, true, false}, {true, false, true, true},
42+
{true, true, false, false}, {true, true, false, true}, {true, true, true, false},
43+
{true, true, true, true}};
4244

4345
/**
4446
* 检测自定义变量foo是否生效
@@ -51,10 +53,6 @@ public void testXVar() throws IOException {
5153

5254
TestConfig.TestFile[] files = TestConfig.getTestFileArray();
5355
for (TestConfig.TestFile file : files) {
54-
// 雾存储不支持 v1
55-
if (file.isFog()) {
56-
continue;
57-
}
5856
String bucket = file.getBucketName();
5957
Region region = file.getRegion();
6058
final String expectKey = "世/界";
@@ -99,10 +97,6 @@ private void template(int size, boolean isHttps, boolean isResumeV2, boolean isS
9997
throws IOException {
10098
TestConfig.TestFile[] files = TestConfig.getTestFileArray();
10199
for (TestConfig.TestFile file : files) {
102-
// 雾存储不支持 v1
103-
if (file.isFog() && !isResumeV2) {
104-
continue;
105-
}
106100
String bucket = file.getBucketName();
107101
Region region = file.getRegion();
108102
Configuration config = new Configuration(region);
@@ -169,14 +163,12 @@ private void template(int size, boolean isHttps, boolean isResumeV2, boolean isS
169163
checkMd5 = true;
170164
}
171165
if (checkMd5) {
172-
if (!file.isFog()) {
173-
String md5 = Md5.md5(f);
174-
String serverMd5 = getFileMD5(file.getTestDomain(), expectKey);
175-
System.out.println(" md5:" + md5);
176-
System.out.println("serverMd5:" + serverMd5);
177-
assertNotNull(serverMd5);
178-
assertEquals(md5, serverMd5);
179-
}
166+
String md5 = Md5.md5(f);
167+
String serverMd5 = getFileMD5(file.getTestDomain(), expectKey);
168+
System.out.println(" md5:" + md5);
169+
System.out.println("serverMd5:" + serverMd5);
170+
assertNotNull(serverMd5);
171+
assertEquals(md5, serverMd5);
180172
} else {
181173
final String etag = Etag.file(f);
182174
System.out.println(" etag:" + etag);

0 commit comments

Comments
 (0)