root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2018-07-04 20:58:27 +02:00
parent 1ab9e2ceda
commit 490b78a3d3
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
View File

@ -300,8 +300,6 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
RootBeanDefinition bd = new RootBeanDefinition(beanClass); RootBeanDefinition bd = new RootBeanDefinition(beanClass);
bd.setScope(SCOPE_PROTOTYPE); bd.setScope(SCOPE_PROTOTYPE);
bd.allowCaching = ClassUtils.isCacheSafe(beanClass, getBeanClassLoader()); bd.allowCaching = ClassUtils.isCacheSafe(beanClass, getBeanClassLoader());
// For the nullability warning, see the elaboration in AbstractBeanFactory.doGetBean;
// in short: This is never going to be null unless user-declared code enforces null.
return (T) createBean(beanClass.getName(), bd, null); return (T) createBean(beanClass.getName(), bd, null);
} }
@ -335,8 +333,6 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
BeanWrapper bw = new BeanWrapperImpl(existingBean); BeanWrapper bw = new BeanWrapperImpl(existingBean);
initBeanWrapper(bw); initBeanWrapper(bw);
populateBean(beanName, bd, bw); populateBean(beanName, bd, bw);
// For the nullability warning, see the elaboration in AbstractBeanFactory.doGetBean;
// in short: This is never going to be null unless user-declared code enforces null.
return initializeBean(beanName, existingBean, bd); return initializeBean(beanName, existingBean, bd);
} }
@ -356,8 +352,6 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
// Use non-singleton bean definition, to avoid registering bean as dependent bean. // Use non-singleton bean definition, to avoid registering bean as dependent bean.
RootBeanDefinition bd = new RootBeanDefinition(beanClass, autowireMode, dependencyCheck); RootBeanDefinition bd = new RootBeanDefinition(beanClass, autowireMode, dependencyCheck);
bd.setScope(BeanDefinition.SCOPE_PROTOTYPE); bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
// For the nullability warning, see the elaboration in AbstractBeanFactory.doGetBean;
// in short: This is never going to be null unless user-declared code enforces null.
return createBean(beanClass.getName(), bd, null); return createBean(beanClass.getName(), bd, null);
} }

6
spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -93,7 +93,7 @@ public abstract class AbstractEntityManagerFactoryIntegrationTests {
@Before @Before
public void setUp() { public void setup() {
if (applicationContext == null) { if (applicationContext == null) {
applicationContext = new ClassPathXmlApplicationContext(getConfigLocations()); applicationContext = new ClassPathXmlApplicationContext(getConfigLocations());
} }
@ -109,7 +109,7 @@ public abstract class AbstractEntityManagerFactoryIntegrationTests {
} }
@After @After
public void tearDown() throws Exception { public void cleanup() {
if (this.transactionStatus != null && !this.transactionStatus.isCompleted()) { if (this.transactionStatus != null && !this.transactionStatus.isCompleted()) {
endTransaction(); endTransaction();
} }