Fixed dependency issues between sql.render and dialect.

schauder · schauder · commit f32d152552d8 · 2021-11-29T15:24:25.000+01:00
Moved SelectRenderContext and InsertRenderContext to dialect. Moved RenderContextFactory to render. See #777
diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlGenerator.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlGenerator.java
@@ -21,7 +21,7 @@
 import org.springframework.data.mapping.PersistentPropertyPath;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.relational.core.dialect.Dialect;
-import org.springframework.data.relational.core.dialect.RenderContextFactory;
+import org.springframework.data.relational.core.sql.render.RenderContextFactory;
 import org.springframework.data.relational.core.mapping.PersistentPropertyPathExtension;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/JdbcQueryCreator.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/JdbcQueryCreator.java
@@ -25,7 +25,7 @@
 import org.springframework.data.mapping.PersistentPropertyPath;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.relational.core.dialect.Dialect;
-import org.springframework.data.relational.core.dialect.RenderContextFactory;
+import org.springframework.data.relational.core.sql.render.RenderContextFactory;
 import org.springframework.data.relational.core.mapping.PersistentPropertyPathExtension;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfigurationIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/AbstractJdbcConfigurationIntegrationTests.java
@@ -40,7 +40,7 @@
 import org.springframework.data.relational.core.dialect.Dialect;
 import org.springframework.data.relational.core.dialect.LimitClause;
 import org.springframework.data.relational.core.dialect.LockClause;
-import org.springframework.data.relational.core.sql.render.SelectRenderContext;
+import org.springframework.data.relational.core.dialect.SelectRenderContext;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/AbstractDialect.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/AbstractDialect.java
@@ -21,7 +21,6 @@
 import org.springframework.data.relational.core.sql.LockMode;
 import org.springframework.data.relational.core.sql.LockOptions;
 import org.springframework.data.relational.core.sql.Select;
