Polishing.

Do not expose setForeignKeyNaming methods on NamingStrategy to make less assumptions about how a naming strategy gets implemented. Provide getRequiredLeafEntity method on PersistentPropertyPathExtension to reduce null and state assertion checks.

Refine getTableName/getQualifiedTableName approach to reduce API surface and avoid deprecations.

Author: mp911de

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java

@@ -25,6 +25,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.convert.ConverterNotFoundException;
@@ -37,7 +38,6 @@
 import org.springframework.data.mapping.Parameter;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PersistentPropertyPath;
-import org.springframework.data.mapping.PreferredConstructor;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator;
 import org.springframework.data.mapping.model.ParameterValueProvider;
@@ -52,7 +52,6 @@
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.data.relational.core.sql.IdentifierProcessing;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
@@ -504,9 +503,7 @@ private boolean shouldCreateEmptyEmbeddedInstance(RelationalPersistentProperty p
 
 		private boolean hasInstanceValues(@Nullable Object idValue) {
 
-			RelationalPersistentEntity<?> persistentEntity = path.getLeafEntity();
-
-			Assert.state(persistentEntity != null, "Entity must not be null");
+			RelationalPersistentEntity<?> persistentEntity = path.getRequiredLeafEntity();
 
 			for (RelationalPersistentProperty embeddedProperty : persistentEntity) {
 

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlContext.java

@@ -37,7 +37,7 @@ class SqlContext {
 	SqlContext(RelationalPersistentEntity<?> entity) {
 
 		this.entity = entity;
-		this.table = Table.create(entity.getFullTableName());
+		this.table = Table.create(entity.getQualifiedTableName());
 	}
 
 	Column getIdColumn() {
@@ -55,7 +55,7 @@ Table getTable() {
 	Table getTable(PersistentPropertyPathExtension path) {
 
 		SqlIdentifier tableAlias = path.getTableAlias();
-		Table table = Table.create(path.getTableName());
+		Table table = Table.create(path.getQualifiedTableName());
 		return tableAlias == null ? table : table.as(tableAlias);
 	}