Remove @Autowired for SpelExpressionResultSanitizer. Allow for one to inject a custom sanitizer in the RelationMappingContext and JdbcMappingContext classes.

Author: kurtn718

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/JdbcMappingContext.java

@@ -82,6 +82,7 @@ protected RelationalPersistentProperty createPersistentProperty(Property propert
 		BasicJdbcPersistentProperty persistentProperty = new BasicJdbcPersistentProperty(property, owner, simpleTypeHolder,
 				this.getNamingStrategy());
 		persistentProperty.setForceQuote(isForceQuote());
+		persistentProperty.setSpelExpressionProcessor(getSpelExpressionProcessor());
 		return persistentProperty;
 	}
 

spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java

@@ -112,6 +112,13 @@ public BasicRelationalPersistentProperty(Property property, PersistentEntity<?,
 				.map(this::createSqlIdentifier) //
 				.orElseGet(() -> createDerivedSqlIdentifier(namingStrategy.getKeyColumn(this))));
 	}
+	public SpelExpressionProcessor getSpelExpressionProcessor() {
+		return spelExpressionProcessor;
+	}
+
+	public void setSpelExpressionProcessor(SpelExpressionProcessor spelExpressionProcessor) {
+		this.spelExpressionProcessor = spelExpressionProcessor;
+	}
 
 	private SqlIdentifier createSqlIdentifier(String name) {
 		return isForceQuote() ? SqlIdentifier.quoted(name) : SqlIdentifier.unquoted(name);

spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalMappingContext.java

@@ -36,6 +36,7 @@ public class RelationalMappingContext
 
 	private final NamingStrategy namingStrategy;
 	private boolean forceQuote = true;
+	private SpelExpressionProcessor spelExpressionProcessor = new SpelExpressionProcessor();
 
 	/**
 	 * Creates a new {@link RelationalMappingContext}.
@@ -77,12 +78,21 @@ public void setForceQuote(boolean forceQuote) {
 		this.forceQuote = forceQuote;
 	}
 
+	public SpelExpressionProcessor getSpelExpressionProcessor() {
+		return spelExpressionProcessor;
+	}
+
+	public void setSpelExpressionProcessor(SpelExpressionProcessor spelExpressionProcessor) {
+		this.spelExpressionProcessor = spelExpressionProcessor;
+	}
+
 	@Override
 	protected <T> RelationalPersistentEntity<T> createPersistentEntity(TypeInformation<T> typeInformation) {
 
 		RelationalPersistentEntityImpl<T> entity = new RelationalPersistentEntityImpl<>(typeInformation,
 				this.namingStrategy);
 		entity.setForceQuote(isForceQuote());
+		entity.setSpelExpressionProcessor(getSpelExpressionProcessor());
 
 		return entity;
 	}
@@ -94,6 +104,7 @@ protected RelationalPersistentProperty createPersistentProperty(Property propert
 		BasicRelationalPersistentProperty persistentProperty = new BasicRelationalPersistentProperty(property, owner,
 				simpleTypeHolder, this.namingStrategy);
 		persistentProperty.setForceQuote(isForceQuote());
+		persistentProperty.setSpelExpressionProcessor(getSpelExpressionProcessor());
 
 		return persistentProperty;
 	}

spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalPersistentEntityImpl.java

@@ -65,6 +65,14 @@ class RelationalPersistentEntityImpl<T> extends BasicPersistentEntity<T, Relatio
 				.map(this::createSqlIdentifier));
 	}
 
+	public SpelExpressionProcessor getSpelExpressionProcessor() {
+		return spelExpressionProcessor;
+	}
+
+	public void setSpelExpressionProcessor(SpelExpressionProcessor spelExpressionProcessor) {
+		this.spelExpressionProcessor = spelExpressionProcessor;
+	}
+
 	private SqlIdentifier createSqlIdentifier(String name) {
 		return isForceQuote() ? SqlIdentifier.quoted(name) : SqlIdentifier.unquoted(name);
 	}

spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/SpelExpressionProcessor.java

@@ -17,14 +17,13 @@
  * and strips out any other characters.
  *
  * Custom sanitization (if desired) can be achieved by creating a class that implements
- * the {@link #SpelExpressionResultSanitizer} interface and configuring a spelExpressionResultSanitizer
- * Bean.
+ * the {@link #SpelExpressionResultSanitizer} interface and then invoking the
+ * {@link #setSpelExpressionResultSanitizer(SpelExpressionResultSanitizer)} method.
  *
  * @author Kurt Niemi
  * @since 3.1
  */
 public class SpelExpressionProcessor {
-    @Autowired(required = false)
     private SpelExpressionResultSanitizer spelExpressionResultSanitizer;
     private StandardEvaluationContext evalContext = new StandardEvaluationContext();
     private SpelExpressionParser parser = new SpelExpressionParser();
@@ -65,7 +64,7 @@ protected boolean isSpellExpression(String expression) {
 
         return false;
     }
-    private SpelExpressionResultSanitizer getSpelExpressionResultSanitizer() {
+    public SpelExpressionResultSanitizer getSpelExpressionResultSanitizer() {
 
         if (this.spelExpressionResultSanitizer == null) {
             this.spelExpressionResultSanitizer = new SpelExpressionResultSanitizer() {
@@ -79,4 +78,9 @@ public String sanitize(String result) {
         }
         return this.spelExpressionResultSanitizer;
     }
+
+    public void setSpelExpressionResultSanitizer(SpelExpressionResultSanitizer spelExpressionResultSanitizer) {
+        this.spelExpressionResultSanitizer = spelExpressionResultSanitizer;
+    }
+
 }