Private mutable properties

Add private backing field and public accessors to non-mutable versions.

Author: afranken

server/src/main/kotlin/com/adobe/testing/s3mock/store/BucketMetadata.kt

@@ -23,6 +23,7 @@ import com.adobe.testing.s3mock.dto.ObjectLockConfiguration
 import com.adobe.testing.s3mock.dto.ObjectOwnership
 import com.adobe.testing.s3mock.dto.VersioningConfiguration
 import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.annotation.JsonProperty
 import java.nio.file.Path
 import java.util.UUID
 
@@ -40,8 +41,25 @@ data class BucketMetadata(
   val bucketRegion: String,
   val bucketInfo: BucketInfo?,
   val locationInfo: LocationInfo?,
-  val objects: MutableMap<String, UUID> = mutableMapOf()
+  @param:JsonProperty("objects")
+  private val _objects: MutableMap<String, UUID> = mutableMapOf()
 ) {
+  val objects: Map<String, UUID>
+    get() = java.util.Collections.unmodifiableMap(_objects)
+
+  fun addKey(key: String): UUID {
+    val existing = _objects[key]
+    if (existing != null) return existing
+    val uuid = UUID.randomUUID()
+    _objects[key] = uuid
+    return uuid
+  }
+
+  fun removeKey(key: String): Boolean =
+    _objects.remove(key) != null
+
+  fun getID(key: String): UUID? = _objects[key]
+
   fun withVersioningConfiguration(versioningConfiguration: VersioningConfiguration): BucketMetadata =
     this.copy(versioningConfiguration = versioningConfiguration)
 
@@ -51,29 +69,6 @@ data class BucketMetadata(
   fun withBucketLifecycleConfiguration(bucketLifecycleConfiguration: BucketLifecycleConfiguration?): BucketMetadata =
     this.copy(bucketLifecycleConfiguration = bucketLifecycleConfiguration)
 
-  fun doesKeyExist(key: String): Boolean {
-    return getID(key) != null
-  }
-
-  fun addKey(key: String): UUID {
-    if (doesKeyExist(key)) {
-      return getID(key)!!
-    } else {
-      val uuid = UUID.randomUUID()
-      this.objects[key] = uuid
-      return uuid
-    }
-  }
-
-  fun removeKey(key: String): Boolean {
-    val removed = this.objects.remove(key)
-    return removed != null
-  }
-
-  fun getID(key: String): UUID? {
-    return this.objects[key]
-  }
-
   @get:JsonIgnore
   val isVersioningEnabled: Boolean
     get() = this.versioningConfiguration?.status == VersioningConfiguration.Status.ENABLED

server/src/main/kotlin/com/adobe/testing/s3mock/store/S3ObjectVersions.kt

@@ -17,34 +17,39 @@
 package com.adobe.testing.s3mock.store
 
 import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.annotation.JsonProperty
 import java.util.UUID
 
 /**
  * [doc](https://docs.aws.amazon.com/AmazonS3/latest/userguide/manage-objects-versioned-bucket.html).
  */
 data class S3ObjectVersions(
   val id: UUID,
-  val versions: MutableList<String>
+  @param:JsonProperty("versions")
+  private val _versions: MutableList<String>
 ) {
   constructor(id: UUID) : this(id, mutableListOf())
 
+  val versions: List<String>
+    get() = java.util.Collections.unmodifiableList(_versions)
+
   fun createVersion(): String {
     val versionId = UUID.randomUUID().toString()
-    versions.add(versionId)
+    _versions.add(versionId)
     return versionId
   }
 
   @get:JsonIgnore
   val latestVersion: String?
     get() {
-      if (versions.isEmpty()) {
+      if (_versions.isEmpty()) {
         return null
       }
-      return versions[versions.size - 1]
+      return _versions[_versions.size - 1]
     }
 
   fun deleteVersion(versionId: String) {
-    versions.remove(versionId)
+    _versions.remove(versionId)
   }
 
   companion object {

server/src/test/kotlin/com/adobe/testing/s3mock/store/BucketMetadataTest.kt

@@ -84,7 +84,7 @@ class BucketMetadataTest {
       bucketRegion = "us-east-1",
       bucketInfo = bucketInfo(),
       locationInfo = locationInfo(),
-      objects = mutableMapOf("src/test/resources/sampleFile_large.txt" to UUID.fromString("c6fe9dd9-2c83-4f34-a934-5da6d7d4ea2c"))
+      _objects = mutableMapOf("src/test/resources/sampleFile_large.txt" to UUID.fromString("c6fe9dd9-2c83-4f34-a934-5da6d7d4ea2c"))
     )
     DtoTestUtil.serializeAndAssertJSON(iut, testInfo)
   }