#73 - hacking - extracted super class.

Author: schauder

src/main/java/org/springframework/data/r2dbc/function/DefaultStatementFactory.java

@@ -17,6 +17,7 @@
 
 import io.r2dbc.spi.Connection;
 import io.r2dbc.spi.Statement;
+import kotlin.internal.LowPriorityInOverloadResolution;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -29,6 +30,7 @@
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.function.Function;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.r2dbc.dialect.BindMarker;
@@ -362,6 +364,7 @@ private static Condition toCondition(BindMarkers bindMarkers, Column column, Set
 		}
 	}
 
+
 	/**
 	 * Value object holding value and {@code NULL} bindings.
 	 *
@@ -412,13 +415,75 @@ void apply(Statement to) {
 		}
 	}
 
+
+	static abstract class PreparedOperationSupport<T> implements PreparedOperation<T> {
+
+		private Function<String, String> sqlFilter = s -> s;
+		private Function<Binding, Binding> bindingFilter = b -> b;
+
+
+		abstract protected String createBaseSql();
+
+		protected abstract Binding getBaseBinding();
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.r2dbc.function.QueryOperation#toQuery()
+		 */
+		@Override
+		public String toQuery() {
+
+			return sqlFilter.apply(createBaseSql());
+		}
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.r2dbc.function.PreparedOperation#bind(io.r2dbc.spi.Statement)
+		 */
+		protected Statement bind(Statement to) {
+
+			bindingFilter.apply(getBaseBinding()).apply(to);
+			return to;
+		}
+
+
+		@Override
+		public Statement createBoundStatement(Connection connection) {
+
+			// TODO add back logging
+//			if (logger.isDebugEnabled()) {
+//				logger.debug("Executing SQL statement [" + sql + "]");
+//			}
+
+			return bind(connection.createStatement(toQuery()));
+		}
+
+		@Override
+		public void addSqlFilter(Function<String, String> filter) {
+
+			Assert.notNull(filter, "Filter must not be null.");
+
+			sqlFilter = filter;
+
+		}
+
+		@Override
+		public void addBindingFilter(Function<Binding, Binding> filter) {
+
+			Assert.notNull(filter, "Filter must not be null.");
+
+			bindingFilter = filter;
+		}
+
+	}
+
+
 	/**
 	 * Default implementation of {@link PreparedOperation}.
 	 *
 	 * @param <T>
 	 */
 	@RequiredArgsConstructor
-	static class DefaultPreparedOperation<T> implements PreparedOperation<T> {
+	static class DefaultPreparedOperation<T> extends PreparedOperationSupport<T> {
 
 		private final T source;
 		private final RenderContext renderContext;
@@ -433,13 +498,8 @@ public T getSource() {
 			return this.source;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.r2dbc.function.QueryOperation#toQuery()
-		 */
 		@Override
-		public String toQuery() {
-
+		protected String createBaseSql() {
 			SqlRenderer sqlRenderer = SqlRenderer.create(renderContext);
 
 			if (this.source instanceof Select) {
@@ -461,25 +521,9 @@ public String toQuery() {
 			throw new IllegalStateException("Cannot render " + this.getSource());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.r2dbc.function.PreparedOperation#bind(io.r2dbc.spi.Statement)
-		 */
-		protected Statement bind(Statement to) {
-
-			binding.apply(to);
-			return to;
-		}
-
 		@Override
-		public Statement createBoundStatement(Connection connection) {
-
-			// TODO add back logging
-//			if (logger.isDebugEnabled()) {
-//				logger.debug("Executing SQL statement [" + sql + "]");
-//			}
-
-			return bind(connection.createStatement(toQuery()));
+		protected Binding getBaseBinding() {
+			return binding;
 		}
 	}
 }

src/main/java/org/springframework/data/r2dbc/function/ParameterbindingPreparedOperation.java

@@ -19,6 +19,7 @@
 import io.r2dbc.spi.Statement;
 
 import java.util.Map;
+import java.util.function.Function;
 
 import org.springframework.data.r2dbc.domain.SettableValue;
 
@@ -66,6 +67,16 @@ public Statement createBoundStatement(Connection connection) {
 		return statement;
 	}
 
+	@Override
+	public void addSqlFilter(Function<String, String> filter) {
+
+	}
+
+	@Override
+	public void addBindingFilter(Function<DefaultStatementFactory.Binding, DefaultStatementFactory.Binding> filter) {
+
+	}
+
 	@Override
 	public String toQuery() {
 		return operation.toQuery();

src/main/java/org/springframework/data/r2dbc/function/PreparedOperation.java

@@ -18,6 +18,7 @@
 import io.r2dbc.spi.Connection;
 import io.r2dbc.spi.Statement;
 
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**
@@ -40,10 +41,15 @@ public interface PreparedOperation<T> extends QueryOperation {
 	T getSource();
 
 	/**
-	 * Bind query parameters to a {@link Statement}.
+	 * create a {@link Statement} from the generated SQL after applying the SQL filter and then applying the
+	 * {@link org.springframework.data.r2dbc.function.DefaultStatementFactory.Binding} after filtering those as well.
 	 *
 	 * @param connection the {@link Connection} used for constructing a statement
 	 * @return the bound statement.
 	 */
 	Statement createBoundStatement(Connection connection);
+
+	void addSqlFilter(Function<String, String> filter);
+
+	void addBindingFilter(Function<DefaultStatementFactory.Binding, DefaultStatementFactory.Binding> filter);
 }