Use write operation indicator to decide how to encrypt value

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConversionContext.java

@@ -21,6 +21,7 @@ import org.springframework.data.mapping.model.PropertyValueProvider;
 import org.springframework.data.mapping.model.SpELContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.util.TypeInformation;
+import org.springframework.lang.CheckReturnValue;
 import org.springframework.lang.Nullable;
 
 /**
@@ -77,6 +78,17 @@ public class MongoConversionContext implements ValueConversionContext<MongoPersi
 		return persistentProperty;
 	}
 
+	/**
+	 *
+	 * @param operatorContext
+	 * @return new instance of {@link MongoConversionContext}.
+	 * @since 4.5
+	 */
+	@CheckReturnValue
+	public MongoConversionContext forOperator(@Nullable OperatorContext operatorContext) {
+		return new MongoConversionContext(accessor, persistentProperty, mongoConverter, spELContext, operatorContext);
+	}
+
 	@Nullable
 	public Object getValue(String propertyPath) {
 		return accessor.getPropertyValue(getProperty().getOwner().getRequiredPersistentProperty(propertyPath));
@@ -123,6 +135,8 @@ public class MongoConversionContext implements ValueConversionContext<MongoPersi
 		 * @return never {@literal null}.
 		 */
 		String getPath();
+
+		boolean isWriteOperation();
 	}
 
 	public static class WriteOperatorContext implements OperatorContext {
@@ -142,6 +156,11 @@ public class MongoConversionContext implements ValueConversionContext<MongoPersi
 		public String getPath() {
 			return path;
 		}
+
+		@Override
+		public boolean isWriteOperation() {
+			return true;
+		}
 	}
 
 	public static class QueryOperatorContext implements OperatorContext {
@@ -161,5 +180,10 @@ public class MongoConversionContext implements ValueConversionContext<MongoPersi
 		public String getPath() {
 			return path;
 		}
+
+		@Override
+		public boolean isWriteOperation() {
+			return false;
+		}
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/UpdateMapper.java

@@ -30,6 +30,7 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.core.convert.MongoConversionContext.WriteOperatorContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.query.Query;
@@ -163,14 +164,10 @@ public class UpdateMapper extends QueryMapper {
 	}
 
 	protected Object convertValueWithConversionContext(Field documentField, Object sourceValue, Object value,
-
 		PropertyValueConverter<Object, Object, ValueConversionContext<MongoPersistentProperty>> valueConverter,
 		MongoConversionContext conversionContext) {
 
-		MongoConversionContext ctx = new MongoConversionContext(NoPropertyPropertyValueProvider.INSTANCE,
+		return super.convertValueWithConversionContext(documentField, sourceValue, value, valueConverter, conversionContext.forOperator(new WriteOperatorContext(documentField.name)));
-			conversionContext.getProperty(), converter, conversionContext.getSpELContext(), null);
-
-		return super.convertValueWithConversionContext(documentField, sourceValue, value, valueConverter, ctx);
 	}
 
 	private Entry<String, Object> getMappedUpdateModifier(Field field, Object rawValue) {

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/ExplicitEncryptionContext.java

@@ -71,7 +71,7 @@ class ExplicitEncryptionContext implements EncryptionContext {
 
 	@Override
 	@Nullable
-	public OperatorContext getConversionOperation() {
+	public OperatorContext getOperatorContext() {
 		return conversionContext.getOperatorContext();
 	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/MongoEncryptionConverter.java

@@ -175,12 +175,12 @@ public class MongoEncryptionConverter implements EncryptingConverter<Object, Obj
 
 		String algorithm = annotation.algorithm();
 		EncryptionKey key = keyResolver.getKey(context);
-		OperatorContext operatorContext = context.getConversionOperation();
+		OperatorContext operatorContext = context.getOperatorContext();
 
 		EncryptionOptions encryptionOptions = new EncryptionOptions(algorithm, key,
 				getEQOptions(persistentProperty, operatorContext));
 
-		if (operatorContext != null && encryptionOptions.queryableEncryptionOptions() != null
+		if (operatorContext != null && !operatorContext.isWriteOperation() && encryptionOptions.queryableEncryptionOptions() != null
 				&& !encryptionOptions.queryableEncryptionOptions().getQueryType().equals("equality")) {
 			return encryptExpression(operatorContext, value, encryptionOptions);
 		} else {
@@ -207,7 +207,7 @@ public class MongoEncryptionConverter implements EncryptingConverter<Object, Obj
 			queryableEncryptionOptions = queryableEncryptionOptions.contentionFactor(queryableAnnotation.contentionFactor());
 		}
 
-		boolean isPartOfARangeQuery = operatorContext != null;
+		boolean isPartOfARangeQuery = operatorContext != null && !operatorContext.isWriteOperation();
 		if (isPartOfARangeQuery) {
 			queryableEncryptionOptions = queryableEncryptionOptions.queryType(queryableAnnotation.queryType());
 		}

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionContext.java

@@ -136,7 +136,7 @@ public interface EncryptionContext {
 	 * @return can be {@literal null}.
 	 */
 	@Nullable
-	default OperatorContext getConversionOperation() {
+	default OperatorContext getOperatorContext() {
 		return null;
 	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/RangeEncryptionTests.java

@@ -358,8 +358,8 @@ class RangeEncryptionTests {
 				if (ctx.getProperty().getMongoField().getName().isPath()) {
 					path = StringUtils.arrayToDelimitedString(ctx.getProperty().getMongoField().getName().parts(), ".");
 				}
-				if (ctx.getConversionOperation() != null) {
+				if (ctx.getOperatorContext() != null) {
-					path = ctx.getConversionOperation().getPath();
+					path = ctx.getOperatorContext().getPath();
 				}
 				return EncryptionKey.keyId(keyHolder.getEncryptionKey(path));
 			}));