Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix [cast] compiler warnings

Browse Source
This commit is contained in:
Phillip Webb
2012-12-18 18:06:44 -08:00
committed by Chris Beams
parent b0986049a3
commit 6c14eaad61
63 changed files with 122 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateAccessor.java
View File

@@ -208,7 +208,7 @@ public abstract class HibernateAccessor implements InitializingBean, BeanFactory
if (this.beanFactory == null) {
throw new IllegalStateException("Cannot get entity interceptor via bean name if no bean factory set");
}
return (Interceptor) this.beanFactory.getBean((String) this.entityInterceptor, Interceptor.class);
return this.beanFactory.getBean((String) this.entityInterceptor, Interceptor.class);
}
return (Interceptor) this.entityInterceptor;
}

8
spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java
View File

@@ -228,8 +228,8 @@ public class OpenEntityManagerInViewTests extends TestCase {
replay(manager, factory);
final EntityManagerFactory factory2 = (EntityManagerFactory) createMock(EntityManagerFactory.class);
final EntityManager manager2 = (EntityManager) createMock(EntityManager.class);
final EntityManagerFactory factory2 = createMock(EntityManagerFactory.class);
final EntityManager manager2 = createMock(EntityManager.class);
expect(factory2.createEntityManager()).andReturn(manager2);
expect(manager2.isOpen()).andReturn(true);
@@ -292,8 +292,8 @@ public class OpenEntityManagerInViewTests extends TestCase {
replay(manager, factory);
final EntityManagerFactory factory2 = (EntityManagerFactory) createMock(EntityManagerFactory.class);
final EntityManager manager2 = (EntityManager) createMock(EntityManager.class);
final EntityManagerFactory factory2 = createMock(EntityManagerFactory.class);
final EntityManager manager2 = createMock(EntityManager.class);
expect(factory2.createEntityManager()).andReturn(manager2);
expect(manager2.isOpen()).andReturn(true);

22
spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java
View File

@@ -256,7 +256,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
public void testPublicPersistenceUnitSetterWithOverriding() {
EntityManagerFactory mockEmf2 =
(EntityManagerFactory) MockControl.createControl(EntityManagerFactory.class).getMock();
MockControl.createControl(EntityManagerFactory.class).getMock();
GenericApplicationContext gac = new GenericApplicationContext();
gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -274,7 +274,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
public void testPublicPersistenceUnitSetterWithUnitIdentifiedThroughBeanName() {
EntityManagerFactory mockEmf2 =
(EntityManagerFactory) MockControl.createControl(EntityManagerFactory.class).getMock();
MockControl.createControl(EntityManagerFactory.class).getMock();
GenericApplicationContext gac = new GenericApplicationContext();
gac.getDefaultListableBeanFactory().registerSingleton("entityManagerFactory", mockEmf);
@@ -329,7 +329,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
@Ignore
public void ignoreTestPersistenceUnitsFromJndi() {
mockEmf.createEntityManager();
Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
Object mockEm = MockControl.createControl(EntityManager.class).getMock();
emfMc.setReturnValue(mockEm, 1);
emfMc.replay();
@@ -428,9 +428,9 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
}
public void testPersistenceContextsFromJndi() {
Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
Object mockEm2 = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
Object mockEm3 = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
Object mockEm = MockControl.createControl(EntityManager.class).getMock();
Object mockEm2 = MockControl.createControl(EntityManager.class).getMock();
Object mockEm3 = MockControl.createControl(EntityManager.class).getMock();
Map<String, String> persistenceContexts = new HashMap<String, String>();
persistenceContexts.put("", "pc1");
@@ -467,9 +467,9 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
}
public void testPersistenceContextsFromJndiWithDefaultUnit() {
Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
Object mockEm2 = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
Object mockEm3 = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
Object mockEm = MockControl.createControl(EntityManager.class).getMock();
Object mockEm2 = MockControl.createControl(EntityManager.class).getMock();
Object mockEm3 = MockControl.createControl(EntityManager.class).getMock();
Map<String, String> persistenceContexts = new HashMap<String, String>();
persistenceContexts.put("System", "pc1");
@@ -507,8 +507,8 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT
}
public void testSinglePersistenceContextFromJndi() {
Object mockEm = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
Object mockEm2 = (EntityManager) MockControl.createControl(EntityManager.class).getMock();
Object mockEm = MockControl.createControl(EntityManager.class).getMock();
Object mockEm2 = MockControl.createControl(EntityManager.class).getMock();
Map<String, String> persistenceContexts = new HashMap<String, String>();
persistenceContexts.put("System", "pc1");

2
spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java
View File

@@ -61,7 +61,7 @@ public class SharedEntityManagerFactoryTests {
assertTrue(EntityManager.class.isAssignableFrom(proxyFactoryBean.getObjectType()));
assertTrue(proxyFactoryBean.isSingleton());
EntityManager proxy = (EntityManager) proxyFactoryBean.getObject();
EntityManager proxy = proxyFactoryBean.getObject();
assertSame(proxy, proxyFactoryBean.getObject());
assertFalse(proxy.contains(o));