Skip to content

Commit 3717643

Browse files
LihaoLiuXsLihaoLiuXs
committed
Remove the new getHttpTransportDirect and add the record files
1 parent 750c02d commit 3717643

File tree

34 files changed

+248
-396
lines changed

34 files changed

+248
-396
lines changed

‎blob/blob-client/src/test/java/com/salesforce/multicloudj/blob/client/AbstractBlobStoreIT.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,6 @@ public void testDelete() throws IOException {
932932

933933
// Note: This tests bulk delete for non-versioned buckets
934934
@Test
935-
@Disabled("disable the failed tests")
936935
public void testBulkDelete() throws IOException {
937936
class TestConfig {
938937
final String testName;
@@ -1158,7 +1157,6 @@ public void testBulkVersionedDelete_emptyCollection() throws IOException {
11581157
}
11591158

11601159
@Test
1161-
@Disabled("disable the failed tests")
11621160
public void testBulkVersionedDelete_nonExistingBlob() throws IOException {
11631161
runBulkVersionedDeleteTest(
11641162
"testBulkVersionedDelete_nonExistingBlob",
@@ -1168,7 +1166,6 @@ public void testBulkVersionedDelete_nonExistingBlob() throws IOException {
11681166
}
11691167

11701168
@Test
1171-
@Disabled("disable the failed tests")
11721169
public void testBulkVersionedDelete_happyPath() throws IOException {
11731170
runBulkVersionedDeleteTest(
11741171
"testBulkVersionedDelete_happyPath",
@@ -1178,7 +1175,6 @@ public void testBulkVersionedDelete_happyPath() throws IOException {
11781175
}
11791176

11801177
@Test
1181-
@Disabled("disable the failed tests")
11821178
public void testBulkVersionedDelete_happyPathWithNonExisting() throws IOException {
11831179
runBulkVersionedDeleteTest(
11841180
"testBulkVersionedDelete_happyPathWithNonExisting",
@@ -1188,7 +1184,6 @@ public void testBulkVersionedDelete_happyPathWithNonExisting() throws IOExceptio
11881184
}
11891185

11901186
@Test
1191-
@Disabled("disable the failed tests")
11921187
public void testBulkVersionedDelete_duplicateDeletion() throws IOException {
11931188
runBulkVersionedDeleteTest(
11941189
"testBulkVersionedDelete_duplicateDeletion",

‎blob/blob-gcp/src/test/java/com/salesforce/multicloudj/blob/gcp/GcpBlobStoreIT.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ private AbstractBlobStore createBlobStore(
8080
final String bucketName, final Credentials credentials) {
8181

8282
// Connect directly to WireMock HTTPS to record/replay the full request (no CONNECT tunnel)
83-
String host = "https://" + WIREMOCK_HOST + ":" + port;
8483
HttpTransport httpTransport = TestsUtilGcp.getHttpTransport(port);
8584
HttpTransportOptions transportOptions =
8685
HttpTransportOptions.newBuilder().setHttpTransportFactory(() -> httpTransport).build();
@@ -89,7 +88,7 @@ private AbstractBlobStore createBlobStore(
8988
StorageOptions.newBuilder()
9089
.setTransportOptions(transportOptions)
9190
.setCredentials(credentials)
92-
.setHost(host)
91+
.setHost(endpoint)
9392
.build()
9493
.getService();
9594

‎blob/blob-gcp/src/test/resources/mappings/gcpblobstoreit_testgetobjectlock_afteruploadwithretentioncompliance-delete-0.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"id" : "9c10319c-9499-4c7c-b7cc-ed560b898868",
2+
"id" : "d3a2810a-c057-4046-a207-c6e91fe583b6",
33
"name" : "GcpBlobStoreIT_testGetObjectLock_afterUploadWithRetentionCompliance-DELETE-0",
44
"request" : {
55
"url" : "/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o/conformance-tests%2Fobjectlock%2Fretention-compliance",
@@ -11,15 +11,15 @@
1111
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000",
1212
"Server" : "UploadServer",
1313
"Cache-Control" : "no-cache, no-store, max-age=0, must-revalidate",
14-
"X-GUploader-UploadID" : "AGQBYWwpan023yo3riLrTqXUnOGW5I44IXP9cm0OM-ckzoUKE3LJ6h9kQI5T8y3vui3LIiLj",
14+
"X-GUploader-UploadID" : "AGQBYWy-7CsKuMaeWnUB44Cw4g1qBW7sUB4cuNTp9eoP_aGU9BEOcp5fzqAhnY6g0s7HZdAF",
1515
"Vary" : [ "Origin", "X-Origin" ],
1616
"Pragma" : "no-cache",
1717
"Expires" : "Mon, 01 Jan 1990 00:00:00 GMT",
18-
"Date" : "Tue, 10 Mar 2026 15:55:20 GMT",
18+
"Date" : "Tue, 10 Mar 2026 22:27:26 GMT",
1919
"Content-Type" : "application/json"
2020
}
2121
},
22-
"uuid" : "9c10319c-9499-4c7c-b7cc-ed560b898868",
22+
"uuid" : "d3a2810a-c057-4046-a207-c6e91fe583b6",
2323
"persistent" : true,
24-
"insertionIndex" : 953
24+
"insertionIndex" : 945
2525
}

‎blob/blob-gcp/src/test/resources/mappings/gcpblobstoreit_testgetobjectlock_afteruploadwithretentioncompliance-get-1.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"id" : "f7847f43-d673-4d5b-a0f5-8187f93aaa42",
2+
"id" : "91a9e07c-7651-4354-84a3-1fe8570f9328",
33
"name" : "GcpBlobStoreIT_testGetObjectLock_afterUploadWithRetentionCompliance-GET-1",
44
"request" : {
55
"url" : "/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o?maxResults=1&projection=full",
@@ -12,14 +12,14 @@
1212
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000",
1313
"Server" : "UploadServer",
1414
"Cache-Control" : "private, max-age=0, must-revalidate, no-transform",
15-
"X-GUploader-UploadID" : "AGQBYWwIYRIcaXwFjFUhdKcxMPbpIS8kpKnI4xf96bFMRkaPKv-UQXXN3e2ol6s78_YMcbAl",
15+
"X-GUploader-UploadID" : "AGQBYWw8i3bUqBsZ8V8-IqcAJu5VPs-KuTc2vJsbdKqBEqRDCGXmve0-ermwZQzPe6SZyQayi617TmM",
1616
"Vary" : [ "Origin", "X-Origin" ],
17-
"Expires" : "Tue, 10 Mar 2026 15:55:19 GMT",
18-
"Date" : "Tue, 10 Mar 2026 15:55:19 GMT",
17+
"Expires" : "Tue, 10 Mar 2026 22:27:25 GMT",
18+
"Date" : "Tue, 10 Mar 2026 22:27:25 GMT",
1919
"Content-Type" : "application/json; charset=UTF-8"
2020
}
2121
},
22-
"uuid" : "f7847f43-d673-4d5b-a0f5-8187f93aaa42",
22+
"uuid" : "91a9e07c-7651-4354-84a3-1fe8570f9328",
2323
"persistent" : true,
24-
"insertionIndex" : 954
24+
"insertionIndex" : 946
2525
}

‎blob/blob-gcp/src/test/resources/mappings/gcpblobstoreit_testgetobjectlock_afteruploadwithretentioncompliance-get-2.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
2-
"id" : "8392c643-2be3-400e-8ed6-f38223f676b0",
2+
"id" : "19c80e52-fb58-4ed1-9378-d5753db6e2ab",
33
"name" : "GcpBlobStoreIT_testGetObjectLock_afterUploadWithRetentionCompliance-GET-2",
44
"request" : {
55
"url" : "/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o/conformance-tests%2Fobjectlock%2Fretention-compliance?projection=full",
66
"method" : "GET"
77
},
88
"response" : {
99
"status" : 200,
10-
"body" : "{\n \"kind\": \"storage#object\",\n \"id\": \"substrate-sdk-gcp-poc1-test-bucket-versioned/conformance-tests/objectlock/retention-compliance/1773158118723625\",\n \"selfLink\": \"https://www.googleapis.com/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o/conformance-tests%2Fobjectlock%2Fretention-compliance\",\n \"mediaLink\": \"https://storage.googleapis.com/download/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o/conformance-tests%2Fobjectlock%2Fretention-compliance?generation=1773158118723625&alt=media\",\n \"name\": \"conformance-tests/objectlock/retention-compliance\",\n \"bucket\": \"substrate-sdk-gcp-poc1-test-bucket-versioned\",\n \"generation\": \"1773158118723625\",\n \"metageneration\": \"1\",\n \"contentType\": \"application/octet-stream\",\n \"storageClass\": \"STANDARD\",\n \"size\": \"37\",\n \"md5Hash\": \"oNJGr8D4uvHn3WAsgO/ZZw==\",\n \"crc32c\": \"4z8aNg==\",\n \"etag\": \"CKmgsN7YlZMDEAE=\",\n \"temporaryHold\": false,\n \"retentionExpirationTime\": \"2026-03-11T15:47:25.512Z\",\n \"retention\": {\n \"retainUntilTime\": \"2026-03-11T15:47:25.512Z\",\n \"mode\": \"Locked\"\n },\n \"timeCreated\": \"2026-03-10T15:55:18.783Z\",\n \"updated\": \"2026-03-10T15:55:18.783Z\",\n \"timeStorageClassUpdated\": \"2026-03-10T15:55:18.783Z\",\n \"timeFinalized\": \"2026-03-10T15:55:18.783Z\"\n}\n",
10+
"body" : "{\n \"kind\": \"storage#object\",\n \"id\": \"substrate-sdk-gcp-poc1-test-bucket-versioned/conformance-tests/objectlock/retention-compliance/1773181644530892\",\n \"selfLink\": \"https://www.googleapis.com/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o/conformance-tests%2Fobjectlock%2Fretention-compliance\",\n \"mediaLink\": \"https://storage.googleapis.com/download/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o/conformance-tests%2Fobjectlock%2Fretention-compliance?generation=1773181644530892&alt=media\",\n \"name\": \"conformance-tests/objectlock/retention-compliance\",\n \"bucket\": \"substrate-sdk-gcp-poc1-test-bucket-versioned\",\n \"generation\": \"1773181644530892\",\n \"metageneration\": \"1\",\n \"contentType\": \"application/octet-stream\",\n \"storageClass\": \"STANDARD\",\n \"size\": \"37\",\n \"md5Hash\": \"oNJGr8D4uvHn3WAsgO/ZZw==\",\n \"crc32c\": \"4z8aNg==\",\n \"etag\": \"CMzJrbCwlpMDEAE=\",\n \"temporaryHold\": false,\n \"retentionExpirationTime\": \"2026-03-11T15:47:25.512Z\",\n \"retention\": {\n \"retainUntilTime\": \"2026-03-11T15:47:25.512Z\",\n \"mode\": \"Locked\"\n },\n \"timeCreated\": \"2026-03-10T22:27:24.588Z\",\n \"updated\": \"2026-03-10T22:27:24.588Z\",\n \"timeStorageClassUpdated\": \"2026-03-10T22:27:24.588Z\",\n \"timeFinalized\": \"2026-03-10T22:27:24.588Z\"\n}\n",
1111
"headers" : {
1212
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000",
1313
"Server" : "UploadServer",
1414
"Cache-Control" : "private, max-age=0, must-revalidate, no-transform",
15-
"ETag" : "CKmgsN7YlZMDEAE=",
16-
"X-GUploader-UploadID" : "AGQBYWzX6EX88tHCCh7CyFwgygM-i7TzA9sHqN1Mbfrtjn7OXAO2aMKBt51JI_XoazZjUgZ2",
15+
"ETag" : "CMzJrbCwlpMDEAE=",
16+
"X-GUploader-UploadID" : "AGQBYWyuov3gZIZ7RJmYjBovijOBH5o9imR5N7bZbxXcHXEMlTt5cxO5ErqaeP-0yXu9CkZP",
1717
"Vary" : [ "Origin", "X-Origin" ],
18-
"Expires" : "Tue, 10 Mar 2026 15:55:19 GMT",
19-
"Date" : "Tue, 10 Mar 2026 15:55:19 GMT",
18+
"Expires" : "Tue, 10 Mar 2026 22:27:25 GMT",
19+
"Date" : "Tue, 10 Mar 2026 22:27:25 GMT",
2020
"Content-Type" : "application/json; charset=UTF-8"
2121
}
2222
},
23-
"uuid" : "8392c643-2be3-400e-8ed6-f38223f676b0",
23+
"uuid" : "19c80e52-fb58-4ed1-9378-d5753db6e2ab",
2424
"persistent" : true,
2525
"scenarioName" : "scenario-1-storage-v1-b-substrate-sdk-gcp-poc1-test-bucket-versioned-o-conformance-tests-objectlock-retention-compliance",
2626
"requiredScenarioState" : "scenario-1-storage-v1-b-substrate-sdk-gcp-poc1-test-bucket-versioned-o-conformance-tests-objectlock-retention-compliance-2",
27-
"insertionIndex" : 955
27+
"insertionIndex" : 947
2828
}

‎blob/blob-gcp/src/test/resources/mappings/gcpblobstoreit_testgetobjectlock_afteruploadwithretentioncompliance-get-3.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
{
2-
"id" : "0ed0cdd3-00ba-4ec2-8c05-38237788343d",
2+
"id" : "bf273e11-3dab-4274-a544-3f2f735b5332",
33
"name" : "GcpBlobStoreIT_testGetObjectLock_afterUploadWithRetentionCompliance-GET-3",
44
"request" : {
55
"url" : "/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o/conformance-tests%2Fobjectlock%2Fretention-compliance?projection=full",
66
"method" : "GET"
77
},
88
"response" : {
99
"status" : 200,
10-
"body" : "{\n \"kind\": \"storage#object\",\n \"id\": \"substrate-sdk-gcp-poc1-test-bucket-versioned/conformance-tests/objectlock/retention-compliance/1773158118723625\",\n \"selfLink\": \"https://www.googleapis.com/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o/conformance-tests%2Fobjectlock%2Fretention-compliance\",\n \"mediaLink\": \"https://storage.googleapis.com/download/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o/conformance-tests%2Fobjectlock%2Fretention-compliance?generation=1773158118723625&alt=media\",\n \"name\": \"conformance-tests/objectlock/retention-compliance\",\n \"bucket\": \"substrate-sdk-gcp-poc1-test-bucket-versioned\",\n \"generation\": \"1773158118723625\",\n \"metageneration\": \"1\",\n \"contentType\": \"application/octet-stream\",\n \"storageClass\": \"STANDARD\",\n \"size\": \"37\",\n \"md5Hash\": \"oNJGr8D4uvHn3WAsgO/ZZw==\",\n \"crc32c\": \"4z8aNg==\",\n \"etag\": \"CKmgsN7YlZMDEAE=\",\n \"temporaryHold\": false,\n \"retentionExpirationTime\": \"2026-03-11T15:47:25.512Z\",\n \"retention\": {\n \"retainUntilTime\": \"2026-03-11T15:47:25.512Z\",\n \"mode\": \"Locked\"\n },\n \"timeCreated\": \"2026-03-10T15:55:18.783Z\",\n \"updated\": \"2026-03-10T15:55:18.783Z\",\n \"timeStorageClassUpdated\": \"2026-03-10T15:55:18.783Z\",\n \"timeFinalized\": \"2026-03-10T15:55:18.783Z\"\n}\n",
10+
"body" : "{\n \"kind\": \"storage#object\",\n \"id\": \"substrate-sdk-gcp-poc1-test-bucket-versioned/conformance-tests/objectlock/retention-compliance/1773181644530892\",\n \"selfLink\": \"https://www.googleapis.com/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o/conformance-tests%2Fobjectlock%2Fretention-compliance\",\n \"mediaLink\": \"https://storage.googleapis.com/download/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o/conformance-tests%2Fobjectlock%2Fretention-compliance?generation=1773181644530892&alt=media\",\n \"name\": \"conformance-tests/objectlock/retention-compliance\",\n \"bucket\": \"substrate-sdk-gcp-poc1-test-bucket-versioned\",\n \"generation\": \"1773181644530892\",\n \"metageneration\": \"1\",\n \"contentType\": \"application/octet-stream\",\n \"storageClass\": \"STANDARD\",\n \"size\": \"37\",\n \"md5Hash\": \"oNJGr8D4uvHn3WAsgO/ZZw==\",\n \"crc32c\": \"4z8aNg==\",\n \"etag\": \"CMzJrbCwlpMDEAE=\",\n \"temporaryHold\": false,\n \"retentionExpirationTime\": \"2026-03-11T15:47:25.512Z\",\n \"retention\": {\n \"retainUntilTime\": \"2026-03-11T15:47:25.512Z\",\n \"mode\": \"Locked\"\n },\n \"timeCreated\": \"2026-03-10T22:27:24.588Z\",\n \"updated\": \"2026-03-10T22:27:24.588Z\",\n \"timeStorageClassUpdated\": \"2026-03-10T22:27:24.588Z\",\n \"timeFinalized\": \"2026-03-10T22:27:24.588Z\"\n}\n",
1111
"headers" : {
1212
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000",
1313
"Server" : "UploadServer",
1414
"Cache-Control" : "private, max-age=0, must-revalidate, no-transform",
15-
"ETag" : "CKmgsN7YlZMDEAE=",
16-
"X-GUploader-UploadID" : "AGQBYWzVtK-OqW_PC3hIETJKmcawlPLmGYmGkIjv4dvCEem5sXgUzhMUWmT1KUYxEQQz2FW_",
15+
"ETag" : "CMzJrbCwlpMDEAE=",
16+
"X-GUploader-UploadID" : "AGQBYWyLYxDAOhlos7He2GqHJk5ko1VIjgj_YOAMBCpcJkvprdDCXBNvdV42zumFLw9lXJex",
1717
"Vary" : [ "Origin", "X-Origin" ],
18-
"Expires" : "Tue, 10 Mar 2026 15:55:19 GMT",
19-
"Date" : "Tue, 10 Mar 2026 15:55:19 GMT",
18+
"Expires" : "Tue, 10 Mar 2026 22:27:24 GMT",
19+
"Date" : "Tue, 10 Mar 2026 22:27:24 GMT",
2020
"Content-Type" : "application/json; charset=UTF-8"
2121
}
2222
},
23-
"uuid" : "0ed0cdd3-00ba-4ec2-8c05-38237788343d",
23+
"uuid" : "bf273e11-3dab-4274-a544-3f2f735b5332",
2424
"persistent" : true,
2525
"scenarioName" : "scenario-1-storage-v1-b-substrate-sdk-gcp-poc1-test-bucket-versioned-o-conformance-tests-objectlock-retention-compliance",
2626
"requiredScenarioState" : "Started",
2727
"newScenarioState" : "scenario-1-storage-v1-b-substrate-sdk-gcp-poc1-test-bucket-versioned-o-conformance-tests-objectlock-retention-compliance-2",
28-
"insertionIndex" : 956
28+
"insertionIndex" : 948
2929
}

‎blob/blob-gcp/src/test/resources/mappings/gcpblobstoreit_testgetobjectlock_afteruploadwithretentioncompliance-post-5.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"id" : "231bdc75-d431-4812-9835-0b932949c68b",
2+
"id" : "817af0c5-f8b6-466a-86e7-11fea23dc83c",
33
"name" : "GcpBlobStoreIT_testGetObjectLock_afterUploadWithRetentionCompliance-POST-5",
44
"request" : {
55
"url" : "/upload/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o?name=conformance-tests/objectlock/retention-compliance&uploadType=resumable",
@@ -16,16 +16,16 @@
1616
"Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000",
1717
"Server" : "UploadServer",
1818
"Cache-Control" : "no-cache, no-store, max-age=0, must-revalidate",
19-
"X-GUploader-UploadID" : "AGQBYWyZGxHcyJyZ6LZvLCqXPlKj9rMbkYudqXexsTS7Syt8B_-2T6Iq7CgMtIVQcLoa5Ylk4wuYFRtyFYDy2k94QZ7BevJ8ZXVNYjTwWKJKfw",
19+
"X-GUploader-UploadID" : "AGQBYWztvbFq7fIIyUxZ4yuCxLCrwUIfCc44OMZPDKmFq23FSS7OWYim1PDvwDH_alZP5eWLuDKdpfndc8YbjSF_dHqHLQH0XlLhVnvyKAlJCg",
2020
"Vary" : [ "Origin", "X-Origin" ],
2121
"Pragma" : "no-cache",
2222
"Expires" : "Mon, 01 Jan 1990 00:00:00 GMT",
23-
"Date" : "Tue, 10 Mar 2026 15:55:17 GMT",
24-
"Location" : "https://storage.googleapis.com/upload/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o?name=conformance-tests/objectlock/retention-compliance&uploadType=resumable&upload_id=AGQBYWyZGxHcyJyZ6LZvLCqXPlKj9rMbkYudqXexsTS7Syt8B_-2T6Iq7CgMtIVQcLoa5Ylk4wuYFRtyFYDy2k94QZ7BevJ8ZXVNYjTwWKJKfw",
23+
"Date" : "Tue, 10 Mar 2026 22:27:24 GMT",
24+
"Location" : "https://storage.googleapis.com/upload/storage/v1/b/substrate-sdk-gcp-poc1-test-bucket-versioned/o?name=conformance-tests/objectlock/retention-compliance&uploadType=resumable&upload_id=AGQBYWztvbFq7fIIyUxZ4yuCxLCrwUIfCc44OMZPDKmFq23FSS7OWYim1PDvwDH_alZP5eWLuDKdpfndc8YbjSF_dHqHLQH0XlLhVnvyKAlJCg",
2525
"Content-Type" : "text/plain; charset=utf-8"
2626
}
2727
},
28-
"uuid" : "231bdc75-d431-4812-9835-0b932949c68b",
28+
"uuid" : "817af0c5-f8b6-466a-86e7-11fea23dc83c",
2929
"persistent" : true,
30-
"insertionIndex" : 958
30+
"insertionIndex" : 950
3131
}

0 commit comments

Comments
 (0)