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

Commit 41dccee

Browse files
mirobersmirobers
committed
Fix warnings
1 parent dae483a commit 41dccee

29 files changed

+101
-163
lines changed

‎microsoft-azure-storage-test/src/com/microsoft/azure/storage/AlwaysRetry.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import java.util.ArrayList;
1818
import java.util.List;
1919

20-
import static junit.framework.Assert.assertEquals;
21-
import static junit.framework.Assert.assertTrue;
20+
import static org.junit.Assert.assertEquals;
21+
import static org.junit.Assert.assertTrue;
2222

2323
public class AlwaysRetry extends RetryPolicy implements RetryPolicyFactory {
2424

‎microsoft-azure-storage-test/src/com/microsoft/azure/storage/GenericTests.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,12 +475,9 @@ private static String generateRandomContainerName() {
475475

476476
@Test
477477
public void testErrorCodeFromHeader() throws URISyntaxException, StorageException, IOException {
478-
byte[] buffer = BlobTestHelper.getRandomBuffer(1 * 1024 * 1024);
479-
480478
CloudBlobClient blobClient = TestHelper.createCloudBlobClient();
481479
CloudBlobContainer container = blobClient.getContainerReference(generateRandomContainerName());
482480

483-
String blobName = "testBlob";
484481
CloudAppendBlob appendBlob = container.getAppendBlobReference("testAppend");
485482

486483
try {

‎microsoft-azure-storage-test/src/com/microsoft/azure/storage/analytics/CloudAnalyticsClientTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.microsoft.azure.storage.Constants;
1818
import com.microsoft.azure.storage.StorageException;
1919
import com.microsoft.azure.storage.StorageLocation;
20-
import com.microsoft.azure.storage.TestRunners;
2120
import com.microsoft.azure.storage.blob.CloudBlobContainer;
2221
import com.microsoft.azure.storage.blob.CloudBlockBlob;
2322
import com.microsoft.azure.storage.blob.ListBlobItem;

‎microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/BlobOutputStreamTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.microsoft.azure.storage.ResponseReceivedEvent;
2121
import com.microsoft.azure.storage.StorageEvent;
2222
import com.microsoft.azure.storage.StorageException;
23-
import com.microsoft.azure.storage.TestRunners;
2423
import com.microsoft.azure.storage.TestRunners.CloudTests;
2524
import com.microsoft.azure.storage.core.SR;
2625

‎microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudAppendBlobTests.java‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.microsoft.azure.storage.StorageErrorCodeStrings;
2525
import com.microsoft.azure.storage.StorageEvent;
2626
import com.microsoft.azure.storage.StorageException;
27-
import com.microsoft.azure.storage.TestRunners;
2827
import com.microsoft.azure.storage.TestRunners.CloudTests;
2928
import com.microsoft.azure.storage.TestRunners.DevFabricTests;
3029

@@ -424,25 +423,25 @@ public void testAppendBlobDownloadRangeTest() throws URISyntaxException,
424423

425424
ByteArrayOutputStream blobStream = new ByteArrayOutputStream();
426425
try {
427-
blob.downloadRange(0, new Long(0), blobStream);
426+
blob.downloadRange(0, Long.valueOf(0), blobStream);
428427
} catch (IndexOutOfBoundsException ex) {
429428

430429
}
431430

432-
blob.downloadRange(0, new Long(1024), blobStream);
431+
blob.downloadRange(0, Long.valueOf(1024), blobStream);
433432
assertEquals(blobStream.size(), 1024);
434433
BlobTestHelper.assertStreamsAreEqualAtIndex(new ByteArrayInputStream(
435434
blobStream.toByteArray()), wholeBlob, 0, 0, 1024, 2 * 1024);
436435

437436
CloudAppendBlob blob2 = this.container.getAppendBlobReference("blob1");
438437
try {
439-
blob.downloadRange(1024, new Long(0), blobStream);
438+
blob.downloadRange(1024, Long.valueOf(0), blobStream);
440439
} catch (IndexOutOfBoundsException ex) {
441440

442441
}
443442

444443
ByteArrayOutputStream blobStream2 = new ByteArrayOutputStream();
445-
blob2.downloadRange(1024, new Long(1024), blobStream2);
444+
blob2.downloadRange(1024, Long.valueOf(1024), blobStream2);
446445
BlobTestHelper.assertStreamsAreEqualAtIndex(new ByteArrayInputStream(
447446
blobStream2.toByteArray()), wholeBlob, 0, 1024, 1024,
448447
2 * 1024);
@@ -471,39 +470,39 @@ public void testCloudAppendBlobDownloadRangeToByteArray()
471470
.generateRandomBlobNameWithPrefix("downloadrange"));
472471

473472
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 8 * 1024 * 1024,
474-
8 * 1024 * 1024, 1 * 1024 * 1024, new Long(1 * 1024 * 1024),
475-
new Long(5 * 1024 * 1024));
473+
8 * 1024 * 1024, 1 * 1024 * 1024, Long.valueOf(1 * 1024 * 1024),
474+
Long.valueOf(5 * 1024 * 1024));
476475
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 8 * 1024 * 1024,
477-
8 * 1024 * 1024, 2 * 1024 * 1024, new Long(2 * 1024 * 1024),
478-
new Long(6 * 1024 * 1024));
476+
8 * 1024 * 1024, 2 * 1024 * 1024, Long.valueOf(2 * 1024 * 1024),
477+
Long.valueOf(6 * 1024 * 1024));
479478
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 8 * 1024 * 1024,
480-
8 * 1024 * 1024, 1 * 1024 * 1024, new Long(4 * 1024 * 1024),
481-
new Long(4 * 1024 * 1024));
479+
8 * 1024 * 1024, 1 * 1024 * 1024, Long.valueOf(4 * 1024 * 1024),
480+
Long.valueOf(4 * 1024 * 1024));
482481

