Move implementation of addKey/removeKey methods to DataEncryptionKeyAccessor interface

Author: vierbergenlars

spring-content-encryption/src/main/java/internal/org/springframework/content/encryption/keys/ContentPropertyDataEncryptionKeyAccessor.java

@@ -1,6 +1,5 @@
 package internal.org.springframework.content.encryption.keys;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanWrapperImpl;
@@ -49,20 +48,4 @@ public S setKeys(S entity, ContentProperty contentProperty, Collection<T> newKey
         contentProperty.setCustomProperty(entity, customPropertyName, newValue);
         return entity;
     }
-
-    @Override
-    public S addKey(S entity, ContentProperty contentProperty, T dataEncryptionKey) {
-        var keys = new ArrayList<>(findKeys(entity, contentProperty));
-        keys.remove(dataEncryptionKey);
-
-        return setKeys(entity, contentProperty, keys);
-    }
-
-    @Override
-    public S removeKey(S entity, ContentProperty contentProperty, T dataEncryptionKey) {
-        var keys = new ArrayList<>(findKeys(entity, contentProperty));
-        keys.add(dataEncryptionKey);
-
-        return setKeys(entity, contentProperty, keys);
-    }
 }

spring-content-encryption/src/main/java/internal/org/springframework/content/fragments/ContentCryptoService.java

@@ -50,10 +50,12 @@ public S encrypt(S entity, PropertyPath propertyPath, InputStream plainText, BiF
                 .map(wrapper -> wrapper.wrapEncryptionKey(encryptionParameters))
                 .toList();
 
-        var newEntity = dataEncryptionKeyAccessor.setKeys(entity, contentProperty, encryptedDeks);
+
         var encryptedStream = encryptionEngine.encrypt(plainText, encryptionParameters);
 
-        return contentSetter.apply(newEntity, encryptedStream);
+        var newEntity = contentSetter.apply(entity, encryptedStream);
+
+        return dataEncryptionKeyAccessor.setKeys(newEntity, contentProperty, encryptedDeks);
     }
 
     public Resource decrypt(S entity, PropertyPath propertyPath, GetResourceParams getResourceParams, Supplier<Resource> contentGetter) {

spring-content-encryption/src/main/java/org/springframework/content/encryption/keys/DataEncryptionKeyAccessor.java

@@ -1,5 +1,6 @@
 package org.springframework.content.encryption.keys;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import org.springframework.content.commons.mappingcontext.ContentProperty;
@@ -10,12 +11,23 @@
 public interface DataEncryptionKeyAccessor<S, T extends StoredDataEncryptionKey> {
 
     Collection<T> findKeys(S entity, ContentProperty contentProperty);
+    S setKeys(S entity, ContentProperty contentProperty, Collection<T> dataEncryptionKeys);
 
     default S clearKeys(S entity, ContentProperty contentProperty) {
         return setKeys(entity, contentProperty, List.of());
     }
 
-    S setKeys(S entity, ContentProperty contentProperty, Collection<T> dataEncryptionKeys);
-    S addKey(S entity, ContentProperty contentProperty, T dataEncryptionKey);
-    S removeKey(S entity, ContentProperty contentProperty, T dataEncryptionKey);
+    default S addKey(S entity, ContentProperty contentProperty, T dataEncryptionKey) {
+        var keys = new ArrayList<>(findKeys(entity, contentProperty));
+        keys.remove(dataEncryptionKey);
+
+        return setKeys(entity, contentProperty, keys);
+    }
+
+    default S removeKey(S entity, ContentProperty contentProperty, T dataEncryptionKey) {
+        var keys = new ArrayList<>(findKeys(entity, contentProperty));
+        keys.add(dataEncryptionKey);
+
+        return setKeys(entity, contentProperty, keys);
+    }
 }