Skip to content

Commit aa00df4

Browse files
committed
fix: declare types as nullable in Converters
1 parent cb42bf0 commit aa00df4

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

server/src/main/kotlin/com/adobe/testing/s3mock/controller/ChecksumModeHeaderConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.springframework.core.convert.converter.Converter
2424
* Example: x-amz-checksum-mode: ENABLED
2525
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html)
2626
*/
27-
open class ChecksumModeHeaderConverter : Converter<String, ChecksumMode> {
27+
open class ChecksumModeHeaderConverter : Converter<String, ChecksumMode?> {
2828
override fun convert(source: String): ChecksumMode? {
2929
return ChecksumMode.fromValue(source)
3030
}

server/src/main/kotlin/com/adobe/testing/s3mock/controller/HttpRangeHeaderConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package com.adobe.testing.s3mock.controller
1818
import org.springframework.core.convert.converter.Converter
1919
import org.springframework.http.HttpRange
2020

21-
open class HttpRangeHeaderConverter : Converter<String, HttpRange> {
21+
open class HttpRangeHeaderConverter : Converter<String, HttpRange?> {
2222
override fun convert(source: String): HttpRange? =
2323
HttpRange.parseRanges(source).firstOrNull()
2424
}

server/src/main/kotlin/com/adobe/testing/s3mock/controller/ObjectCannedAclHeaderConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.springframework.core.convert.converter.Converter
2424
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/userguide/acl-overview.html)
2525
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/userguide/acl-overview.html#canned-acl)
2626
*/
27-
open class ObjectCannedAclHeaderConverter : Converter<String, ObjectCannedACL> {
27+
open class ObjectCannedAclHeaderConverter : Converter<String, ObjectCannedACL?> {
2828
override fun convert(source: String): ObjectCannedACL? {
2929
return ObjectCannedACL.fromValue(source)
3030
}

server/src/main/kotlin/com/adobe/testing/s3mock/controller/ObjectOwnershipHeaderConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import org.springframework.core.convert.converter.Converter
2626
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/API_OwnershipControlsRule.html)
2727
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html)
2828
*/
29-
open class ObjectOwnershipHeaderConverter : Converter<String, ObjectOwnership> {
29+
open class ObjectOwnershipHeaderConverter : Converter<String, ObjectOwnership?> {
3030
override fun convert(source: String): ObjectOwnership? {
3131
return ObjectOwnership.fromValue(source)
3232
}

server/src/main/kotlin/com/adobe/testing/s3mock/controller/RegionConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.springframework.core.convert.converter.Converter
2424
* Example: bucket-region: us-east-1
2525
* [API Reference](https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region)
2626
*/
27-
open class RegionConverter : Converter<String, Region> {
27+
open class RegionConverter : Converter<String, Region?> {
2828
override fun convert(source: String): Region? {
2929
return Region.fromValue(source)
3030
}

server/src/main/kotlin/com/adobe/testing/s3mock/controller/TaggingHeaderConverter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import tools.jackson.dataformat.xml.XmlMapper
3232
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html)
3333
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPOST.html)
3434
*/
35-
class TaggingHeaderConverter(private val xmlMapper: XmlMapper) : Converter<String, List<Tag>> {
35+
class TaggingHeaderConverter(private val xmlMapper: XmlMapper) : Converter<String, List<Tag>?> {
3636

3737
override fun convert(source: String): List<Tag>? {
3838
val value = source.trim()

0 commit comments

Comments
 (0)