From 4f10f559f7917caad6c4cadcaaf478197323e094 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sun, 4 Jun 2023 16:36:20 +0200 Subject: [PATCH 1/2] Suppress warnings --- .../AutowiredAnnotationBeanPostProcessorTests.java | 1 + .../orm/jpa/vendor/HibernateJpaVendorAdapter.java | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java index 781de2ef115..53b36cddb1b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java @@ -131,6 +131,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { } @Test + @SuppressWarnings("rawtypes") void resourceInjectionWithNullBean() { RootBeanDefinition bd = new RootBeanDefinition(NonPublicResourceInjectionBean.class); bd.setScope(BeanDefinition.SCOPE_PROTOTYPE); diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java index 4f07bd712a1..e9678742d4e 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java @@ -28,7 +28,6 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.DB2Dialect; -import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.DerbyTenSevenDialect; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.HANAColumnStoreDialect; @@ -37,7 +36,6 @@ import org.hibernate.dialect.Informix10Dialect; import org.hibernate.dialect.MySQL57Dialect; import org.hibernate.dialect.Oracle12cDialect; import org.hibernate.dialect.PostgreSQL95Dialect; -import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.SQLServer2012Dialect; import org.hibernate.dialect.SybaseDialect; import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; @@ -176,7 +174,7 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter { * @param database the target database * @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 protected Class determineDatabaseDialectClass(Database database) { if (oldDialectsPresent) { // Hibernate <6.2 @@ -198,13 +196,13 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter { else { // Hibernate 6.2 aligned return switch (database) { case DB2 -> DB2Dialect.class; - case DERBY -> DerbyDialect.class; + case DERBY -> org.hibernate.dialect.DerbyDialect.class; case H2 -> H2Dialect.class; case HANA -> HANAColumnStoreDialect.class; case HSQL -> HSQLDialect.class; case MYSQL -> MySQL57Dialect.class; case ORACLE -> Oracle12cDialect.class; - case POSTGRESQL -> PostgreSQLDialect.class; + case POSTGRESQL -> org.hibernate.dialect.PostgreSQLDialect.class; case SQL_SERVER -> SQLServer2012Dialect.class; case SYBASE -> SybaseDialect.class; default -> null; From 24fa8793b10f803278964499d9cbc97926d1b242 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sun, 4 Jun 2023 16:36:52 +0200 Subject: [PATCH 2/2] Update copyright headers --- .../aot/nativex/feature/PreComputeFieldFeature.java | 2 +- .../AbstractTransactionalDatabaseClientIntegrationTests.java | 2 +- .../test/context/util/TestContextFailureHandler.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/aot/nativex/feature/PreComputeFieldFeature.java b/spring-core/src/main/java/org/springframework/aot/nativex/feature/PreComputeFieldFeature.java index ae9c33052e9..d548d6ff3d9 100644 --- a/spring-core/src/main/java/org/springframework/aot/nativex/feature/PreComputeFieldFeature.java +++ b/spring-core/src/main/java/org/springframework/aot/nativex/feature/PreComputeFieldFeature.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 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. diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java index 081ec90ab37..ce64ac6afcb 100644 --- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java +++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2023 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. diff --git a/spring-test/src/main/java/org/springframework/test/context/util/TestContextFailureHandler.java b/spring-test/src/main/java/org/springframework/test/context/util/TestContextFailureHandler.java index bac8625032d..cfe9e815cbc 100644 --- a/spring-test/src/main/java/org/springframework/test/context/util/TestContextFailureHandler.java +++ b/spring-test/src/main/java/org/springframework/test/context/util/TestContextFailureHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 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.