Skip to content

Commit

Permalink
update interface name from IProgressReceiverto ProgressReceiver
Browse files Browse the repository at this point in the history
  • Loading branch information
vhvb1989 committed Oct 9, 2019
1 parent ff71460 commit 3a4043d
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public Mono<Response<BlockBlobItem>> uploadWithResponse(Flux<ByteBuffer> data,
? new ParallelTransferOptions() : parallelTransferOptions;
int blockSize = finalParallelTransferOptions.getBlockSize();
int numBuffers = finalParallelTransferOptions.getNumBuffers();
IProgressReceiver progressReceiver = finalParallelTransferOptions.getProgressReceiver();
ProgressReceiver progressReceiver = finalParallelTransferOptions.getProgressReceiver();

// See ProgressReporter for an explanation on why this lock is necessary and why we use AtomicLong.
AtomicLong totalProgress = new AtomicLong(0);
Expand Down Expand Up @@ -323,7 +323,7 @@ public Mono<Void> uploadFromFile(String filePath, ParallelTransferOptions parall
final ParallelTransferOptions finalParallelTransferOptions = parallelTransferOptions == null
? new ParallelTransferOptions()
: parallelTransferOptions;
IProgressReceiver progressReceiver = finalParallelTransferOptions.getProgressReceiver();
ProgressReceiver progressReceiver = finalParallelTransferOptions.getProgressReceiver();

// See ProgressReporter for an explanation on why this lock is necessary and why we use AtomicLong.
AtomicLong totalProgress = new AtomicLong(0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
* An {@code IProgressReceiver} is an object that can be used to report progress on network transfers. When specified on
* transfer operations, the {@code reportProgress} method will be called periodically with the total number of bytes
* transferred. The user may configure this method to report progress in whatever format desired. It is recommended
* that this type be used in conjunction with {@link ProgressReporter#addProgressReporting(Flux, IProgressReceiver)}.
* that this type be used in conjunction with {@link ProgressReporter#addProgressReporting(Flux, ProgressReceiver)}.
*/
public interface IProgressReceiver {
public interface ProgressReceiver {

/**
* The callback function invoked as progress is reported.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*/
public final class ProgressReporter {

private abstract static class ProgressReporterImpl implements IProgressReceiver {
private abstract static class ProgressReporterImpl implements ProgressReceiver {
long blockProgress;

final IProgressReceiver progressReceiver;
final ProgressReceiver progressReceiver;

ProgressReporterImpl(IProgressReceiver progressReceiver) {
ProgressReporterImpl(ProgressReceiver progressReceiver) {
this.blockProgress = 0;
this.progressReceiver = progressReceiver;
}
Expand Down Expand Up @@ -59,7 +59,7 @@ Flux<ByteBuffer> addProgressReporting(Flux<ByteBuffer> data) {
* final.
*/
private static class SequentialProgressReporter extends ProgressReporterImpl {
SequentialProgressReporter(IProgressReceiver progressReceiver) {
SequentialProgressReporter(ProgressReceiver progressReceiver) {
super(progressReceiver);
}

Expand Down Expand Up @@ -88,7 +88,7 @@ private static class ParallelProgressReporter extends ProgressReporterImpl {
*/
private final AtomicLong totalProgress;

ParallelProgressReporter(IProgressReceiver progressReceiver, Lock lock, AtomicLong totalProgress) {
ParallelProgressReporter(ProgressReceiver progressReceiver, Lock lock, AtomicLong totalProgress) {
super(progressReceiver);
this.transferLock = lock;
this.totalProgress = totalProgress;
Expand Down Expand Up @@ -133,11 +133,11 @@ public void rewindProgress() {
* emitted so far, or the "current position" of the Flux.
*
* @param data The data whose transfer progress is to be tracked.
* @param progressReceiver {@link IProgressReceiver}
* @param progressReceiver {@link ProgressReceiver}
* @return A {@code Flux} that emits the same data as the source but calls a callback to report the total amount of
* data emitted so far.
*/
public static Flux<ByteBuffer> addProgressReporting(Flux<ByteBuffer> data, IProgressReceiver progressReceiver) {
public static Flux<ByteBuffer> addProgressReporting(Flux<ByteBuffer> data, ProgressReceiver progressReceiver) {
if (progressReceiver == null) {
return data;
} else {
Expand All @@ -152,7 +152,7 @@ public static Flux<ByteBuffer> addProgressReporting(Flux<ByteBuffer> data, IProg
* of data emitted so far, or the "current position" of the Flux in parallel.
*
* @param data The data whose transfer progress is to be tracked.
* @param progressReceiver {@link IProgressReceiver}
* @param progressReceiver {@link ProgressReceiver}
* @param lock This lock will be instantiated by the operation initiating the whole transfer to coordinate each
* ProgressReporterImpl.
* @param totalProgress We need an AtomicLong to be able to update the value referenced. Because we are already
Expand All @@ -161,7 +161,7 @@ public static Flux<ByteBuffer> addProgressReporting(Flux<ByteBuffer> data, IProg
* data emitted so far.
*/
public static Flux<ByteBuffer> addParallelProgressReporting(Flux<ByteBuffer> data,
IProgressReceiver progressReceiver, Lock lock, AtomicLong totalProgress) {
ProgressReceiver progressReceiver, Lock lock, AtomicLong totalProgress) {
if (progressReceiver == null) {
return data;
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.storage.blob.models;

import com.azure.storage.blob.IProgressReceiver;
import com.azure.storage.blob.ProgressReceiver;
import com.azure.storage.common.Constants;
import com.azure.storage.common.Utility;

Expand All @@ -16,7 +16,7 @@ public class ParallelTransferOptions {

private int blockSize;
private int numBuffers;
private IProgressReceiver progressReceiver;
private ProgressReceiver progressReceiver;

/**
* Creates a new {@link ParallelTransferOptions} with default parameters applied.
Expand Down Expand Up @@ -49,7 +49,7 @@ public int getNumBuffers() {
* Gets the Progress receiver for parallel reporting
* @return the progress reporter
*/
public IProgressReceiver getProgressReceiver() {
public ProgressReceiver getProgressReceiver() {
return this.progressReceiver;
}

Expand Down Expand Up @@ -85,7 +85,7 @@ public ParallelTransferOptions setNumBuffers(int numBuffers) {
return this;
}

public ParallelTransferOptions setProgressReceiver(IProgressReceiver progressReceiver) {
public ParallelTransferOptions setProgressReceiver(ProgressReceiver progressReceiver) {
this.progressReceiver = progressReceiver;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import com.azure.storage.blob.BlobProperties;
import com.azure.storage.blob.BlobUrlParts;
import com.azure.storage.blob.HttpGetterInfo;
import com.azure.storage.blob.IProgressReceiver;
import com.azure.storage.blob.ProgressReceiver;
import com.azure.storage.blob.ProgressReporter;
import com.azure.storage.blob.implementation.AzureBlobStorageBuilder;
import com.azure.storage.blob.implementation.AzureBlobStorageImpl;
Expand Down Expand Up @@ -567,7 +567,7 @@ Mono<Response<BlobProperties>> downloadToFileWithResponse(String filePath, BlobR
final ParallelTransferOptions finalParallelTransferOptions = parallelTransferOptions == null
? new ParallelTransferOptions()
: parallelTransferOptions;
IProgressReceiver progressReceiver = finalParallelTransferOptions.getProgressReceiver();
ProgressReceiver progressReceiver = finalParallelTransferOptions.getProgressReceiver();

// See ProgressReporter for an explanation on why this lock is necessary and why we use AtomicLong.
AtomicLong totalProgress = new AtomicLong(0);
Expand All @@ -584,7 +584,7 @@ Mono<Response<BlobProperties>> downloadToFileWithResponse(String filePath, BlobR
private Mono<Response<BlobProperties>> processInRange(AsynchronousFileChannel channel,
Response<BlobProperties> blobPropertiesResponse, BlobRange range, Integer blockSize,
ReliableDownloadOptions options, BlobAccessConditions accessConditions, boolean rangeGetContentMD5,
Context context, AtomicLong totalProgress, Lock progressLock, IProgressReceiver progressReceiver) {
Context context, AtomicLong totalProgress, Lock progressLock, ProgressReceiver progressReceiver) {
return Mono.justOrEmpty(range).switchIfEmpty(Mono.just(new BlobRange(0,
blobPropertiesResponse.getValue().getBlobSize()))).flatMapMany(rg ->
Flux.fromIterable(sliceBlobRange(rg, blockSize)))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class ProgressReporterTest extends APISpec {
ByteBuffer buf2 = getRandomData(15)
ByteBuffer buf3 = getRandomData(5)

IProgressReceiver mockReceiver = Mock(IProgressReceiver)
ProgressReceiver mockReceiver = Mock(ProgressReceiver)

Flux<ByteBuffer> data = Flux.just(buf1, buf2, buf3)
data = ProgressReporter.addProgressReporting(data, mockReceiver)
Expand All @@ -38,7 +38,7 @@ class ProgressReporterTest extends APISpec {
@Requires({ liveMode() })
def "Report progress sequential network test"() {
setup:
IProgressReceiver mockReceiver = Mock(IProgressReceiver)
ProgressReceiver mockReceiver = Mock(ProgressReceiver)

ByteBuffer buffer = getRandomData(1 * 1024 * 1024)
Flux<ByteBuffer> data = ProgressReporter.addProgressReporting(Flux.just(buffer), mockReceiver)
Expand Down Expand Up @@ -67,7 +67,7 @@ class ProgressReporterTest extends APISpec {
ReentrantLock lock = new ReentrantLock()
AtomicLong totalProgress = new AtomicLong(0)

IProgressReceiver mockReceiver = Mock(IProgressReceiver)
ProgressReceiver mockReceiver = Mock(ProgressReceiver)
Flux<ByteBuffer> data = Flux.just(buf1, buf2, buf3)
Flux<ByteBuffer> data2 = Flux.just(buf3, buf2, buf1)
data = ProgressReporter.addParallelProgressReporting(data, mockReceiver, lock, totalProgress)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import com.azure.storage.blob.APISpec
import com.azure.storage.blob.BlobAsyncClient
import com.azure.storage.blob.BlobClient
import com.azure.storage.blob.BlobServiceClientBuilder
import com.azure.storage.blob.IProgressReceiver
import com.azure.storage.blob.ProgressReceiver
import com.azure.storage.blob.models.AccessTier
import com.azure.storage.blob.models.BlobAccessConditions
import com.azure.storage.blob.models.BlobHTTPHeaders
Expand Down Expand Up @@ -846,7 +846,7 @@ class BlockBlobAPITest extends APISpec {

/* Reporter for testing Progress Receiver
* Will count the number of reports that are triggered */
class Reporter implements IProgressReceiver {
class Reporter implements ProgressReceiver {
private final long blockSize
private long reportingCount

Expand Down

0 comments on commit 3a4043d

Please sign in to comment.