483482
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512,
484-
0, new Long(1 * 512), new Long(1 * 512));
483+
0, Long.valueOf(1 * 512), Long.valueOf(1 * 512));
485484
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512,
486-
1 * 512, new Long(0), null);
485+
1 * 512, Long.valueOf(0), null);
487486
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512,
488-
1 * 512, new Long(1 * 512), null);
487+
1 * 512, Long.valueOf(1 * 512), null);
489488
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512,
490-
1 * 512, new Long(0), new Long(1 * 512));
489+
1 * 512, Long.valueOf(0), Long.valueOf(1 * 512));
491490
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512,
492-
2 * 512, new Long(1 * 512), new Long(1 * 512));
491+
2 * 512, Long.valueOf(1 * 512), Long.valueOf(1 * 512));
493492
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512,
494-
2 * 512, new Long(1 * 512), new Long(2 * 512));
493+
2 * 512, Long.valueOf(1 * 512), Long.valueOf(2 * 512));
495494

496495
// Edge cases
497496
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 1023,
498-
new Long(1023), new Long(1));
497+
Long.valueOf(1023), Long.valueOf(1));
499498
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 0,
500-
new Long(1023), new Long(1));
499+
Long.valueOf(1023), Long.valueOf(1));
501500
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 0,
502-
new Long(0), new Long(1));
501+
Long.valueOf(0), Long.valueOf(1));
503502
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 0,
504-
new Long(512), new Long(1));
503+
Long.valueOf(512), Long.valueOf(1));
505504
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 512,
506-
new Long(1023), new Long(1));
505+
Long.valueOf(1023), Long.valueOf(1));
507506
}
508507

509508
@Test

‎microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlobClientTests.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import com.microsoft.azure.storage.TestRunners.CloudTests;
3939
import com.microsoft.azure.storage.TestRunners.DevFabricTests;
4040
import com.microsoft.azure.storage.TestRunners.DevStoreTests;
41-
import com.microsoft.azure.storage.TestRunners;
4241

4342
import static org.junit.Assert.*;
4443

