Skip to content

Commit 334151d

Browse files
committed
Merge remote-tracking branch 'origin/dev-1.0' into development
2 parents a0612d5 + 330b36c commit 334151d

File tree

1 file changed

+7
-7
lines changed
  • src/main/java/ch/ethz/seb/sps/server/datalayer/dao/impl

1 file changed

+7
-7
lines changed

src/main/java/ch/ethz/seb/sps/server/datalayer/dao/impl/S3DAO.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public Result<InputStream> getItem(final String sessionUUID, final Long pk) {
9191

9292
public Result<ObjectWriteResponse> uploadItem(final ByteArrayInputStream screenshotInputStream, final String sessionUUID, final Long pk){
9393
return Result.tryCatch(() ->
94-
this.minioClient.putObject(
94+
this.minioClient.putObject(
9595
PutObjectArgs.builder()
9696
.bucket(BUCKET_NAME)
9797
.object(sessionUUID + Constants.UNDERLINE + pk)
@@ -102,12 +102,12 @@ public Result<ObjectWriteResponse> uploadItem(final ByteArrayInputStream screens
102102

103103
public Result<ObjectWriteResponse> uploadItemBatch(final List<SnowballObject> batchItems){
104104
return Result.tryCatch(() ->
105-
this.minioClient.uploadSnowballObjects(
106-
UploadSnowballObjectsArgs
107-
.builder()
108-
.bucket(BUCKET_NAME)
109-
.objects(batchItems)
110-
.build())
105+
this.minioClient.uploadSnowballObjects(
106+
UploadSnowballObjectsArgs
107+
.builder()
108+
.bucket(BUCKET_NAME)
109+
.objects(batchItems)
110+
.build())
111111
);
112112
}
113113

0 commit comments

Comments
 (0)