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

Fixed @Lazy and @DependsOn annotation definitions to be non-inheritable 

Issue: SPR-9589
Issue: SPR-9476
This commit is contained in:
Juergen Hoeller 2012-11-25 22:28:23 +01:00
parent 9e337d2705
commit 87b7e3d8cf
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-context/src/main/java/org/springframework/context/annotation/DependsOn.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2012 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.
@ -28,8 +28,6 @@ import java.lang.annotation.Documented;
* created by the container before this bean. Used infrequently in cases where a bean * created by the container before this bean. Used infrequently in cases where a bean
* does not explicitly depend on another through properties or constructor arguments, * does not explicitly depend on another through properties or constructor arguments,
* but rather depends on the side effects of another bean's initialization. * but rather depends on the side effects of another bean's initialization.
* <p>Note: This attribute will not be inherited by child bean definitions,
* hence it needs to be specified per concrete bean definition.
* *
* <p>May be used on any class directly or indirectly annotated with * <p>May be used on any class directly or indirectly annotated with
* {@link org.springframework.stereotype.Component} or on methods annotated * {@link org.springframework.stereotype.Component} or on methods annotated
@ -45,7 +43,6 @@ import java.lang.annotation.Documented;
*/ */
@Target({ElementType.TYPE, ElementType.METHOD}) @Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Inherited
@Documented @Documented
public @interface DependsOn { public @interface DependsOn {

4
spring-context/src/main/java/org/springframework/context/annotation/Lazy.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2012 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.
@ -21,7 +21,6 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import java.lang.annotation.Inherited;
/** /**
* Indicates whether a bean is to be lazily initialized. * Indicates whether a bean is to be lazily initialized.
@ -52,7 +51,6 @@ import java.lang.annotation.Inherited;
*/ */
@Target({ElementType.TYPE, ElementType.METHOD}) @Target({ElementType.TYPE, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Inherited
@Documented @Documented
public @interface Lazy { public @interface Lazy {