DATAJDBC-340 - Polishing.

Encapsulate column caches in Columns type.

Relax RelationalMappingContext to MappingContext with appropriate generics. Remove unused SQL generator source. Cache table and Id column objects. Simplify assertions. Consistently use naming pattern for named parameters.

Migrate http URLs to https.

Original pull request: #147.

Author: mp911de

mvnw

@@ -8,7 +8,7 @@
 # "License"); 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

mvnw.cmd

@@ -7,7 +7,7 @@
 @REM "License"); you may not use this file except in compliance
 @REM with the License.  You may obtain a copy of the License at
 @REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM    https://www.apache.org/licenses/LICENSE-2.0
 @REM
 @REM Unless required by applicable law or agreed to in writing,
 @REM software distributed under the License is distributed on an
@@ -122,7 +122,7 @@ set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
 set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
 FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
-	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B 
+	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
 )
 
 @REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/PersistentPropertyPathExtension.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,
@@ -15,10 +15,8 @@
  */
 package org.springframework.data.jdbc.core;
 
-import java.util.Objects;
-
 import org.springframework.data.mapping.PersistentPropertyPath;
-import org.springframework.data.relational.core.mapping.RelationalMappingContext;
+import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.lang.Nullable;
@@ -34,10 +32,11 @@
 class PersistentPropertyPathExtension {
 
 	private final RelationalPersistentEntity<?> entity;
-	private final PersistentPropertyPath<RelationalPersistentProperty> path;
-	private final RelationalMappingContext context;
+	private final @Nullable PersistentPropertyPath<RelationalPersistentProperty> path;
+	private final MappingContext<RelationalPersistentEntity<?>, RelationalPersistentProperty> context;
 
-	PersistentPropertyPathExtension(RelationalMappingContext context, RelationalPersistentEntity<?> entity) {
+	PersistentPropertyPathExtension(MappingContext<RelationalPersistentEntity<?>, RelationalPersistentProperty> context,
+			RelationalPersistentEntity<?> entity) {
 
 		Assert.notNull(context, "Context must not be null.");
 		Assert.notNull(entity, "Entity must not be null.");
@@ -47,15 +46,15 @@ class PersistentPropertyPathExtension {
 		this.path = null;
 	}
 
-	PersistentPropertyPathExtension(RelationalMappingContext context,
+	PersistentPropertyPathExtension(MappingContext<RelationalPersistentEntity<?>, RelationalPersistentProperty> context,
 			PersistentPropertyPath<RelationalPersistentProperty> path) {
 
 		Assert.notNull(context, "Context must not be null.");
 		Assert.notNull(path, "Path must not be null.");
-		Assert.isTrue(!path.isEmpty(), "Path must not be empty.");
+		Assert.notNull(path.getBaseProperty(), "Path must not be empty.");
 
 		this.context = context;
-		this.entity = Objects.requireNonNull(path.getBaseProperty()).getOwner();
+		this.entity = path.getBaseProperty().getOwner();
 		this.path = path;
 	}
 
@@ -140,6 +139,8 @@ boolean isCollectionLike() {
 	 */
 	String getReverseColumnName() {
 
+		Assert.state(path != null, "Path is null");
+
 		return path.getRequiredLeafProperty().getReverseColumnName();
 	}
 
@@ -160,6 +161,8 @@ String getReverseColumnNameAlias() {
 	 */
 	String getColumnName() {
 
+		Assert.state(path != null, "Path is null");
+
 		return assembleColumnName(path.getRequiredLeafProperty().getColumnName());
 	}
 
@@ -212,11 +215,9 @@ String getTableName() {
 	String getTableAlias() {
 
 		PersistentPropertyPathExtension tableOwner = getTableOwningAncestor();
-		if (tableOwner.path == null) {
-			return null;
-		}
 
-		return tableOwner.assembleTableAlias();
+		return tableOwner.path == null ? null : tableOwner.assembleTableAlias();
+
 	}
 
 	/**
@@ -251,14 +252,13 @@ int getLength() {
 	 */
 	private PersistentPropertyPathExtension getTableOwningAncestor() {
 
-		if (isEntity() && !isEmbedded()) {
-			return this;
-		}
-		return getParentPath().getTableOwningAncestor();
+		return isEntity() && !isEmbedded() ? this : getParentPath().getTableOwningAncestor();
 	}
 
 	private String assembleTableAlias() {
 
+		Assert.state(path != null, "Path is null");
+
 		RelationalPersistentProperty leafProperty = path.getRequiredLeafProperty();
 		String prefix = isEmbedded() ? leafProperty.getEmbeddedPrefix() : leafProperty.getName();
 
@@ -274,6 +274,8 @@ private String assembleTableAlias() {
 
 	private String assembleColumnName(String suffix) {
 
+		Assert.state(path != null, "Path is null");
+
 		if (path.getLength() <= 1) {
 			return suffix;
 		}
@@ -286,11 +288,11 @@ private String assembleColumnName(String suffix) {
 		return getParentPath().assembleColumnName(embeddedPrefix + suffix);
 	}
 
+	@SuppressWarnings("unchecked")
 	private RelationalPersistentEntity<?> getRequiredLeafEntity() {
 		return path == null ? entity : context.getRequiredPersistentEntity(path.getRequiredLeafProperty().getActualType());
 	}
 
-
 	private String prefixWithTableAlias(String columnName) {
 
 		String tableAlias = getTableAlias();

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/SqlContext.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,
@@ -24,18 +24,25 @@
  * Utility to get from path to SQL DSL elements.
  *
  * @author Jens Schauder
+ * @author Mark Paluch
  * @since 1.1
  */
 class SqlContext {
 
 	private final RelationalPersistentEntity<?> entity;
+	private final Table table;
 
 	SqlContext(RelationalPersistentEntity<?> entity) {
 		this.entity = entity;
+		this.table = SQL.table(entity.getTableName());
 	}
 
 	Column getIdColumn() {
-		return getTable().column(entity.getIdColumn());
+		return table.column(entity.getIdColumn());
+	}
+
+	Table getTable() {
+		return table;
 	}
 
 	Table getTable(PersistentPropertyPathExtension path) {
@@ -45,10 +52,6 @@ Table getTable(PersistentPropertyPathExtension path) {
 		return tableAlias == null ? table : table.as(tableAlias);
 	}
 
-	Table getTable() {
-		return SQL.table(entity.getTableName());
-	}
-
 	Column getColumn(PersistentPropertyPathExtension path) {
 		return getTable(path).column(path.getColumnName()).as(path.getColumnAlias());
 	}