Skip to content

Commit 5ca341c

Browse files
committed
Get encrypterAlias from annotation.
Closes #1597.
1 parent 978facb commit 5ca341c

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/main/java/org/springframework/data/couchbase/core/convert/CryptoConverter.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
package org.springframework.data.couchbase.core.convert;
1717

1818
import java.nio.charset.StandardCharsets;
19-
import java.util.LinkedList;
20-
import java.util.List;
2119
import java.util.Locale;
2220
import java.util.Map;
2321
import java.util.Optional;
@@ -29,14 +27,14 @@
2927
import org.springframework.data.convert.PropertyValueConverter;
3028
import org.springframework.data.convert.ValueConversionContext;
3129
import org.springframework.data.couchbase.core.mapping.CouchbaseDocument;
32-
import org.springframework.data.couchbase.core.mapping.CouchbasePersistentEntity;
3330
import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
3431
import org.springframework.data.mapping.PersistentProperty;
3532
import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
3633
import org.springframework.util.Assert;
3734

3835
import com.couchbase.client.core.encryption.CryptoManager;
3936
import com.couchbase.client.core.error.InvalidArgumentException;
37+
import com.couchbase.client.java.encryption.annotation.Encrypted;
4038
import com.couchbase.client.java.json.JsonArray;
4139
import com.couchbase.client.java.json.JsonObject;
4240
import com.couchbase.client.java.json.JsonValue;
@@ -70,7 +68,7 @@ public CouchbaseDocument write(Object value, ValueConversionContext<? extends Pe
7068
CouchbaseConversionContext ctx = (CouchbaseConversionContext) context;
7169
CouchbasePersistentProperty property = ctx.getProperty();
7270
byte[] plainText = coerceToBytesWrite(property, ctx.getAccessor(), ctx);
73-
Map<String, Object> encrypted = cryptoManager().encrypt(plainText, CryptoManager.DEFAULT_ENCRYPTER_ALIAS);
71+
Map<String, Object> encrypted = cryptoManager().encrypt(plainText, ctx.getProperty().findAnnotation(Encrypted.class).encrypter());
7472
return new CouchbaseDocument().setContent(encrypted);
7573
}
7674

0 commit comments

Comments
 (0)