Polishing.

Rename method to renderForGeneratedValues to reflect its intended usage and enhance documentation.

Tweak Javadoc.

Closes: #483
Original pull request: #602.

Author: mp911de

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

@@ -362,8 +362,8 @@ public R2dbcConverter getConverter() {
 	}
 
 	@Override
-	public String renderForGeneratedKeys(SqlIdentifier identifier) {
-		return dialect.renderForGeneratedKeys(identifier);
+	public String renderForGeneratedValues(SqlIdentifier identifier) {
+		return dialect.renderForGeneratedValues(identifier);
 	}
 
 	private RelationalPersistentEntity<?> getRequiredPersistentEntity(Class<?> typeToRead) {

src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java

@@ -634,7 +634,7 @@ private <T> Mono<T> doInsert(T entity, SqlIdentifier tableName, OutboundRow outb
 						return statement.returnGeneratedValues();
 					}
 
-					return statement.returnGeneratedValues(dataAccessStrategy.renderForGeneratedKeys(identifierColumns.get(0)));
+					return statement.returnGeneratedValues(dataAccessStrategy.renderForGeneratedValues(identifierColumns.get(0)));
 				})
 				.map(this.dataAccessStrategy.getConverter().populateIdIfNecessary(entity)) //
 				.all() //

src/main/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategy.java

