fix up tests

Author: mkleene

sdk/src/main/java/io/opentdf/platform/sdk/KASKeyCache.java

@@ -7,6 +7,7 @@
 import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Class representing a cache for KAS (Key Access Server) information.
@@ -31,7 +32,7 @@ public Config.KASInfo get(String url, String algorithm, String kid) {
         TimeStampedKASInfo cachedValue = cache.get(cacheKey);
 
         if (cachedValue == null) {
-            log.debug("didn't find kasinfo for url = [{}], algorithm = [{}]", url, algorithm);
+            log.debug("didn't find kasinfo for key= [{}]", cacheKey);
             return null;
         }
 
@@ -93,24 +94,26 @@ public KASKeyRequest(String url, String algorithm, String kid) {
         this.kid = kid;
     }
 
-    // Override equals and hashCode to ensure proper functioning of the HashMap
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || !(o instanceof KASKeyRequest)) return false;
+        if (o == null || getClass() != o.getClass()) return false;
         KASKeyRequest that = (KASKeyRequest) o;
-       if (algorithm == null){
-            return url.equals(that.url);
-        }
-        return url.equals(that.url) && algorithm.equals(that.algorithm);
+        return Objects.equals(url, that.url) && Objects.equals(algorithm, that.algorithm) && Objects.equals(kid, that.kid);
     }
 
     @Override
     public int hashCode() {
-        int result = 31 * url.hashCode();
-        if (algorithm != null) {
-            result = result + algorithm.hashCode();
-        }
-        return result;
+        return Objects.hash(url, algorithm, kid);
+    }
+
+    @Override
+    public String toString() {
+        return "KASKeyRequest{" +
+                "url='" + url + '\'' +
+                ", algorithm='" + algorithm + '\'' +
+                ", kid='" + kid + '\'' +
+                '}';
     }
+
+    // Override equals and hashCode to ensure proper functioning of the HashMap
 }

sdk/src/test/java/io/opentdf/platform/sdk/KASKeyCacheTest.java

@@ -51,7 +51,7 @@ void testStoreAndGet_AfterTimeLimit() {
         kasKeyCache.store(kasInfo1);
 
         // Simulate time passing by modifying the timestamp directly
-        KASKeyRequest cacheKey = new KASKeyRequest("https://example.com/kas1", "rsa:2048", "kid2");
+        KASKeyRequest cacheKey = new KASKeyRequest("https://example.com/kas1", "rsa:2048", "kid1");
         TimeStampedKASInfo timeStampedKASInfo = new TimeStampedKASInfo(kasInfo1, LocalDateTime.now().minus(6, ChronoUnit.MINUTES));
         kasKeyCache.cache.put(cacheKey, timeStampedKASInfo);
 
@@ -62,6 +62,18 @@ void testStoreAndGet_AfterTimeLimit() {
         assertNull(result);
     }
 
+    @Test
+    void testStoreAndGet_DifferentKIDs() {
+        // Store an item in the cache
+        kasKeyCache.store(kasInfo1);
+
+        // Attempt to retrieve the item with a different KID
+        Config.KASInfo result = kasKeyCache.get(kasInfo1.URL, kasInfo1.Algorithm, kasInfo1.KID + "different");
+
+        // Ensure the item was not retrieved (it should have expired)
+        assertNull(result);
+    }
+
     @Test
     void testStoreAndGet_WithNullAlgorithm() {
         // Store an item in the cache with a null algorithm
@@ -72,7 +84,7 @@ void testStoreAndGet_WithNullAlgorithm() {
         kasKeyCache.store(kasInfo1);
 
         // Retrieve the item with a null algorithm
-        Config.KASInfo result = kasKeyCache.get("https://example.com/kas1", null, null);
+        Config.KASInfo result = kasKeyCache.get("https://example.com/kas1", null, "kid1");
 
         // Ensure the item was correctly retrieved
         assertNotNull(result);