Skip to content

Commit

Permalink
address review comment
Browse files Browse the repository at this point in the history
Signed-off-by: Bala.FA <[email protected]>
  • Loading branch information
balamurugana committed Jul 6, 2021
1 parent f2a3b4d commit 7ba50a8
Showing 1 changed file with 16 additions and 18 deletions.
34 changes: 16 additions & 18 deletions api/src/main/java/io/minio/S3Base.java
Original file line number Diff line number Diff line change
Expand Up @@ -1098,6 +1098,18 @@ protected void populateResult()
};
}

private PartReader newPartReader(Object data, long objectSize, long partSize, int partCount) {
if (data instanceof RandomAccessFile) {
return new PartReader((RandomAccessFile) data, objectSize, partSize, partCount);
}

if (data instanceof InputStream) {
return new PartReader((InputStream) data, objectSize, partSize, partCount);
}

return null;
}

/** Execute put object. */
protected ObjectWriteResponse putObject(
PutObjectBaseArgs args,
Expand All @@ -1116,12 +1128,8 @@ protected ObjectWriteResponse putObject(
String uploadId = null;
Part[] parts = null;

PartReader partReader = null;
if (data instanceof RandomAccessFile) {
partReader = new PartReader((RandomAccessFile) data, objectSize, partSize, partCount);
} else if (data instanceof InputStream) {
partReader = new PartReader((InputStream) data, objectSize, partSize, partCount);
} else {
PartReader partReader = newPartReader(data, objectSize, partSize, partCount);
if (partReader == null) {
throw new IllegalArgumentException("data must be RandomAccessFile or InputStream");
}

Expand Down Expand Up @@ -1959,12 +1967,7 @@ protected ObjectWriteResponse putObject(
"data must be InputStream, RandomAccessFile, byte[] or String");
}

PartReader partReader = null;
if (data instanceof RandomAccessFile) {
partReader = new PartReader((RandomAccessFile) data, length, length, 1);
} else if (data instanceof InputStream) {
partReader = new PartReader((InputStream) data, length, length, 1);
}
PartReader partReader = newPartReader(data, length, length, 1);

if (partReader != null) {
return putObject(
Expand Down Expand Up @@ -2212,12 +2215,7 @@ protected UploadPartResponse uploadPart(
"data must be InputStream, RandomAccessFile, byte[] or String");
}

PartReader partReader = null;
if (data instanceof RandomAccessFile) {
partReader = new PartReader((RandomAccessFile) data, length, length, 1);
} else if (data instanceof InputStream) {
partReader = new PartReader((InputStream) data, length, length, 1);
}
PartReader partReader = newPartReader(data, length, length, 1);

if (partReader != null) {
return uploadPart(
Expand Down

0 comments on commit 7ba50a8

Please sign in to comment.