Skip to content

Commit 4f10f55

Browse files
committed
Suppress warnings
1 parent 2f35e77 commit 4f10f55

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ void resourceInjection() {
131131
}
132132

133133
@Test
134+
@SuppressWarnings("rawtypes")
134135
void resourceInjectionWithNullBean() {
135136
RootBeanDefinition bd = new RootBeanDefinition(NonPublicResourceInjectionBean.class);
136137
bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.hibernate.SessionFactory;
2929
import org.hibernate.cfg.AvailableSettings;
3030
import org.hibernate.dialect.DB2Dialect;
31-
import org.hibernate.dialect.DerbyDialect;
3231
import org.hibernate.dialect.DerbyTenSevenDialect;
3332
import org.hibernate.dialect.H2Dialect;
3433
import org.hibernate.dialect.HANAColumnStoreDialect;
@@ -37,7 +36,6 @@
3736
import org.hibernate.dialect.MySQL57Dialect;
3837
import org.hibernate.dialect.Oracle12cDialect;
3938
import org.hibernate.dialect.PostgreSQL95Dialect;
40-
import org.hibernate.dialect.PostgreSQLDialect;
4139
import org.hibernate.dialect.SQLServer2012Dialect;
4240
import org.hibernate.dialect.SybaseDialect;
4341
import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode;
@@ -176,7 +174,7 @@ private Map<String, Object> buildJpaPropertyMap(boolean connectionReleaseOnClose
176174
* @param database the target database
177175
* @return the Hibernate database dialect class, or {@code null} if none found
178176
*/
179-
@SuppressWarnings("deprecation") // for Derby/PostgreSQLDialect on Hibernate 6.2
177+
@SuppressWarnings("deprecation") // for DerbyDialect and PostgreSQLDialect on Hibernate 6.2
180178
@Nullable
181179
protected Class<?> determineDatabaseDialectClass(Database database) {
182180
if (oldDialectsPresent) { // Hibernate <6.2
@@ -198,13 +196,13 @@ protected Class<?> determineDatabaseDialectClass(Database database) {
198196
else { // Hibernate 6.2 aligned
199197
return switch (database) {
200198
case DB2 -> DB2Dialect.class;
201-
case DERBY -> DerbyDialect.class;
199+
case DERBY -> org.hibernate.dialect.DerbyDialect.class;
202200
case H2 -> H2Dialect.class;
203201
case HANA -> HANAColumnStoreDialect.class;
204202
case HSQL -> HSQLDialect.class;
205203
case MYSQL -> MySQL57Dialect.class;
206204
case ORACLE -> Oracle12cDialect.class;
207-
case POSTGRESQL -> PostgreSQLDialect.class;
205+
case POSTGRESQL -> org.hibernate.dialect.PostgreSQLDialect.class;
208206
case SQL_SERVER -> SQLServer2012Dialect.class;
209207
case SYBASE -> SybaseDialect.class;
210208
default -> null;

0 commit comments

Comments
 (0)