@@ -334,15 +333,13 @@ public void eventOccurred(SendingRequestEvent eventArg) {
334333

335334
CloudBlobContainer container = null;
336335
File sourceFile = File.createTempFile("sourceFile", ".tmp");
337-
File destinationFile = new File(sourceFile.getParentFile(), "destinationFile.tmp");
338336
try {
339337
container = bClient.getContainerReference(BlobTestHelper.generateRandomContainerName());
340338
container.createIfNotExists();
341339
CloudBlockBlob blob = container.getBlockBlobReference(BlobTestHelper
342340
.generateRandomBlobNameWithPrefix("uploadThreshold"));
343341

344342
sourceFile = File.createTempFile("sourceFile", ".tmp");
345-
destinationFile = new File(sourceFile.getParentFile(), "destinationFile.tmp");
346343

347344
int fileSize = 10 * 1024;
348345
byte[] buffer = BlobTestHelper.getRandomBuffer(fileSize);

‎microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlobContainerTests.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.io.ByteArrayInputStream;
2020
import java.io.IOException;
2121
import java.net.HttpURLConnection;
22-
import java.net.URI;
2322
import java.net.URISyntaxException;
2423
import java.security.InvalidKeyException;
2524
import java.util.Calendar;
@@ -34,7 +33,6 @@
3433
import java.util.UUID;
3534

3635
import org.junit.After;
37-
import org.junit.Assert;
3836
import org.junit.Before;
3937
import org.junit.Test;
4038
import org.junit.experimental.categories.Category;
@@ -905,12 +903,12 @@ private static void assertCreatedAndListedBlobsEquivalent(CloudBlockBlob created
905903
return;
906904
}
907905
else {
908-
assertEquals(new Long(length), state2.getBytesCopied());
906+
assertEquals(Long.valueOf(length), state2.getBytesCopied());
909907
assertNotNull(state2.getCompletionTime());
910908
assertEquals(state1.getCopyId(), state2.getCopyId());
911909
assertNotNull(state2.getSource());
912910
assertEquals(state1.getStatus(), state2.getStatus());
913-
assertEquals(new Long(length), state2.getTotalBytes());
911+
assertEquals(Long.valueOf(length), state2.getTotalBytes());
914912
}
915913
}
916914
}

‎microsoft-azure-storage-test/src/com/microsoft/azure/storage/blob/CloudBlobServerEncryptionTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
import org.junit.After;
3030
import org.junit.Before;
31-
import org.junit.Ignore;
3231
import org.junit.Test;
3332
import org.junit.experimental.categories.Category;
3433

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

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.microsoft.azure.storage.StorageCredentialsSharedAccessSignature;
2525
import com.microsoft.azure.storage.StorageEvent;
2626
import com.microsoft.azure.storage.StorageException;
27-
import com.microsoft.azure.storage.TestRunners;
2827
import com.microsoft.azure.storage.core.Utility;
2928
import com.microsoft.azure.storage.file.CloudFile;
3029
import com.microsoft.azure.storage.file.CloudFileShare;
@@ -1222,27 +1221,27 @@ public void testBlockBlobDownloadRangeTest() throws URISyntaxException, StorageE
12221221

12231222
ByteArrayOutputStream blobStream = new ByteArrayOutputStream();
12241223
try {
1225-
blob.downloadRange(0, new Long(0), blobStream, null, null, null);
1224+
blob.downloadRange(0, Long.valueOf(0), blobStream, null, null, null);
12261225
}
12271226
catch (IndexOutOfBoundsException ex) {
12281227

12291228
}
12301229

1231-
blob.downloadRange(0, new Long(1024), blobStream);
1230+
blob.downloadRange(0, Long.valueOf(1024), blobStream);
12321231
assertEquals(blobStream.size(), 1024);
12331232
BlobTestHelper.assertStreamsAreEqualAtIndex(new ByteArrayInputStream(blobStream.toByteArray()), wholeBlob, 0,
12341233
0, 1024, 2 * 1024);
12351234

12361235
CloudBlockBlob blob2 = this.container.getBlockBlobReference("blob1");
12371236
try {
1238-
blob.downloadRange(1024, new Long(0), blobStream, null, null, null);
1237+
blob.downloadRange(1024, Long.valueOf(0), blobStream, null, null, null);
12391238
}
12401239
catch (IndexOutOfBoundsException ex) {
12411240

12421241
}
12431242