@@ -138,14 +138,16 @@ public interface ReactiveDataAccessStrategy {
 	String toSql(SqlIdentifier identifier);
 
 	/**
-	 * Render a {@link SqlIdentifier} in a way suitable for registering it as a generated key with a statement.
-	 * 
+	 * Render a {@link SqlIdentifier} in a way suitable for registering it as a generated key with a statement through
+	 * {@code Statement#returnGeneratedValues}.
+	 *
 	 * @param identifier to render. Must not be {@literal null}.
 	 * @return rendered identifier. Guaranteed to be not {@literal null}.
+	 * @since 1.3.2
 	 */
-	default String renderForGeneratedKeys(SqlIdentifier identifier) {
+	default String renderForGeneratedValues(SqlIdentifier identifier) {
 
-		Assert.notNull(identifier, "Indentifier must not be null.");
+		Assert.notNull(identifier, "SqlIdentifier must not be null.");
 
 		return identifier.toSql(IdentifierProcessing.NONE);
 	}

src/main/java/org/springframework/data/r2dbc/dialect/H2Dialect.java

@@ -16,7 +16,7 @@ public class H2Dialect extends PostgresDialect {
 	public static final H2Dialect INSTANCE = new H2Dialect();
 
 	@Override
-	public String renderForGeneratedKeys(SqlIdentifier identifier) {
+	public String renderForGeneratedValues(SqlIdentifier identifier) {
 		return identifier.getReference(getIdentifierProcessing());
 	}
 }

src/main/java/org/springframework/data/r2dbc/dialect/MySqlDialect.java

@@ -106,7 +106,7 @@ public Boolean convert(Byte s) {
 	}
 
 	@Override
-	public String renderForGeneratedKeys(SqlIdentifier identifier) {
+	public String renderForGeneratedValues(SqlIdentifier identifier) {
 		return identifier.getReference(getIdentifierProcessing());
 	}
 

src/main/java/org/springframework/data/r2dbc/dialect/R2dbcDialect.java

@@ -62,14 +62,15 @@ default Collection<Object> getConverters() {
 	}
 
 	/**
-	 * Render a {@link SqlIdentifier} in a way suitable for registering it as a generated key with a statement. The
-	 * default implementation renders it as it would render a SQL representation of the identifier, i.e. with quotes where
-	 * applicable.
+	 * Render a {@link SqlIdentifier} in a way suitable for registering it as a generated key with a statement through
+	 * {@code Statement#returnGeneratedValues}. The default implementation renders it as it would render a SQL
+	 * representation of the identifier, i.e. with quotes where applicable.
 	 *
 	 * @param identifier to render. Must not be {@literal null}.
 	 * @return rendered identifier. Guaranteed to be not {@literal null}.
+	 * @since 1.3.2
 	 */
-	default String renderForGeneratedKeys(SqlIdentifier identifier) {
+	default String renderForGeneratedValues(SqlIdentifier identifier) {
 		return identifier.toSql(getIdentifierProcessing());
 	}
 }

src/test/java/org/springframework/data/r2dbc/repository/H2R2dbcRepositoryWithMixedCaseNamesIntegrationTests.java

@@ -36,7 +36,7 @@
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
- * Integration tests for {@link LegoSetRepository} with table and column names that contain * upper and lower case
+ * Integration tests for {@link LegoSetRepository} with table and column names that contain upper and lower case
  * characters against H2.
  *
  * @author Jens Schauder

src/test/java/org/springframework/data/r2dbc/repository/MariaDbR2dbcRepositoryWithMixedCaseNamesIntegrationTests.java

@@ -38,11 +38,10 @@
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
- * Integration tests for {@link LegoSetRepository} with table and column names that contain * upper and lower case
+ * Integration tests for {@link LegoSetRepository} with table and column names that contain upper and lower case
  * characters against MariaDb.
  *
- * @author Mark Paluch
- * @author Zsombor Gegesy
+ * @author Jens Schauder
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration

src/test/java/org/springframework/data/r2dbc/repository/MySqlR2dbcRepositoryWithMixedCaseNamesIntegrationTests.java

@@ -23,27 +23,26 @@
 
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.RegisterExtension;
+
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
-import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration;
 import org.springframework.data.r2dbc.convert.R2dbcCustomConversions;
 import org.springframework.data.r2dbc.mapping.R2dbcMappingContext;
 import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
-import org.springframework.data.r2dbc.repository.support.R2dbcRepositoryFactory;
 import org.springframework.data.r2dbc.testing.ExternalDatabase;
 import org.springframework.data.r2dbc.testing.MySqlTestSupport;
 import org.springframework.data.relational.core.mapping.NamingStrategy;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
- * Integration tests for {@link LegoSetRepository} with table and column names that contain
- *  * upper and lower case characters against MySql.
+ * Integration tests for {@link LegoSetRepository} with table and column names that contain upper and lower case
+ * characters against MySql.
  *
- * @author Mark Paluch
- * @author Zsombor Gegesy
+ * @author Jens Schauder
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration

src/test/java/org/springframework/data/r2dbc/repository/OracleR2dbcRepositoryWithMixedCaseNamesIntegrationTests.java

@@ -23,6 +23,7 @@
 
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.RegisterExtension;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
@@ -31,16 +32,15 @@
 import org.springframework.data.r2dbc.convert.R2dbcCustomConversions;
 import org.springframework.data.r2dbc.mapping.R2dbcMappingContext;
 import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
-import org.springframework.data.r2dbc.repository.support.R2dbcRepositoryFactory;
 import org.springframework.data.r2dbc.testing.ExternalDatabase;
 import org.springframework.data.r2dbc.testing.OracleTestSupport;
 import org.springframework.data.relational.core.mapping.NamingStrategy;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
- * Integration tests for {@link LegoSetRepository}  with table and column names that contain
- *  * upper and lower case characters against Oracle.
+ * Integration tests for {@link LegoSetRepository} with table and column names that contain upper and lower case
+ * characters against Oracle.
  *
  * @author Jens Schauder
  */

src/test/java/org/springframework/data/r2dbc/repository/PostgresR2dbcRepositoryWithMixedCaseNamesIntegrationTests.java

@@ -23,24 +23,24 @@
 
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.RegisterExtension;
+
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
-import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration;
 import org.springframework.data.r2dbc.convert.R2dbcCustomConversions;
 import org.springframework.data.r2dbc.mapping.R2dbcMappingContext;
 import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
-import org.springframework.data.r2dbc.repository.support.R2dbcRepositoryFactory;
 import org.springframework.data.r2dbc.testing.ExternalDatabase;
 import org.springframework.data.r2dbc.testing.PostgresTestSupport;
 import org.springframework.data.relational.core.mapping.NamingStrategy;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
- * Integration tests for {@link LegoSetRepository} with table and column names that contain
- *  * upper and lower case characters against Postgres.
+ * Integration tests for {@link LegoSetRepository} with table and column names that contain upper and lower case
+ * characters against Postgres.
  *
  * @author Jens Schauder
  */

src/test/java/org/springframework/data/r2dbc/repository/SqlServerR2dbcRepositoryWithMixedCaseNamesIntegrationTests.java

@@ -23,6 +23,7 @@
 
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.RegisterExtension;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
@@ -31,16 +32,15 @@
 import org.springframework.data.r2dbc.convert.R2dbcCustomConversions;
 import org.springframework.data.r2dbc.mapping.R2dbcMappingContext;
 import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
-import org.springframework.data.r2dbc.repository.support.R2dbcRepositoryFactory;
 import org.springframework.data.r2dbc.testing.ExternalDatabase;
 import org.springframework.data.r2dbc.testing.SqlServerTestSupport;
 import org.springframework.data.relational.core.mapping.NamingStrategy;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
- * Integration tests for {@link LegoSetRepository} with table and column names that contain
- *  * upper and lower case characters against SQL-Server.
+ * Integration tests for {@link LegoSetRepository} with table and column names that contain upper and lower case
+ * characters against SQL-Server.
  *
  * @author Jens Schauder
  */

src/test/java/org/springframework/data/r2dbc/testing/ExternalDatabase.java

@@ -222,15 +222,15 @@ boolean checkValidity() {
 		 */
 		@Override
 		public String getHostname() {
-			return "unknown";
+			throw new UnsupportedOperationException(getClass().getSimpleName());
 		}
 
 		/* (non-Javadoc)
 		 * @see org.springframework.data.jdbc.core.function.ExternalDatabase#getPort()
 		 */
 		@Override
 		public int getPort() {
-			return -99999;
+			throw new UnsupportedOperationException(getClass().getSimpleName());
 		}
 
 		/* (non-Javadoc)