#73 - Polishing.

Switch license header URLs to HTTPS. Rebase onto master.

Author: mp911de

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

@@ -25,6 +25,7 @@
 import java.util.OptionalLong;
 import java.util.Set;
 import java.util.function.BiFunction;
+import java.util.function.Function;
 
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.data.convert.CustomConversions.StoreConversions;
@@ -47,12 +48,14 @@
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.data.relational.core.sql.Expression;
 import org.springframework.data.relational.core.sql.OrderByField;
+import org.springframework.data.relational.core.sql.Select;
 import org.springframework.data.relational.core.sql.SelectBuilder.SelectFromAndOrderBy;
 import org.springframework.data.relational.core.sql.StatementBuilder;
 import org.springframework.data.relational.core.sql.Table;
 import org.springframework.data.relational.core.sql.render.NamingStrategies;
 import org.springframework.data.relational.core.sql.render.RenderContext;
 import org.springframework.data.relational.core.sql.render.RenderNamingStrategy;
+import org.springframework.data.relational.core.sql.render.SelectRenderContext;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -121,6 +124,21 @@ public DefaultReactiveDataAccessStrategy(Dialect dialect, R2dbcConverter convert
 			public RenderNamingStrategy getNamingStrategy() {
 				return NamingStrategies.asIs();
 			}
+
+			@Override
+			public SelectRenderContext getSelect() {
+				return new SelectRenderContext() {
+					@Override
+					public Function<Select, ? extends CharSequence> afterSelectList() {
+						return it -> "";
+					}
+
+					@Override
+					public Function<Select, ? extends CharSequence> afterOrderBy(boolean hasOrderBy) {
+						return it -> "";
+					}
+				};
+			}
 		};
 
 		this.statements = new DefaultStatementFactory(this.dialect, renderContext);
@@ -238,7 +256,7 @@ public String getTableName(Class<?> type) {
 		return getRequiredPersistentEntity(type).getTableName();
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.r2dbc.function.ReactiveDataAccessStrategy#getStatements()
 	 */
@@ -295,6 +313,7 @@ public String select(String tableName, Set<String> columns, Sort sort, Pageable
 			offset = OptionalLong.of(page.getOffset());
 		}
 
+		// See https://github.com/spring-projects/spring-data-r2dbc/issues/55
 		return StatementRenderUtil.render(selectBuilder.build(), limit, offset, this.dialect);
 	}
 

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

src/main/java/org/springframework/data/r2dbc/support/StatementRenderUtil.java

@@ -43,6 +43,7 @@ public static String render(Select select, OptionalLong limit, OptionalLong offs
 		String sql = SqlRenderer.toString(select);
 
 		// TODO: Replace with proper {@link Dialect} rendering for limit/offset.
+		// See https://github.com/spring-projects/spring-data-r2dbc/issues/55
 		if (limit.isPresent()) {
 
 			LimitClause limitClause = dialect.limit();

src/test/java/org/springframework/data/r2dbc/function/StatementFactoryUnitTests.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      https://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,11 +27,11 @@
 
 import org.springframework.data.r2dbc.dialect.PostgresDialect;
 import org.springframework.data.r2dbc.domain.SettableValue;
+import org.springframework.data.relational.core.dialect.RenderContextFactory;
 import org.springframework.data.relational.core.sql.Delete;
 import org.springframework.data.relational.core.sql.Insert;
 import org.springframework.data.relational.core.sql.Select;
 import org.springframework.data.relational.core.sql.Update;
-import org.springframework.data.relational.core.sql.render.NamingStrategies;
 
 /**
  * Unit tests for {@link StatementFactory}.
@@ -40,7 +40,10 @@
  */
 public class StatementFactoryUnitTests {
 
-	DefaultStatementFactory statements = new DefaultStatementFactory(PostgresDialect.INSTANCE, NamingStrategies::asIs);
+	// See https://github.com/spring-projects/spring-data-r2dbc/issues/55
+	DefaultStatementFactory statements = new DefaultStatementFactory(PostgresDialect.INSTANCE,
+			new RenderContextFactory(org.springframework.data.relational.core.dialect.PostgresDialect.INSTANCE)
+					.createRenderContext());
 
 	Statement statementMock = mock(Statement.class);
 
@@ -133,7 +136,7 @@ public void shouldToQuerySimpleInsert() {
 		});
 
 		assertThat(insert.getSource()).isInstanceOf(Insert.class);
-		assertThat(insert.toQuery()).isEqualTo("INSERT INTO foo (bar) VALUES($1)");
+		assertThat(insert.toQuery()).isEqualTo("INSERT INTO foo (bar) VALUES ($1)");
 
 		insert.bind(statementMock);
 		verify(statementMock).bind(0, "Foo");