12441243
ByteArrayOutputStream blobStream2 = new ByteArrayOutputStream();
1245-
blob2.downloadRange(1024, new Long(1024), blobStream2);
1244+
blob2.downloadRange(1024, Long.valueOf(1024), blobStream2);
12461245
BlobTestHelper.assertStreamsAreEqualAtIndex(new ByteArrayInputStream(blobStream2.toByteArray()), wholeBlob,
12471246
0, 1024, 1024, 2 * 1024);
12481247
blob2.downloadAttributes();
@@ -1655,27 +1654,27 @@ public void testCloudBlockBlobDownloadRangeToByteArray() throws URISyntaxExcepti
16551654
.generateRandomBlobNameWithPrefix("downloadrange"));
16561655

16571656
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 8 * Constants.MB, 8 * Constants.MB, 1 * Constants.MB,
1658-
new Long(1 * Constants.MB), new Long(5 * Constants.MB));
1657+
Long.valueOf(1 * Constants.MB), Long.valueOf(5 * Constants.MB));
16591658
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 8 * Constants.MB, 8 * Constants.MB, 2 * Constants.MB,
1660-
new Long(2 * Constants.MB), new Long(6 * Constants.MB));
1659+
Long.valueOf(2 * Constants.MB), Long.valueOf(6 * Constants.MB));
16611660
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 8 * Constants.MB, 8 * Constants.MB, 1 * Constants.MB,
1662-
new Long(4 * Constants.MB), new Long(4 * Constants.MB));
1661+
Long.valueOf(4 * Constants.MB), Long.valueOf(4 * Constants.MB));
16631662

1664-
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512, 0, new Long(1 * 512), new Long(1 * 512));
1665-
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512, 1 * 512, new Long(0), null);
1666-
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512, 1 * 512, new Long(1 * 512), null);
1667-
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512, 1 * 512, new Long(0), new Long(1 * 512));
1668-
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512, 2 * 512, new Long(1 * 512), new Long(
1663+
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512, 0, Long.valueOf(1 * 512), Long.valueOf(1 * 512));
1664+
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512, 1 * 512, Long.valueOf(0), null);
1665+
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512, 1 * 512, Long.valueOf(1 * 512), null);
1666+
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512, 1 * 512, Long.valueOf(0), Long.valueOf(1 * 512));
1667+
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512, 2 * 512, Long.valueOf(1 * 512), Long.valueOf(
16691668
1 * 512));
1670-
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512, 2 * 512, new Long(1 * 512), new Long(
1669+
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 2 * 512, 4 * 512, 2 * 512, Long.valueOf(1 * 512), Long.valueOf(
16711670
2 * 512));
16721671

16731672
// Edge cases
1674-
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 1023, new Long(1023), new Long(1));
1675-
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 0, new Long(1023), new Long(1));
1676-
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 0, new Long(0), new Long(1));
1677-
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 0, new Long(512), new Long(1));
1678-
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 512, new Long(1023), new Long(1));
1673+
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 1023, Long.valueOf(1023), Long.valueOf(1));
1674+
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 0, Long.valueOf(1023), Long.valueOf(1));
1675+
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 0, Long.valueOf(0), Long.valueOf(1));
1676+
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 0, Long.valueOf(512), Long.valueOf(1));
1677+
BlobTestHelper.doDownloadRangeToByteArrayTest(blob, 1024, 1024, 512, Long.valueOf(1023), Long.valueOf(1));
16791678
}
16801679

16811680
@Test
@@ -2396,7 +2395,7 @@ public void testCloudBlockBlobRehydrateBlob() throws StorageException, IOExcepti
23962395
assertNull(blob2.getProperties().getPremiumPageBlobTier());
23972396
assertNotNull(blob2.getProperties().getTierChangeTime());
23982397

2399-
Iterator it = this.container.listBlobs().iterator();
2398+
Iterator<ListBlobItem> it = this.container.listBlobs().iterator();
24002399
CloudBlockBlob listBlob = (CloudBlockBlob)it.next();
24012400
assertEquals(RehydrationStatus.PENDING_TO_COOL, listBlob.getProperties().getRehydrationStatus());
24022401
assertEquals(StandardBlobTier.ARCHIVE, listBlob.getProperties().getStandardBlobTier());

0 commit comments

Comments
 (0)