diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java index e4a6d556f99..3adff0e01fb 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/hibernate/LocalSessionFactoryBean.java @@ -247,7 +247,7 @@ public class LocalSessionFactoryBean extends HibernateExceptionTranslator } /** - * Set a Hibernate 5 {@link ImplicitNamingStrategy} for the SessionFactory. + * Set a Hibernate {@link ImplicitNamingStrategy} for the SessionFactory. * @see Configuration#setImplicitNamingStrategy */ public void setImplicitNamingStrategy(ImplicitNamingStrategy implicitNamingStrategy) { @@ -255,7 +255,7 @@ public class LocalSessionFactoryBean extends HibernateExceptionTranslator } /** - * Set a Hibernate 5 {@link PhysicalNamingStrategy} for the SessionFactory. + * Set a Hibernate {@link PhysicalNamingStrategy} for the SessionFactory. * @see Configuration#setPhysicalNamingStrategy */ public void setPhysicalNamingStrategy(PhysicalNamingStrategy physicalNamingStrategy) { diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java index 4ee58cc05e1..7f38f3015cc 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java @@ -60,7 +60,7 @@ class ClassFileTransformerAdapter implements ClassFileTransformer { synchronized (this) { if (this.currentlyTransforming) { // Defensively back out when called from within the transform delegate below: - // in particular, for the over-eager transformer implementation in Hibernate 5. + // in particular, for the over-eager transformer implementation in Hibernate. return null; } diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java index 5a5014f5896..6f61fd9508d 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java @@ -89,7 +89,7 @@ public abstract class AbstractJpaVendorAdapter implements JpaVendorAdapter { *

NOTE: Do not set this flag to 'true' while also setting JPA's * {@code jakarta.persistence.schema-generation.database.action} property. * These two schema generation mechanisms - standard JPA versus provider-native - - * are mutually exclusive, for example, with Hibernate 5. + * are mutually exclusive, for example, with Hibernate. * @see org.springframework.orm.jpa.AbstractEntityManagerFactoryBean#setJpaProperties */ public void setGenerateDdl(boolean generateDdl) { diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/SpringHibernateJpaPersistenceProvider.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/SpringHibernateJpaPersistenceProvider.java index 6c54075e020..ea7b9988fc0 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/SpringHibernateJpaPersistenceProvider.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/SpringHibernateJpaPersistenceProvider.java @@ -45,7 +45,7 @@ import org.springframework.orm.jpa.persistenceunit.SmartPersistenceUnitInfo; class SpringHibernateJpaPersistenceProvider extends HibernatePersistenceProvider { @Override - @SuppressWarnings({"rawtypes", "unchecked"}) // on Hibernate 6 + @SuppressWarnings({"rawtypes", "unchecked"}) public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo info, Map properties) { final List mergedClassesAndPackages = new ArrayList<>(info.getManagedClassNames()); if (info instanceof SmartPersistenceUnitInfo smartInfo) { diff --git a/spring-web/src/main/java/org/springframework/http/StreamingHttpOutputMessage.java b/spring-web/src/main/java/org/springframework/http/StreamingHttpOutputMessage.java index 6a48417728c..df40bb9ea70 100644 --- a/spring-web/src/main/java/org/springframework/http/StreamingHttpOutputMessage.java +++ b/spring-web/src/main/java/org/springframework/http/StreamingHttpOutputMessage.java @@ -57,7 +57,6 @@ public interface StreamingHttpOutputMessage extends HttpOutputMessage { public void writeTo(OutputStream outputStream) throws IOException { StreamUtils.copy(body, outputStream); } - @Override public boolean repeatable() { return true; @@ -66,7 +65,6 @@ public interface StreamingHttpOutputMessage extends HttpOutputMessage { } - /** * Contract to stream request body content to an {@link OutputStream}. * In some HTTP client libraries this is only possible indirectly through a diff --git a/spring-web/src/main/java/org/springframework/http/converter/AbstractGenericHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/AbstractGenericHttpMessageConverter.java index d3897d20afb..a72f1ab1873 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/AbstractGenericHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/AbstractGenericHttpMessageConverter.java @@ -109,14 +109,12 @@ public abstract class AbstractGenericHttpMessageConverter extends AbstractHtt public OutputStream getBody() { return outputStream; } - @Override public HttpHeaders getHeaders() { return headers; } }); } - @Override public boolean repeatable() { return supportsRepeatableWrites(t); diff --git a/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java index 86b730ffaff..00f020e9282 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java @@ -222,7 +222,6 @@ public abstract class AbstractHttpMessageConverter implements HttpMessageConv } }); } - @Override public boolean repeatable() { return supportsRepeatableWrites(t); diff --git a/spring-web/src/main/java/org/springframework/http/converter/AbstractSmartHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/AbstractSmartHttpMessageConverter.java index 4c56204e9a4..798507fa203 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/AbstractSmartHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/AbstractSmartHttpMessageConverter.java @@ -106,7 +106,6 @@ public abstract class AbstractSmartHttpMessageConverter extends AbstractHttpM } }, hints); } - @Override public boolean repeatable() { return supportsRepeatableWrites(t); diff --git a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java index f6cba48bd30..ce0efcdd427 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java @@ -229,7 +229,6 @@ public class BufferedImageHttpMessageConverter implements HttpMessageConverter