From 63e023173b2e3463c104f6c61730a7c20a0d72c5 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 28 Jan 2014 15:41:42 +0100 Subject: [PATCH] Polish Hibernate support and tests - Fix Javadoc in HibernateTemplate so that it compiles in Eclipse. - Suppress generics warnings in HibernateTemplateTests. - Remove unnecessary deprecation warning suppression in constructor for LocalSessionFactoryBuilder. --- .../org/springframework/orm/hibernate4/HibernateTemplate.java | 2 +- .../orm/hibernate4/LocalSessionFactoryBuilder.java | 1 - .../springframework/orm/hibernate4/HibernateTemplateTests.java | 2 +- .../springframework/orm/hibernate3/HibernateTemplateTests.java | 3 ++- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTemplate.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTemplate.java index 8018a9c4de..3589aab660 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTemplate.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTemplate.java @@ -144,7 +144,7 @@ public class HibernateTemplate implements HibernateOperations, InitializingBean * Sessions (for example, within a transaction). * @see #enableFilters(org.hibernate.Session) * @see org.hibernate.Session#enableFilter(String) - * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setFilterDefinitions + * @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setFilterDefinitions(org.springframework.orm.hibernate3.FilterDefinition...) */ public void setFilterNames(String... filterNames) { this.filterNames = filterNames; diff --git a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java index c2ff3ca317..3024966106 100644 --- a/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java +++ b/spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java @@ -133,7 +133,6 @@ public class LocalSessionFactoryBuilder extends Configuration { * (may be {@code null}) * @param resourceLoader the ResourceLoader to load application classes from */ - @SuppressWarnings("deprecation") public LocalSessionFactoryBuilder(DataSource dataSource, ResourceLoader resourceLoader) { getProperties().put(Environment.CURRENT_SESSION_CONTEXT_CLASS, SpringSessionContext.class.getName()); if (dataSource != null) { diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTemplateTests.java b/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTemplateTests.java index 47c91bafe2..3b515108c4 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTemplateTests.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTemplateTests.java @@ -52,7 +52,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.InOrder; - import org.springframework.dao.CannotAcquireLockException; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.dao.DataIntegrityViolationException; @@ -69,6 +68,7 @@ import static org.mockito.BDDMockito.*; * @author Juergen Hoeller * @since 4.0.1 */ +@SuppressWarnings({ "rawtypes", "unchecked" }) public class HibernateTemplateTests { private SessionFactory sessionFactory; diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java index 6da7999ca7..d92a4915e3 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -73,6 +73,7 @@ import static org.mockito.BDDMockito.*; * @author Phillip Webb * @since 05.03.2005 */ +@SuppressWarnings({ "rawtypes", "unchecked" }) public class HibernateTemplateTests { private SessionFactory sessionFactory;