Skip to content
This repository was archived by the owner on Jul 19, 2024. It is now read-only.

Commit dd1ca8d

Browse files
committed
Removed sync copy blob
1 parent 30588c6 commit dd1ca8d

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlockBlobTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -601,14 +601,14 @@ public void testCopyBlockBlobTest() throws InvalidKeyException, URISyntaxExcepti
601601
this.doCloudBlockBlobCopy(false, false, false);
602602
}
603603

604-
@Test
604+
/*@Test
605605
@Category({ DevFabricTests.class, DevStoreTests.class, SlowTests.class })
606606
public void testCopyBlockBlobSyncTest() throws InterruptedException, IOException, StorageException,
607607
InvalidKeyException, URISyntaxException {
608608
this.doCloudBlockBlobCopy(false, false, true);
609-
}
609+
}*/
610610

611-
@Test
611+
/*@Test
612612
public void testCopyBlockBlobWithSyncMd5() throws URISyntaxException, StorageException, IOException, NoSuchAlgorithmException {
613613
// Create source on server. We must copy from a different account or the service will not validate the md5.
614614
CloudBlobContainer container = BlobTestHelper.getRandomCopySourceContainerReference();
@@ -678,7 +678,7 @@ public void testCopyBlockBlobWithSyncMd5() throws URISyntaxException, StorageExc
678678
destination.delete();
679679
source.delete();
680680
container.deleteIfExists();
681-
}
681+
}*/
682682

683683
@Test
684684
public void testCopyWithChineseChars() throws StorageException, IOException, URISyntaxException {
@@ -712,8 +712,8 @@ public void eventOccurred(SendingRequestEvent eventArg) {
712712
}
713713
});
714714

715-
copyDestination.startCopy(copySource.getUri(), null, false, null, null, null, null, ctx);
716-
copyDestination.startCopy(copySource, null, false, null, null, null, ctx);
715+
copyDestination.startCopy(copySource.getUri(), null, null, null, null, ctx);
716+
copyDestination.startCopy(copySource, null, null, null, ctx);
717717
}
718718

719719
@Test
@@ -2418,7 +2418,7 @@ private void doCloudBlockBlobCopy(boolean sourceIsSas, boolean destinationIsSas,
24182418
Thread.sleep(30000);
24192419

24202420
// Start copy and wait for completion
2421-
String copyId = copyDestination.startCopy(copySource, null, syncCopy, null, null, null, null);
2421+
String copyId = copyDestination.startCopy(copySource, null, null, null, null);
24222422
BlobTestHelper.waitForCopy(copyDestination);
24232423
Calendar calendar = Calendar.getInstance(Utility.UTC_ZONE);
24242424
destination.downloadAttributes();

microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudPageBlobTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,7 +1390,7 @@ public void testCloudPageBlobSetBlobTierOnCopy() throws URISyntaxException, Stor
13901390

13911391
// copy to larger disk
13921392
CloudPageBlob copy = container.getPageBlobReference("copy");
1393-
copy.startCopy(TestHelper.defiddler(source.getUri()), null,false, PremiumPageBlobTier.P30, null, null, null, null);
1393+
copy.startCopy(TestHelper.defiddler(source.getUri()), PremiumPageBlobTier.P30, null, null, null, null);
13941394
assertEquals(BlobType.PAGE_BLOB, copy.getProperties().getBlobType());
13951395
assertEquals(PremiumPageBlobTier.P30, copy.getProperties().getPremiumPageBlobTier());
13961396
assertEquals(PremiumPageBlobTier.P10, source.getProperties().getPremiumPageBlobTier());
@@ -1412,7 +1412,7 @@ public void testCloudPageBlobSetBlobTierOnCopy() throws URISyntaxException, Stor
14121412
source2.create(1024);
14131413

14141414
CloudPageBlob copy3 = container.getPageBlobReference("copy3");
1415-
copy3.startCopy(TestHelper.defiddler(source2.getUri()), null,false, PremiumPageBlobTier.P60, null ,null ,null, null);
1415+
copy3.startCopy(TestHelper.defiddler(source2.getUri()), PremiumPageBlobTier.P60, null ,null ,null, null);
14161416
assertEquals(BlobType.PAGE_BLOB, copy3.getProperties().getBlobType());
14171417
assertEquals(PremiumPageBlobTier.P60, copy3.getProperties().getPremiumPageBlobTier());
14181418
assertNull(source2.getProperties().getPremiumPageBlobTier());

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudAppendBlob.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public final String startCopy(final CloudAppendBlob sourceBlob, final AccessCond
224224
source = sourceBlob.getServiceClient().getCredentials().transformUri(sourceBlob.getSnapshotQualifiedUri());
225225
}
226226

227-
return this.startCopy(source, null /* contentMd5 */ , false /* syncCopy */, null /* premiumPageBlobTier */, sourceAccessCondition, destinationAccessCondition, options, opContext);
227+
return this.startCopy(source, null /* premiumPageBlobTier */, sourceAccessCondition, destinationAccessCondition, options, opContext);
228228
}
229229

