From 3cd57a01483eee01aece7797149b5de6533924b9 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 14 Apr 2010 12:18:05 +0000 Subject: [PATCH] polishing git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3245 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../support/InstantiationStrategy.java | 28 +++++++++---------- .../support/SimpleInstantiationStrategy.java | 27 ++++++++---------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java index 13355a69ee0..eed36657571 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java @@ -1,12 +1,12 @@ /* - * Copyright 2002-2005 the original author or authors. - * + * Copyright 2002-2010 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. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -32,7 +32,7 @@ import org.springframework.beans.factory.BeanFactory; * @since 1.1 */ public interface InstantiationStrategy { - + /** * Return an instance of the bean with the given name in this factory. * @param beanDefinition the bean definition @@ -43,9 +43,9 @@ public interface InstantiationStrategy { * @return a bean instance for this bean definition * @throws BeansException if the instantiation failed */ - Object instantiate( - RootBeanDefinition beanDefinition, String beanName, BeanFactory owner) throws BeansException; - + Object instantiate(RootBeanDefinition beanDefinition, String beanName, BeanFactory owner) + throws BeansException; + /** * Return an instance of the bean with the given name in this factory, * creating it via the given constructor. @@ -59,10 +59,9 @@ public interface InstantiationStrategy { * @return a bean instance for this bean definition * @throws BeansException if the instantiation failed */ - Object instantiate( - RootBeanDefinition beanDefinition, String beanName, BeanFactory owner, - Constructor ctor, Object[] args) throws BeansException; - + Object instantiate(RootBeanDefinition beanDefinition, String beanName, BeanFactory owner, + Constructor ctor, Object[] args) throws BeansException; + /** * Return an instance of the bean with the given name in this factory, * creating it via the given factory method. @@ -78,8 +77,7 @@ public interface InstantiationStrategy { * @return a bean instance for this bean definition * @throws BeansException if the instantiation failed */ - Object instantiate( - RootBeanDefinition beanDefinition, String beanName, BeanFactory owner, + Object instantiate(RootBeanDefinition beanDefinition, String beanName, BeanFactory owner, Object factoryBean, Method factoryMethod, Object[] args) throws BeansException; - + } diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java index 241bd29b976..cfba4262933 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/support/SimpleInstantiationStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 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. @@ -42,12 +42,10 @@ import org.springframework.util.StringUtils; */ public class SimpleInstantiationStrategy implements InstantiationStrategy { - public Object instantiate( - RootBeanDefinition beanDefinition, String beanName, BeanFactory owner) { - + public Object instantiate(RootBeanDefinition beanDefinition, String beanName, BeanFactory owner) { // Don't override the class with CGLIB if no overrides. if (beanDefinition.getMethodOverrides().isEmpty()) { - Constructor constructorToUse = (Constructor) beanDefinition.resolvedConstructorOrFactoryMethod; + Constructor constructorToUse = (Constructor) beanDefinition.resolvedConstructorOrFactoryMethod; if (constructorToUse == null) { final Class clazz = beanDefinition.getBeanClass(); if (clazz.isInterface()) { @@ -60,7 +58,8 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy { return clazz.getDeclaredConstructor((Class[]) null); } }); - } else { + } + else { constructorToUse = clazz.getDeclaredConstructor((Class[]) null); } beanDefinition.resolvedConstructorOrFactoryMethod = constructorToUse; @@ -90,9 +89,8 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy { "Method Injection not supported in SimpleInstantiationStrategy"); } - public Object instantiate( - RootBeanDefinition beanDefinition, String beanName, BeanFactory owner, - final Constructor ctor, Object[] args) { + public Object instantiate(RootBeanDefinition beanDefinition, String beanName, BeanFactory owner, + final Constructor ctor, Object[] args) { if (beanDefinition.getMethodOverrides().isEmpty()) { if (System.getSecurityManager() != null) { @@ -117,16 +115,14 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy { * the Method Injection specified in the given RootBeanDefinition. * Instantiation should use the given constructor and parameters. */ - protected Object instantiateWithMethodInjection( - RootBeanDefinition beanDefinition, String beanName, BeanFactory owner, - Constructor ctor, Object[] args) { + protected Object instantiateWithMethodInjection(RootBeanDefinition beanDefinition, + String beanName, BeanFactory owner, Constructor ctor, Object[] args) { throw new UnsupportedOperationException( "Method Injection not supported in SimpleInstantiationStrategy"); } - public Object instantiate( - RootBeanDefinition beanDefinition, String beanName, BeanFactory owner, + public Object instantiate(RootBeanDefinition beanDefinition, String beanName, BeanFactory owner, Object factoryBean, final Method factoryMethod, Object[] args) { try { @@ -159,4 +155,5 @@ public class SimpleInstantiationStrategy implements InstantiationStrategy { "Factory method [" + factoryMethod + "] threw exception", ex.getTargetException()); } } -} \ No newline at end of file + +}