Minor fixes and improvements (#190)

aerospike-community · Apr 23, 2023 · 36c3888 · 36c3888
1 parent d0d825c
commit 36c3888
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 18 deletions.
diff --git a/src/main/kotlin/com/aerospike/skyhook/listener/key/MsetCommandListener.kt b/src/main/kotlin/com/aerospike/skyhook/listener/key/MsetCommandListener.kt
@@ -57,8 +57,7 @@ class MsetCommandListener(
 
     private fun getValues(cmd: RequestCommand): Map<Key, Value> {
         return cmd.args.drop(1).chunked(2)
-            .map { (it1, it2) -> createKey(it1) to Typed.getValue(it2) }
-            .toMap()
+            .associate { (it1, it2) -> createKey(it1) to Typed.getValue(it2) }
     }
 
     override fun onSuccess(key: Key?) {

diff --git a/src/main/kotlin/com/aerospike/skyhook/listener/map/SaddCommandListener.kt b/src/main/kotlin/com/aerospike/skyhook/listener/map/SaddCommandListener.kt
@@ -49,9 +49,7 @@ open class SaddCommandListener(
     }
 
     protected open fun getValues(cmd: RequestCommand): Map<Value, Value> {
-        return cmd.args.drop(2)
-            .map { Typed.getValue(it) to Value.getAsNull() }
-            .toMap()
+        return cmd.args.drop(2).associate { Typed.getValue(it) to Value.getAsNull() }
     }
 
     override fun writeError(e: AerospikeException?) {

diff --git a/src/main/kotlin/com/aerospike/skyhook/listener/map/ZaddCommandListener.kt b/src/main/kotlin/com/aerospike/skyhook/listener/map/ZaddCommandListener.kt
@@ -61,12 +61,9 @@ class ZaddCommandListener(
         }
 
         private fun setSortedSetValues(from: Int) {
-            values = cmd.args.drop(from).chunked(2)
-                .map { (it1, it2) ->
-                    Typed.getStringValue(it2) to
-                            Value.LongValue(Typed.getLong(it1))
-                }
-                .toMap()
+            values = cmd.args.drop(from).chunked(2).associate { (it1, it2) ->
+                Typed.getStringValue(it2) to Value.LongValue(Typed.getLong(it1))
+            }
         }
 
         private fun validate() {
@@ -111,6 +108,7 @@ class ZaddCommandListener(
                     zaddCommand.values.values.first()
                 )
             }
+
             else -> {
                 MapOperation.putItems(
                     getMapPolicy(),
@@ -126,9 +124,11 @@ class ZaddCommandListener(
             zaddCommand.XX -> {
                 MapWriteFlags.UPDATE_ONLY
             }
+
             zaddCommand.NX -> {
                 MapWriteFlags.CREATE_ONLY
             }
+
             else -> {
                 MapWriteFlags.DEFAULT
             }

diff --git a/src/main/kotlin/com/aerospike/skyhook/listener/map/ZrangestoreCommandListener.kt b/src/main/kotlin/com/aerospike/skyhook/listener/map/ZrangestoreCommandListener.kt
@@ -30,10 +30,9 @@ class ZrangestoreCommandListener(
         val putOperation = MapOperation.putItems(
             MapPolicy(),
             aeroCtx.bin,
-            (record.bins[aeroCtx.bin] as List<Map.Entry<Any, Long>>).map {
-                Typed.getValue(it.key.toString().toByteArray()) to
-                        Value.get(it.value)
-            }.toMap()
+            (record.bins[aeroCtx.bin] as List<Map.Entry<Any, Long>>).associate {
+                Typed.getValue(it.key.toString().toByteArray()) to Value.get(it.value)
+            }
         )
         client.operate(
             null, this, defaultWritePolicy,

diff --git a/src/main/kotlin/com/aerospike/skyhook/util/Merge.kt b/src/main/kotlin/com/aerospike/skyhook/util/Merge.kt
@@ -15,7 +15,7 @@ interface IntersectMerge : Merge {
         if (data.isEmpty()) {
             return setOf()
         }
-        return data.reduce { acc, l -> acc.intersect(l.filterNotNull()) }
+        return data.reduce { acc, l -> acc.intersect(l.filterNotNull().toSet()) }
             .filterNotNull().toSet()
     }
 }
diff --git a/src/main/kotlin/com/aerospike/skyhook/util/Typed.kt b/src/main/kotlin/com/aerospike/skyhook/util/Typed.kt
@@ -6,10 +6,11 @@ import java.nio.charset.StandardCharsets
 
 object Typed {
 
+    @Suppress("kotlin:S108")
     fun getValue(wireVal: ByteArray): Value {
         try {
             return Value.DoubleValue(String(wireVal).toDouble())
-        } catch (e: NumberFormatException) {
+        } catch (ignore: NumberFormatException) {
         }
         try {
             StandardCharsets.UTF_8.newDecoder().decode(ByteBuffer.wrap(wireVal))

diff --git a/src/main/kotlin/com/aerospike/skyhook/util/client/AuthDetails.kt b/src/main/kotlin/com/aerospike/skyhook/util/client/AuthDetails.kt
@@ -6,7 +6,6 @@ data class AuthDetails(
     val user: String,
     val password: String
 ) {
-    @Suppress("UnstableApiUsage")
     val hashString: String by lazy {
         Hashing.sha256()
             .hashBytes(toString().encodeToByteArray())