-import org.springframework.data.relational.core.sql.render.SelectRenderContext;
 
 /**
  * Base class for {@link Dialect} implementations.
@@ -115,7 +114,7 @@ static class DialectSelectRenderContext implements SelectRenderContext {
 
 		/*
 		 * (non-Javadoc)
-		 * @see org.springframework.data.relational.core.sql.render.SelectRenderContext#afterFromTable()
+		 * @see org.springframework.data.relational.core.dialect.SelectRenderContext#afterFromTable()
 		 */
 		@Override
 		public Function<Select, ? extends CharSequence> afterFromTable() {
@@ -124,7 +123,7 @@ static class DialectSelectRenderContext implements SelectRenderContext {
 
 		/*
 		 * (non-Javadoc)
-		 * @see org.springframework.data.relational.core.sql.render.SelectRenderContext#afterOrderBy(boolean)
+		 * @see org.springframework.data.relational.core.dialect.SelectRenderContext#afterOrderBy(boolean)
 		 */
 		@Override
 		public Function<Select, ? extends CharSequence> afterOrderBy(boolean hasOrderBy) {
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/Dialect.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/Dialect.java
@@ -19,10 +19,8 @@
 import java.util.Collections;
 import java.util.Set;
 
-import org.springframework.data.relational.core.mapping.InsertDefaultValues;
 import org.springframework.data.relational.core.sql.IdentifierProcessing;
 import org.springframework.data.relational.core.sql.SqlIdentifier;
-import org.springframework.data.relational.core.sql.render.SelectRenderContext;
 
 /**
  * Represents a dialect that is implemented by a particular database. Please note that not all features are supported by
@@ -113,12 +111,12 @@ default Set<Class<?>> simpleTypes() {
 	}
 
 	/**
-	 * @return an appropriate {@link InsertWithDefaultValues } for that specific dialect.
+	 * @return an appropriate {@link InsertRenderContext} for that specific dialect.
 	 *         for most of the Dialects the default implementation will be valid, but, for
 	 *         example, in case of {@link SqlServerDialect} it is not.
 	 * @since 2.4
 	 */
-	default InsertWithDefaultValues getSqlInsertWithDefaultValues() {
-		return InsertDefaultValues.DEFAULT;
+	default InsertRenderContext getSqlInsertWithDefaultValues() {
+		return InsertRenderContexts.DEFAULT;
 	}
 }
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/InsertRenderContext.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/InsertRenderContext.java
@@ -1,7 +1,7 @@
-package org.springframework.data.relational.core.sql.render;
+package org.springframework.data.relational.core.dialect;
 
-import org.springframework.data.relational.core.mapping.InsertDefaultValues;
 import org.springframework.data.relational.core.sql.Insert;
+import org.springframework.data.relational.core.sql.render.RenderContext;
 
 /**
  * This interface encapsulates the details about how to
@@ -13,5 +13,5 @@
  */
 public interface InsertRenderContext {
 
-    String getInsertDefaultValuesPartSQL();
+    String getDefaultInsertPart();
 }
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/InsertRenderContexts.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/InsertRenderContexts.java
@@ -1,27 +1,24 @@
-package org.springframework.data.relational.core.mapping;
-
-import org.springframework.data.relational.core.dialect.Dialect;
-import org.springframework.data.relational.core.dialect.InsertWithDefaultValues;
+package org.springframework.data.relational.core.dialect;
 
 /**
  * In the scope of Insert with default values SQL statement, for example {@literal INSERT INTO SCHEMA.TABLE VALUES
  * (DEFAULT)} this enum represents the default values part in different {@link Dialect}s
  *
  * @author Mikhail Polivakha
- * @see InsertWithDefaultValues
  * @since 2.4
  */
-public enum InsertDefaultValues implements InsertWithDefaultValues{
+public enum InsertRenderContexts implements InsertRenderContext{
 
 	DEFAULT(" VALUES (DEFAULT)"),
 	MS_SQL_SERVER(" DEFAULT VALUES");
 
 	private final String defaultInsertPart;
 
-	InsertDefaultValues(String defaultInsertPart) {
+	InsertRenderContexts(String defaultInsertPart) {
 		this.defaultInsertPart = defaultInsertPart;
 	}
 
+	@Override
 	public String getDefaultInsertPart() {
 		return defaultInsertPart;
 	}
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/InsertWithDefaultValues.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/InsertWithDefaultValues.java
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/SelectRenderContext.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/SelectRenderContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.relational.core.sql.render;
+package org.springframework.data.relational.core.dialect;
 
 import java.util.OptionalLong;
 import java.util.function.Function;
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/SqlServerDialect.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/SqlServerDialect.java
@@ -15,10 +15,8 @@
  */
 package org.springframework.data.relational.core.dialect;
 
-import org.springframework.data.relational.core.mapping.InsertDefaultValues;
 import org.springframework.data.relational.core.sql.IdentifierProcessing;
 import org.springframework.data.relational.core.sql.LockOptions;
-import org.springframework.data.relational.core.sql.render.SelectRenderContext;
 import org.springframework.data.util.Lazy;
 
 /**
@@ -154,7 +152,7 @@ public IdentifierProcessing getIdentifierProcessing() {
 	}
 
 	@Override
-	public InsertWithDefaultValues getSqlInsertWithDefaultValues() {
-		return InsertDefaultValues.MS_SQL_SERVER;
+	public InsertRenderContext getSqlInsertWithDefaultValues() {
+		return InsertRenderContexts.MS_SQL_SERVER;
 	}
 }
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/SqlServerSelectRenderContext.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/SqlServerSelectRenderContext.java
@@ -18,7 +18,6 @@
 import java.util.function.Function;
 
 import org.springframework.data.relational.core.sql.Select;
-import org.springframework.data.relational.core.sql.render.SelectRenderContext;
 
 /**
  * SQL-Server specific {@link SelectRenderContext}. Summary of SQL-specifics:
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/InsertStatementVisitor.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/InsertStatementVisitor.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.data.relational.core.sql.render;
 
-import org.jetbrains.annotations.NotNull;
 import org.springframework.data.relational.core.sql.Column;
 import org.springframework.data.relational.core.sql.Insert;
 import org.springframework.data.relational.core.sql.Into;
@@ -124,7 +123,7 @@ private void addInsertColumnsIfPresent() {
 	}
 
 	private void addInsertWithDefaultValuesToBuilder() {
-		builder.append(renderContext.getInsertRenderContext().getInsertDefaultValuesPartSQL());
+		builder.append(renderContext.getInsertRenderContext().getDefaultInsertPart());
 	}
 
 	private ColumnVisitor createColumnVisitor(RenderContext context) {
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/RenderContext.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/RenderContext.java
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.relational.core.sql.render;
 
+import org.springframework.data.relational.core.dialect.InsertRenderContext;
+import org.springframework.data.relational.core.dialect.SelectRenderContext;
 import org.springframework.data.relational.core.sql.IdentifierProcessing;
 
 /**
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/RenderContextFactory.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/RenderContextFactory.java
@@ -13,14 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.relational.core.dialect;
+package org.springframework.data.relational.core.sql.render;
 
+import org.springframework.data.relational.core.dialect.Dialect;
+import org.springframework.data.relational.core.dialect.InsertRenderContext;
+import org.springframework.data.relational.core.dialect.SelectRenderContext;
 import org.springframework.data.relational.core.sql.IdentifierProcessing;
-import org.springframework.data.relational.core.sql.render.InsertRenderContext;
-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.util.Assert;
 
 /**
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/SelectStatementVisitor.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/SelectStatementVisitor.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.relational.core.sql.render;
 
+import org.springframework.data.relational.core.dialect.SelectRenderContext;
 import org.springframework.data.relational.core.sql.From;
 import org.springframework.data.relational.core.sql.Join;
 import org.springframework.data.relational.core.sql.OrderByField;
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/SimpleRenderContext.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/SimpleRenderContext.java
@@ -15,7 +15,9 @@
  */
 package org.springframework.data.relational.core.sql.render;
 
-import org.springframework.data.relational.core.mapping.InsertDefaultValues;
+import org.springframework.data.relational.core.dialect.InsertRenderContext;
+import org.springframework.data.relational.core.dialect.InsertRenderContexts;
+import org.springframework.data.relational.core.dialect.SelectRenderContext;
 import org.springframework.data.relational.core.sql.IdentifierProcessing;
 
 /**
@@ -49,7 +51,7 @@ public SelectRenderContext getSelectRenderContext() {
 
 	@Override
 	public InsertRenderContext getInsertRenderContext() {
-		return InsertDefaultValues.DEFAULT::getDefaultInsertPart;
+		return InsertRenderContexts.DEFAULT::getDefaultInsertPart;
 	}
 
 	public RenderNamingStrategy getNamingStrategy() {
diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/MySqlDialectRenderingUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/MySqlDialectRenderingUnitTests.java
@@ -25,6 +25,7 @@
 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.RenderContextFactory;
 import org.springframework.data.relational.core.sql.render.SqlRenderer;
 
 /**
diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/PostgresDialectRenderingUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/PostgresDialectRenderingUnitTests.java
@@ -25,6 +25,7 @@
 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.RenderContextFactory;
 import org.springframework.data.relational.core.sql.render.SqlRenderer;
 
 /**
diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectRenderingUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectRenderingUnitTests.java
@@ -25,6 +25,7 @@
 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.RenderContextFactory;
 import org.springframework.data.relational.core.sql.render.SqlRenderer;
 
 /**
diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/render/SelectRendererUnitTests.java
@@ -19,7 +19,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.data.relational.core.dialect.PostgresDialect;
-import org.springframework.data.relational.core.dialect.RenderContextFactory;
 import org.springframework.data.relational.core.sql.*;
 import org.springframework.util.StringUtils;
 

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,8 @@`
`15`	`15`	`*/`
`16`	`16`	`package org.springframework.data.relational.core.dialect;`
`17`	`17`
`18`		`-import org.springframework.data.relational.core.mapping.InsertDefaultValues;`
`19`	`18`	`import org.springframework.data.relational.core.sql.IdentifierProcessing;`
`20`	`19`	`import org.springframework.data.relational.core.sql.LockOptions;`
`21`		`-import org.springframework.data.relational.core.sql.render.SelectRenderContext;`
`22`	`20`	`import org.springframework.data.util.Lazy;`
`23`	`21`
`24`	`22`	`/**`
`@@ -154,7 +152,7 @@ public IdentifierProcessing getIdentifierProcessing() {`
`154`	`152`	`}`
`155`	`153`
`156`	`154`	`@Override`
`157`		`- public InsertWithDefaultValues getSqlInsertWithDefaultValues() {`
`158`		`- return InsertDefaultValues.MS_SQL_SERVER;`
	`155`	`+ public InsertRenderContext getSqlInsertWithDefaultValues() {`
	`156`	`+ return InsertRenderContexts.MS_SQL_SERVER;`
`159`	`157`	`}`
`160`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`*/`
`16`	`16`	`package org.springframework.data.relational.core.sql.render;`
`17`	`17`
`18`		`-import org.jetbrains.annotations.NotNull;`
`19`	`18`	`import org.springframework.data.relational.core.sql.Column;`
`20`	`19`	`import org.springframework.data.relational.core.sql.Insert;`
`21`	`20`	`import org.springframework.data.relational.core.sql.Into;`
`@@ -124,7 +123,7 @@ private void addInsertColumnsIfPresent() {`
`124`	`123`	`}`
`125`	`124`
`126`	`125`	`private void addInsertWithDefaultValuesToBuilder() {`
`127`		`- builder.append(renderContext.getInsertRenderContext().getInsertDefaultValuesPartSQL());`
	`126`	`+ builder.append(renderContext.getInsertRenderContext().getDefaultInsertPart());`
`128`	`127`	`}`
`129`	`128`
`130`	`129`	`private ColumnVisitor createColumnVisitor(RenderContext context) {`