230230
/**

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudBlob.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ protected final String startCopy(final URI source, final PremiumPageBlobTier pre
740740
*
741741
*/
742742
@DoesServiceRequest
743-
protected final String startCopy(final URI source, String contentMd5, boolean syncCopy, final PremiumPageBlobTier premiumPageBlobTier, final AccessCondition sourceAccessCondition,
743+
private final String startCopy(final URI source, String contentMd5, boolean syncCopy, final PremiumPageBlobTier premiumPageBlobTier, final AccessCondition sourceAccessCondition,
744744
final AccessCondition destinationAccessCondition, BlobRequestOptions options, OperationContext opContext)
745745
throws StorageException {
746746
if (opContext == null) {

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudBlockBlob.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ public final String startCopy(final CloudBlockBlob sourceBlob, final AccessCondi
254254
*
255255
*/
256256
@DoesServiceRequest
257-
public final String startCopy(final CloudBlockBlob sourceBlob, String contentMd5, boolean syncCopy, final AccessCondition sourceAccessCondition,
257+
private final String startCopy(final CloudBlockBlob sourceBlob, String contentMd5, boolean syncCopy, final AccessCondition sourceAccessCondition,
258258
final AccessCondition destinationAccessCondition, BlobRequestOptions options, OperationContext opContext)
259259
throws StorageException, URISyntaxException {
260260
Utility.assertNotNull("sourceBlob", sourceBlob);
@@ -265,7 +265,7 @@ public final String startCopy(final CloudBlockBlob sourceBlob, String contentMd5
265265
source = sourceBlob.getServiceClient().getCredentials().transformUri(sourceBlob.getSnapshotQualifiedUri());
266266
}
267267

268-
return this.startCopy(source, contentMd5, syncCopy, null /* premiumPageBlobTier */, sourceAccessCondition, destinationAccessCondition, options, opContext);
268+
return this.startCopy(source, null /* premiumPageBlobTier */, sourceAccessCondition, destinationAccessCondition, options, opContext);
269269
}
270270

271271
/**
@@ -318,7 +318,7 @@ public final String startCopy(final CloudFile sourceFile, final AccessCondition
318318
throws StorageException, URISyntaxException {
319319
Utility.assertNotNull("sourceFile", sourceFile);
320320
return this.startCopy(
321-
sourceFile.getServiceClient().getCredentials().transformUri(sourceFile.getUri()), null, false,
321+
sourceFile.getServiceClient().getCredentials().transformUri(sourceFile.getUri()),
322322
null /* premiumPageBlobTier */, sourceAccessCondition, destinationAccessCondition, options, opContext);
323323
}
324324

microsoft-azure-storage/src/com/microsoft/azure/storage/blob/CloudPageBlob.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public final String startCopy(final CloudPageBlob sourceBlob, final PremiumPageB
258258
source = sourceBlob.getServiceClient().getCredentials().transformUri(sourceBlob.getSnapshotQualifiedUri());
259259
}
260260

261-
return this.startCopy(source, Constants.EMPTY_STRING,false, premiumBlobTier, sourceAccessCondition, destinationAccessCondition, options, opContext);
261+
return this.startCopy(source, premiumBlobTier, sourceAccessCondition, destinationAccessCondition, options, opContext);
262262
}
263263

264264
/**

0 commit comments

Comments
 (0)