Skip to content

Commit 63e0231

Browse files
committed
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.
1 parent 5f8275a commit 63e0231

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/HibernateTemplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public SessionFactory getSessionFactory() {
144144
* Sessions (for example, within a transaction).
145145
* @see #enableFilters(org.hibernate.Session)
146146
* @see org.hibernate.Session#enableFilter(String)
147-
* @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setFilterDefinitions
147+
* @see org.springframework.orm.hibernate3.LocalSessionFactoryBean#setFilterDefinitions(org.springframework.orm.hibernate3.FilterDefinition...)
148148
*/
149149
public void setFilterNames(String... filterNames) {
150150
this.filterNames = filterNames;

spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBuilder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ public LocalSessionFactoryBuilder(DataSource dataSource, ClassLoader classLoader
133133
* (may be {@code null})
134134
* @param resourceLoader the ResourceLoader to load application classes from
135135
*/
136-
@SuppressWarnings("deprecation")
137136
public LocalSessionFactoryBuilder(DataSource dataSource, ResourceLoader resourceLoader) {
138137
getProperties().put(Environment.CURRENT_SESSION_CONTEXT_CLASS, SpringSessionContext.class.getName());
139138
if (dataSource != null) {

spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTemplateTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import org.junit.Before;
5353
import org.junit.Test;
5454
import org.mockito.InOrder;
55-
5655
import org.springframework.dao.CannotAcquireLockException;
5756
import org.springframework.dao.DataAccessResourceFailureException;
5857
import org.springframework.dao.DataIntegrityViolationException;
@@ -69,6 +68,7 @@
6968
* @author Juergen Hoeller
7069
* @since 4.0.1
7170
*/
71+
@SuppressWarnings({ "rawtypes", "unchecked" })
7272
public class HibernateTemplateTests {
7373

7474
private SessionFactory sessionFactory;

spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2014 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -73,6 +73,7 @@
7373
* @author Phillip Webb
7474
* @since 05.03.2005
7575
*/
76+
@SuppressWarnings({ "rawtypes", "unchecked" })
7677
public class HibernateTemplateTests {
7778

7879
private SessionFactory sessionFactory;

0 commit comments

Comments
 (0)