From 3ccf6531743a076f437caef58f82df47d3f94536 Mon Sep 17 00:00:00 2001 From: fisache Date: Sat, 16 Jul 2016 03:37:45 +0900 Subject: [PATCH 1/2] Polish Javadoc See gh-1112 --- .../org/springframework/beans/factory/BeanClassLoaderAware.java | 2 +- .../java/org/springframework/beans/factory/BeanNameAware.java | 2 +- .../java/org/springframework/beans/factory/DisposableBean.java | 2 +- .../java/org/springframework/beans/factory/FactoryBean.java | 2 +- .../org/springframework/beans/factory/InitializingBean.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java index ab584354b8..572293b982 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java @@ -18,7 +18,7 @@ package org.springframework.beans.factory; /** * Callback that allows a bean to be aware of the bean - * {@link ClassLoader class loader}; that is, the class loader used by the + * {@link ClassLoader class loader}; that is, the class loader is used by the * present bean factory to load bean classes. * *

This is mainly intended to be implemented by framework classes which diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNameAware.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNameAware.java index 2f41696c69..e5c0c38dbf 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNameAware.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNameAware.java @@ -19,7 +19,7 @@ package org.springframework.beans.factory; /** * Interface to be implemented by beans that want to be aware of their * bean name in a bean factory. Note that it is not usually recommended - * that an object depend on its bean name, as this represents a potentially + * that an object depends on its bean name, as this represents a potentially * brittle dependence on external configuration, as well as a possibly * unnecessary dependence on a Spring API. * diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java index 5554afc2b3..be8849b98d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java @@ -24,7 +24,7 @@ package org.springframework.beans.factory; * *

An alternative to implementing DisposableBean is specifying a custom * destroy-method, for example in an XML bean definition. - * For a list of all bean lifecycle methods, see the BeanFactory javadocs. + * For a list of all bean lifecycle methods, see the {@link BeanFactory BeanFactory javadocs}. * * @author Juergen Hoeller * @since 12.08.2003 diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java index e8522452e5..ee7e60bdca 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java @@ -24,7 +24,7 @@ package org.springframework.beans.factory; * *

NB: A bean that implements this interface cannot be used as a * normal bean. A FactoryBean is defined in a bean style, but the - * object exposed for bean references ({@link #getObject()} is always + * object exposed for bean references ({@link #getObject()}) is always * the object that it creates. * *

FactoryBeans can support singletons and prototypes, and can diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java index 365bf99bf1..e12941d6f7 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java @@ -23,7 +23,7 @@ package org.springframework.beans.factory; * *

An alternative to implementing InitializingBean is specifying a custom * init-method, for example in an XML bean definition. - * For a list of all bean lifecycle methods, see the BeanFactory javadocs. + * For a list of all bean lifecycle methods, see the {@link BeanFactory BeanFactory javadocs}. * * @author Rod Johnson * @see BeanNameAware From bfa48d551d62f68de6c803f67e34be6d9ad37a78 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 25 Jul 2016 12:34:42 +0200 Subject: [PATCH 2/2] Polish contribution Closes gh-1112 --- .../springframework/beans/factory/BeanClassLoaderAware.java | 4 ++-- .../org/springframework/beans/factory/BeanNameAware.java | 2 +- .../org/springframework/beans/factory/DisposableBean.java | 5 +++-- .../org/springframework/beans/factory/InitializingBean.java | 5 +++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java index 572293b982..e207fdb3c8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 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. @@ -18,7 +18,7 @@ package org.springframework.beans.factory; /** * Callback that allows a bean to be aware of the bean - * {@link ClassLoader class loader}; that is, the class loader is used by the + * {@link ClassLoader class loader}; that is, the class loader used by the * present bean factory to load bean classes. * *

This is mainly intended to be implemented by framework classes which diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNameAware.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNameAware.java index e5c0c38dbf..31f9b14d86 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNameAware.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNameAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2016 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. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java index be8849b98d..7c5b49578d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 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. @@ -24,7 +24,8 @@ package org.springframework.beans.factory; * *

An alternative to implementing DisposableBean is specifying a custom * destroy-method, for example in an XML bean definition. - * For a list of all bean lifecycle methods, see the {@link BeanFactory BeanFactory javadocs}. + * For a list of all bean lifecycle methods, see the + * {@link BeanFactory BeanFactory javadocs}. * * @author Juergen Hoeller * @since 12.08.2003 diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java index e12941d6f7..9676ff3433 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 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. @@ -23,7 +23,8 @@ package org.springframework.beans.factory; * *

An alternative to implementing InitializingBean is specifying a custom * init-method, for example in an XML bean definition. - * For a list of all bean lifecycle methods, see the {@link BeanFactory BeanFactory javadocs}. + * For a list of all bean lifecycle methods, see the + * {@link BeanFactory BeanFactory javadocs}. * * @author Rod Johnson * @see BeanNameAware