Skip to content

Commit

Permalink
refactor(ort-utils): Remove some superfluous apply statements
Browse files Browse the repository at this point in the history
Signed-off-by: Sebastian Schuberth <[email protected]>
  • Loading branch information
sschuberth committed Feb 20, 2024
1 parent 528c445 commit 4a24dfc
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions utils/ort/src/main/kotlin/storage/S3FileStorage.kt
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ class S3FileStorage(
}

if (awsRegion != null && provider != null) {
S3Client.builder().apply {
region(Region.of(awsRegion))
credentialsProvider(provider)
endpointOverride(if (customEndpoint != null) URI.create(customEndpoint) else null)
}.build()
S3Client.builder()
.region(Region.of(awsRegion))
.credentialsProvider(provider)

Check warning on line 77 in utils/ort/src/main/kotlin/storage/S3FileStorage.kt

View check run for this annotation

Codecov / codecov/patch

utils/ort/src/main/kotlin/storage/S3FileStorage.kt#L75-L77

Added lines #L75 - L77 were not covered by tests
.endpointOverride(if (customEndpoint != null) URI.create(customEndpoint) else null)
.build()

Check warning on line 79 in utils/ort/src/main/kotlin/storage/S3FileStorage.kt

View check run for this annotation

Codecov / codecov/patch

utils/ort/src/main/kotlin/storage/S3FileStorage.kt#L79

Added line #L79 was not covered by tests
} else {
if (awsRegion != null) {
S3Client.builder().region(Region.of(awsRegion)).build()
Expand All @@ -87,10 +87,10 @@ class S3FileStorage(
}

override fun exists(path: String): Boolean {
val request = HeadObjectRequest.builder().apply {
key(path)
bucket(bucketName)
}.build()
val request = HeadObjectRequest.builder()
.key(path)
.bucket(bucketName)
.build()

Check warning on line 93 in utils/ort/src/main/kotlin/storage/S3FileStorage.kt

View check run for this annotation

Codecov / codecov/patch

utils/ort/src/main/kotlin/storage/S3FileStorage.kt#L90-L93

Added lines #L90 - L93 were not covered by tests

return runCatching { s3Client.headObject(request) }.onFailure { exception ->
if (exception !is NoSuchKeyException) {
Expand All @@ -100,10 +100,10 @@ class S3FileStorage(
}

override fun read(path: String): InputStream {
val request = GetObjectRequest.builder().apply {
key(path)
bucket(bucketName)
}.build()
val request = GetObjectRequest.builder()
.key(path)
.bucket(bucketName)
.build()

Check warning on line 106 in utils/ort/src/main/kotlin/storage/S3FileStorage.kt

View check run for this annotation

Codecov / codecov/patch

utils/ort/src/main/kotlin/storage/S3FileStorage.kt#L103-L106

Added lines #L103 - L106 were not covered by tests

return runCatching {
val response = s3Client.getObjectAsBytes(request)
Expand All @@ -115,10 +115,10 @@ class S3FileStorage(
}

override fun write(path: String, inputStream: InputStream) {
val request = PutObjectRequest.builder().apply {
key(path)
bucket(bucketName)
}.build()
val request = PutObjectRequest.builder()
.key(path)
.bucket(bucketName)
.build()

Check warning on line 121 in utils/ort/src/main/kotlin/storage/S3FileStorage.kt

View check run for this annotation

Codecov / codecov/patch

utils/ort/src/main/kotlin/storage/S3FileStorage.kt#L118-L121

Added lines #L118 - L121 were not covered by tests

val body = inputStream.use {
if (compression) {
Expand Down

0 comments on commit 4a24dfc

Please sign in to comment.