Browse Source

Suppress warnings

pull/30619/head
Sam Brannen 3 years ago
parent
commit
4f10f559f7
  1. 1
      spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
  2. 8
      spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java

1
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java

@ -131,6 +131,7 @@ public class AutowiredAnnotationBeanPostProcessorTests {
} }
@Test @Test
@SuppressWarnings("rawtypes")
void resourceInjectionWithNullBean() { void resourceInjectionWithNullBean() {
RootBeanDefinition bd = new RootBeanDefinition(NonPublicResourceInjectionBean.class); RootBeanDefinition bd = new RootBeanDefinition(NonPublicResourceInjectionBean.class);
bd.setScope(BeanDefinition.SCOPE_PROTOTYPE); bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);

8
spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java vendored

@ -28,7 +28,6 @@ import org.hibernate.Session;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.AvailableSettings;
import org.hibernate.dialect.DB2Dialect; import org.hibernate.dialect.DB2Dialect;
import org.hibernate.dialect.DerbyDialect;
import org.hibernate.dialect.DerbyTenSevenDialect; import org.hibernate.dialect.DerbyTenSevenDialect;
import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.H2Dialect;
import org.hibernate.dialect.HANAColumnStoreDialect; import org.hibernate.dialect.HANAColumnStoreDialect;
@ -37,7 +36,6 @@ import org.hibernate.dialect.Informix10Dialect;
import org.hibernate.dialect.MySQL57Dialect; import org.hibernate.dialect.MySQL57Dialect;
import org.hibernate.dialect.Oracle12cDialect; import org.hibernate.dialect.Oracle12cDialect;
import org.hibernate.dialect.PostgreSQL95Dialect; import org.hibernate.dialect.PostgreSQL95Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.SQLServer2012Dialect; import org.hibernate.dialect.SQLServer2012Dialect;
import org.hibernate.dialect.SybaseDialect; import org.hibernate.dialect.SybaseDialect;
import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
@ -176,7 +174,7 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter {
* @param database the target database * @param database the target database
* @return the Hibernate database dialect class, or {@code null} if none found * @return the Hibernate database dialect class, or {@code null} if none found
*/ */
@SuppressWarnings("deprecation") // for Derby/PostgreSQLDialect on Hibernate 6.2 @SuppressWarnings("deprecation") // for DerbyDialect and PostgreSQLDialect on Hibernate 6.2
@Nullable @Nullable
protected Class<?> determineDatabaseDialectClass(Database database) { protected Class<?> determineDatabaseDialectClass(Database database) {
if (oldDialectsPresent) { // Hibernate <6.2 if (oldDialectsPresent) { // Hibernate <6.2
@ -198,13 +196,13 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter {
else { // Hibernate 6.2 aligned else { // Hibernate 6.2 aligned
return switch (database) { return switch (database) {
case DB2 -> DB2Dialect.class; case DB2 -> DB2Dialect.class;
case DERBY -> DerbyDialect.class; case DERBY -> org.hibernate.dialect.DerbyDialect.class;
case H2 -> H2Dialect.class; case H2 -> H2Dialect.class;
case HANA -> HANAColumnStoreDialect.class; case HANA -> HANAColumnStoreDialect.class;
case HSQL -> HSQLDialect.class; case HSQL -> HSQLDialect.class;
case MYSQL -> MySQL57Dialect.class; case MYSQL -> MySQL57Dialect.class;
case ORACLE -> Oracle12cDialect.class; case ORACLE -> Oracle12cDialect.class;
case POSTGRESQL -> PostgreSQLDialect.class; case POSTGRESQL -> org.hibernate.dialect.PostgreSQLDialect.class;
case SQL_SERVER -> SQLServer2012Dialect.class; case SQL_SERVER -> SQLServer2012Dialect.class;
case SYBASE -> SybaseDialect.class; case SYBASE -> SybaseDialect.class;
default -> null; default -> null;

Loading…
Cancel
Save