Skip to content

Commit 7926fe9

Browse files
committed
fix: disambiguate store save arity.
1 parent 1718cc2 commit 7926fe9

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

store/common/src/main/java/io/gatehill/imposter/store/core/AbstractStore.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ abstract class AbstractStore(
6565
throw IllegalStateException("Cannot use deferred persistence for ephemeral store: $storeName of type: $typeDescription")
6666
}
6767
when (phase) {
68-
ExchangePhase.REQUEST_RECEIVED -> save(key, value)
68+
ExchangePhase.REQUEST_RECEIVED -> saveItem(key, value)
6969
ExchangePhase.RESPONSE_SENT -> deferSave(key, value)
7070
else -> throw IllegalStateException("Unsupported exchange phase for store persistence: $phase")
7171
}
@@ -74,9 +74,9 @@ abstract class AbstractStore(
7474
private fun deferSave(key: String, value: Any?) {
7575
logger.debug("Deferring persistence of item: $key to store: $storeName")
7676
deferredOperationService.defer("Write item: $key to store: $storeName") {
77-
save(key, value)
77+
saveItem(key, value)
7878
}
7979
}
8080

81-
abstract fun save(key: String, value: Any?)
81+
abstract fun saveItem(key: String, value: Any?)
8282
}

store/common/src/main/java/io/gatehill/imposter/store/core/Store.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ interface Store {
5252
val typeDescription: String
5353
val isEphemeral: Boolean
5454

55-
fun save(
56-
key: String,
57-
value: Any?,
58-
phase: ExchangePhase = ExchangePhase.REQUEST_RECEIVED,
59-
)
55+
fun save(key: String, value: Any?, phase: ExchangePhase)
56+
57+
fun save(key: String, value: Any?) =
58+
save(key, value, ExchangePhase.REQUEST_RECEIVED)
59+
6060
fun <T> load(key: String): T?
6161
fun loadAsJson(key: String): String
6262
fun delete(key: String)

store/common/src/main/java/io/gatehill/imposter/store/inmem/InMemoryStore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class InMemoryStore(
6363
private val store: MutableMap<String, Any> by lazy { ConcurrentHashMap() }
6464
override val typeDescription = "inmem"
6565

66-
override fun save(key: String, value: Any?) {
66+
override fun saveItem(key: String, value: Any?) {
6767
LOGGER.trace("Saving item with key: {} to store: {}", key, storeName)
6868
modified = true
6969
value?.let { store[key] = value } ?: store.remove(key)

store/dynamodb/src/main/java/io/gatehill/imposter/store/dynamodb/DynamoDBStore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class DynamoDBStore(
7979
logger.debug("Initialised DynamoDB store: $storeName using table: $tableName")
8080
}
8181

82-
override fun save(key: String, value: Any?) {
82+
override fun saveItem(key: String, value: Any?) {
8383
logger.trace("Saving item with key: {} to store: {}", key, storeName)
8484
val valueAttribute = convertToAttributeValue(value)
8585

store/redis/src/main/java/io/gatehill/imposter/store/redis/RedisStore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class RedisStore(
7979
}
8080
}
8181

82-
override fun save(key: String, value: Any?) {
82+
override fun saveItem(key: String, value: Any?) {
8383
LOGGER.trace("Saving item with key: {} to store: {}", key, storeName)
8484
if (null == value) {
8585
// can't save a null map value - remove existing if present

0 commit comments

Comments
 (0)