From da9e8f6f1b7034c5ad2657e05fe53d08aac4c20f Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Wed, 10 Aug 2022 14:49:34 +0200 Subject: [PATCH 1/2] remove-deprecation - Prepare branch --- pom.xml | 2 +- spring-data-jdbc-distribution/pom.xml | 2 +- spring-data-jdbc/pom.xml | 4 ++-- spring-data-r2dbc/pom.xml | 4 ++-- spring-data-relational/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index b2d4b1d1ae..08124fe379 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-relational-parent - 3.0.0-SNAPSHOT + 3.0.0-remove-deprecation-SNAPSHOT pom Spring Data Relational Parent diff --git a/spring-data-jdbc-distribution/pom.xml b/spring-data-jdbc-distribution/pom.xml index db3b7ddd1a..9adcf65f09 100644 --- a/spring-data-jdbc-distribution/pom.xml +++ b/spring-data-jdbc-distribution/pom.xml @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 3.0.0-SNAPSHOT + 3.0.0-remove-deprecation-SNAPSHOT ../pom.xml diff --git a/spring-data-jdbc/pom.xml b/spring-data-jdbc/pom.xml index 547ff62b8b..100f71358b 100644 --- a/spring-data-jdbc/pom.xml +++ b/spring-data-jdbc/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-jdbc - 3.0.0-SNAPSHOT + 3.0.0-remove-deprecation-SNAPSHOT Spring Data JDBC Spring Data module for JDBC repositories. @@ -15,7 +15,7 @@ org.springframework.data spring-data-relational-parent - 3.0.0-SNAPSHOT + 3.0.0-remove-deprecation-SNAPSHOT diff --git a/spring-data-r2dbc/pom.xml b/spring-data-r2dbc/pom.xml index e263db3097..9d1178b23d 100644 --- a/spring-data-r2dbc/pom.xml +++ b/spring-data-r2dbc/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-r2dbc - 3.0.0-SNAPSHOT + 3.0.0-remove-deprecation-SNAPSHOT Spring Data R2DBC Spring Data module for R2DBC @@ -15,7 +15,7 @@ org.springframework.data spring-data-relational-parent - 3.0.0-SNAPSHOT + 3.0.0-remove-deprecation-SNAPSHOT diff --git a/spring-data-relational/pom.xml b/spring-data-relational/pom.xml index 717ac86edf..553e40e030 100644 --- a/spring-data-relational/pom.xml +++ b/spring-data-relational/pom.xml @@ -6,7 +6,7 @@ 4.0.0 spring-data-relational - 3.0.0-SNAPSHOT + 3.0.0-remove-deprecation-SNAPSHOT Spring Data Relational Spring Data Relational support @@ -14,7 +14,7 @@ org.springframework.data spring-data-relational-parent - 3.0.0-SNAPSHOT + 3.0.0-remove-deprecation-SNAPSHOT From 573eebdcf33db02ae08c82bf7e98daa27f44437e Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Wed, 10 Aug 2022 14:52:10 +0200 Subject: [PATCH 2/2] Remove deprecated code. This removes most currently deprecated code. An exception are various deprecations in Spring Data R2DBC for which it is not obvious how to modify the code that is still using the deprecated API. Original pull request #1304 --- .../jdbc/core/convert/BasicJdbcConverter.java | 12 --- .../convert/CascadingDataAccessStrategy.java | 5 -- .../jdbc/core/convert/DataAccessStrategy.java | 18 ----- .../convert/DefaultDataAccessStrategy.java | 7 -- .../convert/DelegatingDataAccessStrategy.java | 5 -- .../data/jdbc/core/convert/JdbcConverter.java | 17 +---- .../mapping/BasicJdbcPersistentProperty.java | 22 +----- .../mybatis/MyBatisDataAccessStrategy.java | 9 --- .../config/MyBatisJdbcConfiguration.java | 1 - .../data/jdbc/support/JdbcUtil.java | 66 ---------------- .../model/NamingStrategyUnitTests.java | 6 -- .../core/dialect/RenderContextFactory.java | 6 +- .../BasicRelationalPersistentProperty.java | 5 -- .../core/mapping/CachingNamingStrategy.java | 7 +- .../core/mapping/NamingStrategy.java | 11 --- .../mapping/RelationalPersistentProperty.java | 11 +-- .../mapping/event/BeforeConvertEvent.java | 16 +--- .../relational/core/sql/SimpleCondition.java | 76 ------------------- .../core/sql/render/RenderContext.java | 12 +-- .../core/sql/render/SimpleRenderContext.java | 8 +- .../core/mapping/NamingStrategyUnitTests.java | 15 ---- 21 files changed, 13 insertions(+), 322 deletions(-) delete mode 100644 spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/SimpleCondition.java diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java index f672356627..40883af14d 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java @@ -167,12 +167,6 @@ public SQLType getTargetSqlType(RelationalPersistentProperty property) { return JdbcUtil.targetSqlTypeFor(getColumnType(property)); } - @Override - @Deprecated - public int getSqlType(RelationalPersistentProperty property) { - return JdbcUtil.sqlTypeFor(getColumnType(property)); - } - @Override public Class getColumnType(RelationalPersistentProperty property) { return doGetColumnType(property); @@ -261,12 +255,6 @@ private boolean canWriteAsJdbcValue(@Nullable Object value) { return customWriteTarget.isPresent() && customWriteTarget.get().isAssignableFrom(JdbcValue.class); } - @Override - @Deprecated - public JdbcValue writeJdbcValue(@Nullable Object value, Class columnType, int sqlType) { - return writeJdbcValue(value, columnType, JdbcUtil.jdbcTypeFor(sqlType)); - } - /* * (non-Javadoc) * @see org.springframework.data.jdbc.core.convert.JdbcConverter#writeValue(java.lang.Object, java.lang.Class, int) diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/CascadingDataAccessStrategy.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/CascadingDataAccessStrategy.java index 6fd9c8b9fa..43d6f41e41 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/CascadingDataAccessStrategy.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/CascadingDataAccessStrategy.java @@ -52,11 +52,6 @@ public CascadingDataAccessStrategy(List strategies) { this.strategies = new ArrayList<>(strategies); } - @Override - public Object insert(T instance, Class domainType, Identifier identifier) { - return collect(das -> das.insert(instance, domainType, identifier)); - } - @Override public Object insert(T instance, Class domainType, Identifier identifier, IdValueSource idValueSource) { return collect(das -> das.insert(instance, domainType, identifier, idValueSource)); diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DataAccessStrategy.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DataAccessStrategy.java index 9f534e6fa8..927ab4136a 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DataAccessStrategy.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DataAccessStrategy.java @@ -44,24 +44,6 @@ */ public interface DataAccessStrategy extends RelationResolver { - /** - * Inserts the data of a single entity. Referenced entities don't get handled. - * - * @param the type of the instance. - * @param instance the instance to be stored. Must not be {@code null}. - * @param domainType the type of the instance. Must not be {@code null}. - * @param identifier information about data that needs to be considered for the insert but which is not part of the - * entity. Namely, references back to a parent entity and key/index columns for entities that are stored in a - * {@link Map} or {@link List}. - * @return the id generated by the database if any. - * @since 1.1 - * @deprecated since 2.4, use {@link #insert(Object, Class, Identifier, IdValueSource)}. This will no longer insert as - * expected when the id property of the instance is pre-populated. - */ - @Nullable - @Deprecated - Object insert(T instance, Class domainType, Identifier identifier); - /** * Inserts the data of a single entity. Referenced entities don't get handled. * diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java index 6101ccf6fa..fce64c689d 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java @@ -98,13 +98,6 @@ public DefaultDataAccessStrategy(SqlGeneratorSource sqlGeneratorSource, Relation this.insertStrategyFactory = insertStrategyFactory; } - @Override - public Object insert(T instance, Class domainType, Identifier identifier) { - - RelationalPersistentEntity persistentEntity = context.getRequiredPersistentEntity(domainType); - return insert(instance, domainType, identifier, IdValueSource.forInstance(instance, persistentEntity)); - } - @Override public Object insert(T instance, Class domainType, Identifier identifier, IdValueSource idValueSource) { diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DelegatingDataAccessStrategy.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DelegatingDataAccessStrategy.java index bdbba665a2..f116ed2e74 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DelegatingDataAccessStrategy.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DelegatingDataAccessStrategy.java @@ -43,11 +43,6 @@ public class DelegatingDataAccessStrategy implements DataAccessStrategy { private DataAccessStrategy delegate; - @Override - public Object insert(T instance, Class domainType, Identifier identifier) { - return delegate.insert(instance, domainType, identifier); - } - @Override public Object insert(T instance, Class domainType, Identifier identifier, IdValueSource idValueSource) { return delegate.insert(instance, domainType, identifier, idValueSource); diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcConverter.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcConverter.java index 6f4f1635ad..f79d3154c6 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcConverter.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/JdbcConverter.java @@ -1,4 +1,4 @@ -/* + /* * Copyright 2019-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -35,17 +35,6 @@ */ public interface JdbcConverter extends RelationalConverter { - /** - * Convert a property value into a {@link JdbcValue} that contains the converted value and information how to bind it - * to JDBC parameters. - * - * @param value a value as it is used in the object model. May be {@code null}. - * @param type {@literal Class} into which the value is to be converted. Must not be {@code null}. - * @param sqlType the type constant from {@link java.sql.Types} to be used if non is specified by a converter. - * @return The converted value wrapped in a {@link JdbcValue}. Guaranteed to be not {@literal null}. - */ - JdbcValue writeJdbcValue(@Nullable Object value, Class type, int sqlType); - /** * Convert a property value into a {@link JdbcValue} that contains the converted value and information how to bind it * to JDBC parameters. @@ -99,8 +88,4 @@ public interface JdbcConverter extends RelationalConverter { * @since 2.0 */ SQLType getTargetSqlType(RelationalPersistentProperty property); - - @Deprecated - int getSqlType(RelationalPersistentProperty property); - } diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentProperty.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentProperty.java index 521fdcd58a..c1c9bce64d 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentProperty.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/mapping/BasicJdbcPersistentProperty.java @@ -27,25 +27,10 @@ * Extension to {@link BasicRelationalPersistentProperty}. * * @author Mark Paluch + * @author Jens Schauder */ public class BasicJdbcPersistentProperty extends BasicRelationalPersistentProperty { - /** - * Creates a new {@link BasicJdbcPersistentProperty}. - * - * @param property must not be {@literal null}. - * @param owner must not be {@literal null}. - * @param simpleTypeHolder must not be {@literal null}. - * @param context must not be {@literal null} - * @deprecated since 2.0, use - * {@link #BasicJdbcPersistentProperty(Property, PersistentEntity, SimpleTypeHolder, NamingStrategy)}. - */ - @Deprecated - public BasicJdbcPersistentProperty(Property property, PersistentEntity owner, - SimpleTypeHolder simpleTypeHolder, RelationalMappingContext context) { - super(property, owner, simpleTypeHolder, context); - } - /** * Creates a new {@link BasicJdbcPersistentProperty}. * @@ -64,9 +49,4 @@ public BasicJdbcPersistentProperty(Property property, PersistentEntity Object insert(T instance, Class domainType, Identifier identifier) { - - MyBatisContext myBatisContext = new MyBatisContext(identifier, instance, domainType); - sqlSession().insert(namespace(domainType) + ".insert", myBatisContext); - - return myBatisContext.getId(); - } - @Override public Object insert(T instance, Class domainType, Identifier identifier, IdValueSource idValueSource) { diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/MyBatisJdbcConfiguration.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/MyBatisJdbcConfiguration.java index 8efc3f65b1..e27f96314d 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/MyBatisJdbcConfiguration.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/MyBatisJdbcConfiguration.java @@ -24,7 +24,6 @@ import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.jdbc.mybatis.MyBatisDataAccessStrategy; import org.springframework.data.relational.core.dialect.Dialect; -import org.springframework.data.relational.core.mapping.RelationalMappingContext; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; /** diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/support/JdbcUtil.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/support/JdbcUtil.java index 15a81b7ec6..447906dbe2 100644 --- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/support/JdbcUtil.java +++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/support/JdbcUtil.java @@ -87,27 +87,6 @@ private JdbcUtil() { throw new UnsupportedOperationException("This is a utility class and cannot be instantiated"); } - /** - * Returns the {@link Types} value suitable for passing a value of the provided type to a - * {@link java.sql.PreparedStatement}. - * - * @param type The type of value to be bound to a {@link java.sql.PreparedStatement}. - * @return One of the values defined in {@link Types} or {@link JdbcUtils#TYPE_UNKNOWN}. - * @deprecated use {@link #targetSqlTypeFor(Class)} instead. - */ - @Deprecated - public static int sqlTypeFor(Class type) { - - Assert.notNull(type, "Type must not be null"); - - return sqlTypeMappings.keySet().stream() // - .filter(k -> k.isAssignableFrom(type)) // - .findFirst() // - .map(sqlTypeMappings::get) // - .map(SQLType::getVendorTypeNumber) - .orElse(JdbcUtils.TYPE_UNKNOWN); - } - /** * Returns the {@link SQLType} value suitable for passing a value of the provided type to JDBC driver. * @@ -124,49 +103,4 @@ public static SQLType targetSqlTypeFor(Class type) { .map(sqlTypeMappings::get) // .orElse(JdbcUtil.TYPE_UNKNOWN); } - - /** - * Converts a {@link JDBCType} to an {@code int} value as defined in {@link Types}. - * - * @param jdbcType value to be converted. May be {@literal null}. - * @return One of the values defined in {@link Types} or {@link JdbcUtils#TYPE_UNKNOWN}. - * @deprecated there is no replacement. - */ - @Deprecated - public static int sqlTypeFor(@Nullable SQLType jdbcType) { - return jdbcType == null ? JdbcUtils.TYPE_UNKNOWN : jdbcType.getVendorTypeNumber(); - } - - /** - * Converts a value defined in {@link Types} into a {@link JDBCType} instance or {@literal null} if the value is - * {@link JdbcUtils#TYPE_UNKNOWN} - * - * @param sqlType One of the values defined in {@link Types} or {@link JdbcUtils#TYPE_UNKNOWN}. - * @return a matching {@link JDBCType} instance or {@literal null}. - * @deprecated This is now a noop - */ - @Nullable - @Deprecated - public static SQLType jdbcTypeFor(int sqlType) { - - if (sqlType == JdbcUtils.TYPE_UNKNOWN) { - return null; - } - - return JDBCType.valueOf(sqlType); - } - - /** - * Returns the {@link JDBCType} suitable for passing a value of the provided type to a - * {@link java.sql.PreparedStatement}. - * - * @param type The type of value to be bound to a {@link java.sql.PreparedStatement}. - * @return a matching {@link JDBCType} instance or {@literal null}. - * @deprecated Use {@link #targetSqlTypeFor(Class)} instead. - */ - @Deprecated - public static SQLType jdbcTypeFor(Class type) { - - return targetSqlTypeFor(type); - } } diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java index 9f8c04ac81..42abc54061 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java @@ -77,12 +77,6 @@ public void getSchema() { assertThat(target.getSchema()).isEqualTo(""); } - @Test // DATAJDBC-184 - public void getQualifiedTableName() { - - assertThat(target.getQualifiedTableName(persistentEntity.getType())).isEqualTo("dummy_entity"); - } - @Data private static class DummyEntity { diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/RenderContextFactory.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/RenderContextFactory.java index bffaa647a6..2add56fda0 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/RenderContextFactory.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/dialect/RenderContextFactory.java @@ -27,6 +27,7 @@ * * @author Mark Paluch * @author Mikhail Polivakha + * @author Jens Schauder * @since 1.1 */ public class RenderContextFactory { @@ -106,11 +107,6 @@ public IdentifierProcessing getIdentifierProcessing() { return renderingDialect.getIdentifierProcessing(); } - @Override - public SelectRenderContext getSelect() { - return getSelectRenderContext(); - } - @Override public SelectRenderContext getSelectRenderContext() { return selectRenderContext; diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java index fd1421f15c..6dbfc5d817 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java @@ -136,11 +136,6 @@ public boolean isEntity() { return super.isEntity() && !isAssociation(); } - @Override - public boolean isReference() { - return false; - } - @Override public SqlIdentifier getColumnName() { return columnName.get(); diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/CachingNamingStrategy.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/CachingNamingStrategy.java index 32daeb11f6..3a9837ea3c 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/CachingNamingStrategy.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/CachingNamingStrategy.java @@ -26,6 +26,7 @@ * A {@link NamingStrategy} to cache the results of the target one. * * @author Oliver Drotbohm + * @author Jens Schauder * @since 1.1 */ class CachingNamingStrategy implements NamingStrategy { @@ -57,12 +58,6 @@ public String getKeyColumn(RelationalPersistentProperty property) { return keyColumns.computeIfAbsent(property, delegate::getKeyColumn); } - @Override - @Deprecated - public String getQualifiedTableName(Class type) { - return qualifiedTableNames.computeIfAbsent(type, delegate::getQualifiedTableName); - } - @Override public String getTableName(Class type) { return tableNames.computeIfAbsent(type, delegate::getTableName); diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java index bf57868dff..bc1fdaeabc 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java @@ -72,17 +72,6 @@ default String getColumnName(RelationalPersistentProperty property) { return ParsingUtils.reconcatenateCamelCase(property.getName(), "_"); } - /** - * @param type - * @return - * @deprecated since 2.0. The method returns a concatenated schema with table name which conflicts with escaping. Use - * rather {@link #getTableName(Class)} and {@link #getSchema()} independently - */ - @Deprecated - default String getQualifiedTableName(Class type) { - return this.getSchema() + (this.getSchema().equals("") ? "" : ".") + this.getTableName(type); - } - /** * For a reference A -> B this is the name in the table for B which references A. * diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalPersistentProperty.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalPersistentProperty.java index 4965aba947..e8fe3b5d2a 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalPersistentProperty.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/RelationalPersistentProperty.java @@ -28,13 +28,6 @@ */ public interface RelationalPersistentProperty extends PersistentProperty { - /** - * @deprecated since 2.2, in favor of {@link #isAssociation()} - * @return - */ - @Deprecated - boolean isReference(); - /** * Returns the name of the column backing this property. * @@ -68,7 +61,7 @@ public interface RelationalPersistentProperty extends PersistentProperty extends RelationalEventWithEntity { + @Serial private static final long serialVersionUID = -5716795164911939224L; /** @@ -52,17 +55,4 @@ public class BeforeConvertEvent extends RelationalEventWithEntity { public BeforeConvertEvent(E instance) { super(instance); } - - /** - * @param instance the saved entity. Must not be {@literal null}. - * @param change the {@link AggregateChange} encoding the actions to be performed on the database as change. Since - * this event is fired before the conversion the change is actually empty, but contains information if the - * aggregate is considered new in {@link AggregateChange#getKind()}. Must not be {@literal null}. - * @deprecated since 2.1.4, use {@link #BeforeConvertEvent(Object)} as we don't expect an {@link AggregateChange} - * before converting an aggregate. - */ - @Deprecated - public BeforeConvertEvent(E instance, AggregateChange change) { - super(instance); - } } diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/SimpleCondition.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/SimpleCondition.java deleted file mode 100644 index 799fcbea3f..0000000000 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/SimpleCondition.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright 2019-2022 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.data.relational.core.sql; - -/** - * Simple condition consisting of {@link Expression}, {@code comparator} and {@code predicate}. - * - * @author Mark Paluch - * @since 1.1 - * @deprecated since 2.2.5 use {@link Comparison} instead. - */ -@Deprecated -public class SimpleCondition extends AbstractSegment implements Condition { - - private final Expression expression; - - private final String comparator; - - private final String predicate; - - SimpleCondition(Expression expression, String comparator, String predicate) { - - super(expression); - - this.expression = expression; - this.comparator = comparator; - this.predicate = predicate; - } - - /** - * Creates a simple {@link Condition} given {@code column}, {@code comparator} and {@code predicate}. - */ - public static SimpleCondition create(String column, String comparator, String predicate) { - return new SimpleCondition(new Column(column, null), comparator, predicate); - } - - /** - * @return the condition expression (left-hand-side) - * @since 2.0 - */ - public Expression getExpression() { - return expression; - } - - /** - * @return the comparator. - */ - public String getComparator() { - return comparator; - } - - /** - * @return the condition predicate (right-hand-side) - */ - public String getPredicate() { - return predicate; - } - - @Override - public String toString() { - return expression + " " + comparator + " " + predicate; - } -} 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 index 6cfc47731e..2bb6adf491 100644 --- 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 @@ -23,6 +23,7 @@ * * @author Mark Paluch * @author Mikhail Polivakha + * @author Jens Schauder * @since 1.1 */ public interface RenderContext { @@ -44,17 +45,8 @@ public interface RenderContext { /** * @return the {@link SelectRenderContext}. - * @deprecated Use {@link #getInsertRenderContext()} instead. */ - @Deprecated - SelectRenderContext getSelect(); - - /** - * @return the {@link SelectRenderContext}. - */ - default SelectRenderContext getSelectRenderContext() { - return getSelect(); - } + SelectRenderContext getSelectRenderContext(); /** * @return the {@link InsertRenderContext} 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 index 42dd319c0c..ebe6c1be79 100644 --- 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 @@ -23,6 +23,7 @@ * Default {@link RenderContext} implementation. * * @author Mark Paluch + * @author Jens Schauder * @since 1.1 */ final class SimpleRenderContext implements RenderContext { @@ -38,11 +39,6 @@ public IdentifierProcessing getIdentifierProcessing() { return IdentifierProcessing.NONE; } - @Override - public SelectRenderContext getSelect() { - return getSelectRenderContext(); - } - @Override public SelectRenderContext getSelectRenderContext() { return DefaultSelectRenderContext.INSTANCE; @@ -64,7 +60,7 @@ public String toString() { } enum DefaultSelectRenderContext implements SelectRenderContext { - INSTANCE; + INSTANCE } } diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/NamingStrategyUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/NamingStrategyUnitTests.java index 0f1b6ae015..e38c7545ec 100644 --- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/NamingStrategyUnitTests.java +++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/mapping/NamingStrategyUnitTests.java @@ -72,21 +72,6 @@ public void getSchema() { assertThat(target.getSchema()).isEqualTo(""); } - @Test - public void getQualifiedTableName() { - - assertThat(target.getQualifiedTableName(persistentEntity.getType())).isEqualTo("dummy_entity"); - - NamingStrategy strategy = new NamingStrategy() { - @Override - public String getSchema() { - return "schema"; - } - }; - - assertThat(strategy.getQualifiedTableName(persistentEntity.getType())).isEqualTo("schema.dummy_entity"); - } - static class DummyEntity { @Id int id;