Skip to content

Commit af9ed12

Browse files
committed
DTO simplification 4
1 parent be8d420 commit af9ed12

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+19
-244
lines changed

server/src/main/kotlin/com/adobe/testing/s3mock/dto/AmazonCustomerByEmail.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo
2424
*/
2525
@S3Verified(year = 2025)
2626
@JsonTypeInfo(use = JsonTypeInfo.Id.SIMPLE_NAME, property = "xsi:type")
27-
@JvmRecord
2827
data class AmazonCustomerByEmail(
29-
@field:JsonProperty("EmailAddress")
3028
@param:JsonProperty("EmailAddress")
3129
val emailAddress: String?
3230
) : Grantee

server/src/main/kotlin/com/adobe/testing/s3mock/dto/Bucket.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,14 @@ import java.nio.file.Path
2626
*/
2727
@S3Verified(year = 2025)
2828
data class Bucket(
29-
@field:JsonProperty("BucketRegion")
3029
@param:JsonProperty("BucketRegion")
3130
val bucketRegion: String?,
32-
@field:JsonProperty("CreationDate")
3331
@param:JsonProperty("CreationDate")
3432
val creationDate: String?,
35-
@field:JsonProperty("Name")
3633
@param:JsonProperty("Name")
3734
val name: String,
38-
@JsonIgnore val path: Path?
35+
@JsonIgnore
36+
val path: Path?
3937
) {
4038
companion object {
4139
fun from(bucketMetadata: BucketMetadata): Bucket {

server/src/main/kotlin/com/adobe/testing/s3mock/dto/BucketInfo.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ import com.fasterxml.jackson.annotation.JsonProperty
2323
*/
2424
@S3Verified(year = 2025)
2525
data class BucketInfo(
26-
@field:JsonProperty("DataRedundancy")
2726
@param:JsonProperty("DataRedundancy")
2827
val dataRedundancy: DataRedundancy?,
29-
@field:JsonProperty("Type")
3028
@param:JsonProperty("Type")
3129
val type: BucketType?
3230
)

server/src/main/kotlin/com/adobe/testing/s3mock/dto/Buckets.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper
2525
*/
2626
@S3Verified(year = 2025)
2727
data class Buckets(
28-
@field:JacksonXmlElementWrapper(useWrapping = false)
2928
@param:JacksonXmlElementWrapper(useWrapping = false)
30-
@field:JsonProperty("Bucket")
3129
@param:JsonProperty("Bucket")
3230
val buckets: List<Bucket>?
3331
)

server/src/main/kotlin/com/adobe/testing/s3mock/dto/CanonicalUser.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo
2424
*/
2525
@S3Verified(year = 2025)
2626
@JsonTypeInfo(use = JsonTypeInfo.Id.SIMPLE_NAME, property = "xsi:type")
27-
@JvmRecord
2827
data class CanonicalUser(
29-
@field:JsonProperty("DisplayName")
3028
@param:JsonProperty("DisplayName")
3129
val displayName: String?,
32-
@field:JsonProperty("ID")
3330
@param:JsonProperty("ID")
3431
val id: String?
3532
) : Grantee

server/src/main/kotlin/com/adobe/testing/s3mock/dto/Checksum.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,16 @@ import com.fasterxml.jackson.annotation.JsonProperty
2424
*/
2525
@S3Verified(year = 2025)
2626
data class Checksum(
27-
@field:JsonProperty("ChecksumCRC32")
2827
@param:JsonProperty("ChecksumCRC32")
2928
val checksumCRC32: String?,
30-
@field:JsonProperty("ChecksumCRC32C")
3129
@param:JsonProperty("ChecksumCRC32C")
3230
val checksumCRC32C: String?,
33-
@field:JsonProperty("ChecksumCRC64NVME")
3431
@param:JsonProperty("ChecksumCRC64NVME")
3532
val checksumCRC64NVME: String?,
36-
@field:JsonProperty("ChecksumSHA1")
3733
@param:JsonProperty("ChecksumSHA1")
3834
val checksumSHA1: String?,
39-
@field:JsonProperty("ChecksumSHA256")
4035
@param:JsonProperty("ChecksumSHA256")
4136
val checksumSHA256: String?,
42-
@field:JsonProperty("ChecksumType")
4337
@param:JsonProperty("ChecksumType")
4438
val checksumType: ChecksumType?
4539
) {

server/src/main/kotlin/com/adobe/testing/s3mock/dto/CompleteMultipartUpload.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper
2525
*/
2626
@S3Verified(year = 2025)
2727
data class CompleteMultipartUpload(
28-
@field:JacksonXmlElementWrapper(useWrapping = false)
2928
@param:JacksonXmlElementWrapper(useWrapping = false)
30-
@field:JsonProperty("Part")
3129
@param:JsonProperty("Part")
3230
val parts: List<CompletedPart>
3331
)

server/src/main/kotlin/com/adobe/testing/s3mock/dto/CompleteMultipartUploadResult.kt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,32 +30,24 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement
3030
@JsonRootName("CompleteMultipartUploadResult")
3131
@JacksonXmlRootElement(localName = "CompleteMultipartUploadResult")
3232
class CompleteMultipartUploadResult(
33-
@field:JsonProperty("Bucket")
3433
@param:JsonProperty("Bucket")
3534
val bucket: String?,
36-
@field:JsonProperty("ChecksumCRC32")
3735
@param:JsonProperty("ChecksumCRC32")
3836
val checksumCRC32: String? = null,
39-
@field:JsonProperty("ChecksumCRC32C")
4037
@param:JsonProperty("ChecksumCRC32C")
4138
val checksumCRC32C: String? = null,
42-
@field:JsonProperty("ChecksumCRC64NVME")
4339
@param:JsonProperty("ChecksumCRC64NVME")
4440
val checksumCRC64NVME: String? = null,
45-
@field:JsonProperty("ChecksumSHA1")
4641
@param:JsonProperty("ChecksumSHA1")
4742
val checksumSHA1: String? = null,
48-
@field:JsonProperty("ChecksumSHA256")
4943
@param:JsonProperty("ChecksumSHA256")
5044
val checksumSHA256: String? = null,
51-
@field:JsonProperty("ChecksumType")
5245
@param:JsonProperty("ChecksumType")
5346
val checksumType: ChecksumType? = null,
54-
@JsonProperty("ETag") etag: String?,
55-
@field:JsonProperty("Key")
47+
@JsonProperty("ETag")
48+
etag: String?,
5649
@param:JsonProperty("Key")
5750
val key: String,
58-
@field:JsonProperty("Location")
5951
@param:JsonProperty("Location")
6052
val location: String?,
6153
@field:JacksonXmlProperty(isAttribute = true, localName = "xmlns")

server/src/main/kotlin/com/adobe/testing/s3mock/dto/CompletedPart.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,17 @@ import com.fasterxml.jackson.annotation.JsonProperty
2525
*/
2626
@S3Verified(year = 2025)
2727
class CompletedPart(
28-
@field:JsonProperty("ChecksumCRC32")
2928
@param:JsonProperty("ChecksumCRC32")
3029
val checksumCRC32: String?,
31-
@field:JsonProperty("ChecksumCRC32C")
3230
@param:JsonProperty("ChecksumCRC32C")
3331
val checksumCRC32C: String?,
34-
@field:JsonProperty("ChecksumCRC64NVME")
3532
@param:JsonProperty("ChecksumCRC64NVME")
3633
val checksumCRC64NVME: String?,
37-
@field:JsonProperty("ChecksumSHA1")
3834
@param:JsonProperty("ChecksumSHA1")
3935
val checksumSHA1: String?,
40-
@field:JsonProperty("ChecksumSHA256")
4136
@param:JsonProperty("ChecksumSHA256")
4237
val checksumSHA256: String?,
4338
@JsonProperty("ETag") etag: String?,
44-
@field:JsonProperty("PartNumber")
4539
@param:JsonProperty("PartNumber")
4640
val partNumber: Int
4741
) {

server/src/main/kotlin/com/adobe/testing/s3mock/dto/CopyObjectResult.kt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,20 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement
3131
@JsonRootName("CopyObjectResult")
3232
@JacksonXmlRootElement(localName = "CopyObjectResult")
3333
class CopyObjectResult(
34-
@field:JsonProperty("ChecksumCRC32")
3534
@param:JsonProperty("ChecksumCRC32")
3635
val checksumCRC32: String? = null,
37-
@field:JsonProperty("ChecksumCRC32C")
3836
@param:JsonProperty("ChecksumCRC32C")
3937
val checksumCRC32C: String? = null,
40-
@field:JsonProperty("ChecksumCRC64NVME")
4138
@param:JsonProperty("ChecksumCRC64NVME")
4239
val checksumCRC64NVME: String? = null,
43-
@field:JsonProperty("ChecksumSHA1")
4440
@param:JsonProperty("ChecksumSHA1")
4541
val checksumSHA1: String? = null,
46-
@field:JsonProperty("ChecksumSHA256")
4742
@param:JsonProperty("ChecksumSHA256")
4843
val checksumSHA256: String? = null,
49-
@field:JsonProperty("ChecksumType")
5044
@param:JsonProperty("ChecksumType")
5145
val checksumType: ChecksumType?,
52-
@JsonProperty("ETag") etag: String?,
53-
@field:JsonProperty("LastModified")
46+
@JsonProperty("ETag")
47+
etag: String?,
5448
@param:JsonProperty("LastModified")
5549
val lastModified: String?,
5650
@field:JacksonXmlProperty(isAttribute = true, localName = "xmlns")

0 commit comments

Comments
 (0)