1. 08 8月, 2014 1 次提交
  2. 02 8月, 2014 1 次提交
  3. 01 7月, 2014 1 次提交
  4. 27 6月, 2014 1 次提交
  5. 24 6月, 2014 2 次提交
  6. 30 4月, 2014 2 次提交
  7. 29 4月, 2014 1 次提交
  8. 23 4月, 2014 1 次提交
  9. 20 3月, 2014 1 次提交
    • S
      Support meta-annotation overrides in ASM processing · 99cd2f60
      Sam Brannen 提交于
      Prior to this commit, Spring supported meta-annotation attribute
      overrides in custom composed annotations with reflection-based
      annotation processing but not with ASM-based annotation processing.
      
      This commit ensures that meta-annotation attribute overrides are
      supported in AnnotationMetadataReadingVisitor.getAnnotationAttributes().
      
      Issue: SPR-11574
      99cd2f60
  10. 27 2月, 2014 1 次提交
    • S
      Ensure AnnotationUtils is compatible with Java 6 · 0637864b
      Sam Brannen 提交于
      The previous commit introduced a dependency on
      Class.getDeclaredAnnotation() which is a Java 8 API.
      
      This commit refactors AnnotationUtils.findAnnotation(Class, Class, Set)
      to use Class.getAnnotation() in conjunction with
      isAnnotationDeclaredLocally() in order to achieve the same desired
      behavior.
      
      Issue: SPR-11475
      0637864b
  11. 26 2月, 2014 2 次提交
    • S
      Favor 'local' annotations over inherited ones · 1d30bf83
      Sam Brannen 提交于
      Prior to this commit, the implementations of findAnnotation() in
      AnnotationUtils and getAnnotationAttributes() in AnnotatedElementUtils
      favored inherited annotations and inherited composed annotations over
      composed annotations that are declared closer to the starting class
      passed to these methods.
      
      This commit addresses this issue as follows:
      
      - Refactored AnnotationUtils to use getDeclaredAnnotation() and
        getDeclaredAnnotations() instead of getAnnotation() and
        getAnnotations() where appropriate.
      
      - AnnotatedElementUtils.doProcess() supports a traverseClassHierarchy
        flag to control whether the class hierarchy should be traversed,
        using getDeclaredAnnotations() instead of getAnnotations() if the
        flag is true.
      
      - Overhauled Javadoc in AnnotatedElementUtils.
      
      Issue: SPR-11475
      1d30bf83
    • S
      Do not inspect meta-annotations on Java annotations · 979c4833
      Sam Brannen 提交于
      This commit introduces a new isInJavaLangAnnotationPackage(Annotation)
      method in AnnotationUtils. This method is now used in AnnotationUtils,
      AnnotatedElementUtils, and MetaAnnotationUtils to ensure that search
      algorithms do no search for meta-annotations on annotations in the
      "java.lang.annotation" package.
      
      The following are some empirical results from this change:
      
      - The number of times that the findAnnotation(Class,Class,Set) method in
        AnnotationUtils is recursively invoked while executing
        AnnotationUtilsTests drops from 51 to 29.
      
      - The number of times that the process(AnnotatedElement) method in
        AnnotationUtils.AnnotationCollector is recursively invoked while
        executing AnnotationUtilsTests.getRepeatableFromMethod() drops
        from 16 to 2.
      
      - The number of times that the doProcess() method in
        AnnotatedElementUtils is recursively invoked while executing the
        "getAnnotationAttributes() On MetaCycleAnnotatedClass with missing
        target meta-annotation" test in AnnotatedElementUtilsTests drops
        from 23 to 5.
      
      - The number of times that the findAnnotationDescriptor(Class,Set,Class)
        method in MetaAnnotationUtils is recursively invoked while executing
        the "findAnnotationDescriptor() on MetaCycleAnnotatedClass with
        missing target meta-annotation" test in MetaAnnotationUtilsTests drops
        from 16 to 8.
      
      Issue: SPR-11483
      979c4833
  12. 22 2月, 2014 1 次提交
  13. 20 2月, 2014 1 次提交
    • S
      Support nested meta-annotations in AnnotationUtils · 42a36349
      Sam Brannen 提交于
      Prior to this commit, AnnotationUtils.findAnnotation(Class, Class)
      claimed to recursively search through annotations; however, only one
      level of annotations was supported by the algorithm.
      
      This commit alters the search algorithm so that nested meta-annotations
      (i.e., meta-annotations on meta-annotations) are also supported.
      
      Issue: SPR-11448
      42a36349
  14. 26 11月, 2013 1 次提交
    • P
      Fix remaining compiler warnings · 59002f24
      Phillip Webb 提交于
      Fix remaining Java compiler warnings, mainly around missing
      generics or deprecated code.
      
      Also add the `-Werror` compiler option to ensure that any future
      warnings will fail the build.
      
      Issue: SPR-11064
      59002f24
  15. 22 11月, 2013 1 次提交
    • S
      Polish AnnotationUtils · a613126b
      Sam Brannen 提交于
      - Added explicit reference to “get” and “find” lookup types in the
        class-level Javadoc.
      - Updated documentation for the underlying algorithms in
        findAnnotation(Method,Class) and findAnnotation(Class,Class) in line
        with the status quo.
      - Reverted recent changes to findAnnotationDeclaringClass() by removing
        meta-annotation support in order to maintain backwards compatibility
        with previous releases.
      a613126b
  16. 21 11月, 2013 1 次提交
    • S
      Support non-public anno. attr. values in AnnoUtils · b830d736
      Sam Brannen 提交于
      Prior to this commit, the getValue(Annotation, String) method in
      AnnotationUtils failed to retrieve the value of the desired annotation
      attribute if the annotation itself was not public -- for example if the
      annotation was declared as package private.
      
      This commit addresses this issue by ensuring that getValue(Annotation,
      String) uses reflection to make the desired annotation attribute method
      accessible before attempting to invoke it to retrieve the value.
      
      Issue: SPR-11104
      b830d736
  17. 28 10月, 2013 1 次提交
    • S
      Provide meta-annotation support in the TCF · 5e7021f3
      Sam Brannen 提交于
      Spring 3.0 already allows component stereotypes to be used in a
      meta-annotation fashion, for example by creating a custom
      @TransactionalService stereotype annotation which combines
      @Transactional and @Service in a single, reusable, application-specific
      annotation. However, the Spring TestContext Framework (TCF) currently
      does not provide any support for test-related annotations to be used as
      meta-annotations.
      
      This commit overhauls the TCF with regard to how annotations are
      retrieved and adds explicit support for the following annotations to be
      used as meta-annotations in conjunction with the TCF.
      
      - @ContextConfiguration
      - @ContextHierarchy
      - @ActiveProfiles
      - @DirtiesContext
      - @IfProfileValue
      - @ProfileValueSourceConfiguration
      - @BeforeTransaction
      - @AfterTransaction
      - @TransactionConfiguration
      - @Rollback
      - @TestExecutionListeners
      - @Repeat
      - @Timed
      - @WebAppConfiguration
      
      Note that meta-annotation support for @Transactional was already
      available prior to this commit.
      
      The following is a summary of the major changes included in this commit.
      
      - Now using AnnotationUtils.getAnnotation() instead of
        Class.getAnnotation() where appropriate in the TestContext Framework.
      - Now using AnnotationUtils.findAnnotation() instead of
        Class.isAnnotationPresent() where appropriate in the TestContext
        Framework.
      - Introduced findAnnotationPrefersInteracesOverLocalMetaAnnotations() in
        AnnotationUtilsTests in order to verify the status quo.
      - AnnotationUtils.findAnnotationDeclaringClass() and
        AnnotationUtils.findAnnotationDeclaringClassForTypes() now support
        meta annotations.
      - Introduced MetaAnnotationUtils and AnnotationDescriptor in the
        spring-test module.
      - Introduced UntypedAnnotationDescriptor in MetaAnnotationUtils.
      - Introduced findAnnotationDescriptorForTypes() in MetaAnnotationUtils.
      - ContextLoaderUtils now uses MetaAnnotationUtils for looking up
        @ActiveProfiles as a potential meta-annotation.
      - TestContextManager now uses MetaAnnotationUtils for looking up
        @TestExecutionListeners as a potential meta-annotation.
      - DirtiesContextTestExecutionListener now uses AnnotationUtils for
        looking up @DirtiesContext as a potential meta-annotation.
      - Introduced DirtiesContextTestExecutionListenerTests.
      - ProfileValueUtils now uses AnnotationUtils for looking up
        @IfProfileValue and @ProfileValueSourceConfiguration as potential
        meta-annotations.
      - @BeforeTransaction and @AfterTransaction now support ANNOTATION_TYPE
        as a target, allowing them to be used as meta-annotations.
      - TransactionalTestExecutionListener now uses AnnotationUtils for
        looking up @BeforeTransaction, @AfterTransaction, @Rollback, and
        @TransactionConfiguration as potential meta-annotations.
      - Introduced TransactionalTestExecutionListenerTests.
      - @Repeat and @Timed now support ANNOTATION_TYPE as a target, allowing
        them to be used as meta-annotations.
      - SpringJUnit4ClassRunner now uses AnnotationUtils for looking up
        @Repeat and @Timed as potential meta-annotations.
      - Moved all remaining logic for building the MergedContextConfiguration
        from the DefaultTestContext constructor to
        ContextLoaderUtils.buildMergedContextConfiguration().
      - Verified meta-annotation support for @WebAppConfiguration and
        @ContextConfiguration.
      
      Issue: SPR-7827
      5e7021f3
  18. 23 10月, 2013 1 次提交
    • P
      Add @PropertySources and ignoreResourceNotFound · e95bd9e2
      Phillip Webb 提交于
      Support repeatable @PropertySource annotations in Java 8 and add
      @PropertySources container annotation for Java 6/7. Also add an
      ignoreResourceNotFound attribute to @PropertySource allowing missing
      property resources to be silently ignored.
      
      This commit also introduces some generally useful methods to
      AnnotationUtils for working with @Repeatable annotations.
      
      Issue: SPR-8371
      e95bd9e2
  19. 28 8月, 2013 1 次提交
    • J
      Introduced support for @Lazy on injection points · 4447248a
      Juergen Hoeller 提交于
      This turned into a rather huge affair since it led to the introduction of a new AutowireCandidateResolver implementation in the spring-context module. That ACR impl is now being set through AnnotationConfigUtils; GenericApplicationContext and co do not set a default QualifierAnnotationAutowireCandidateResolver anymore (which has always been a smell anyway).  At the same time, dependency ordering has moved from AutowiredAnnotationBeanPostProcessor to DefaultListableBeanFactory itself through a "dependencyComparator" strategy, applying to constructor dependencies and lazy resolution proxies as well.
      
      Issue: SPR-10353
      4447248a
  20. 21 8月, 2013 1 次提交
  21. 17 5月, 2013 1 次提交
  22. 07 3月, 2013 1 次提交
    • S
      Provide support for context hierarchies in the TCF · 98074e77
      Sam Brannen 提交于
      Prior to this commit the Spring TestContext Framework supported creating
      only flat, non-hierarchical contexts. There was no easy way to create
      contexts with parent-child relationships.
      
      This commit addresses this issue by introducing a new @ContextHierarchy
      annotation that can be used in conjunction with @ContextConfiguration
      for declaring hierarchies of application contexts, either within a
      single test class or within a test class hierarchy. In addition,
      @DirtiesContext now supports a new 'hierarchyMode' attribute for
      controlling context cache clearing for context hierarchies.
      
      - Introduced a new @ContextHierarchy annotation.
      - Introduced 'name' attribute in @ContextConfiguration.
      - Introduced 'name' property in ContextConfigurationAttributes.
      - TestContext is now aware of @ContextHierarchy in addition to
        @ContextConfiguration.
      - Introduced findAnnotationDeclaringClassForTypes() in AnnotationUtils.
      - Introduced resolveContextHierarchyAttributes() in ContextLoaderUtils.
      - Introduced buildContextHierarchyMap() in ContextLoaderUtils.
      - @ContextConfiguration and @ContextHierarchy may not be used as
        top-level, class-level annotations simultaneously.
      - Introduced reference to the parent configuration in
        MergedContextConfiguration and WebMergedContextConfiguration.
      - Introduced overloaded buildMergedContextConfiguration() methods in
        ContextLoaderUtils in order to handle context hierarchies separately
        from conventional, non-hierarchical contexts.
      - Introduced hashCode() and equals() in ContextConfigurationAttributes.
      - ContextLoaderUtils ensures uniqueness of @ContextConfiguration
        elements within a single @ContextHierarchy declaration.
      - Introduced CacheAwareContextLoaderDelegate that can be used for
        loading contexts with transparent support for interacting with the
        context cache -- for example, for retrieving the parent application
        context in a context hierarchy.
      - TestContext now delegates to CacheAwareContextLoaderDelegate for
        loading contexts.
      - Introduced getParentApplicationContext() in MergedContextConfiguration
      - The loadContext(MergedContextConfiguration) methods in
        AbstractGenericContextLoader and AbstractGenericWebContextLoader now
        set the parent context as appropriate.
      - Introduced 'hierarchyMode' attribute in @DirtiesContext with a
        corresponding HierarchyMode enum that defines EXHAUSTIVE and
        CURRENT_LEVEL cache removal modes.
      - ContextCache now internally tracks the relationships between contexts
        that make up a context hierarchy. Furthermore, when a context is
        removed, if it is part of a context hierarchy all corresponding
        contexts will be removed from the cache according to the supplied
        HierarchyMode.
      - AbstractGenericWebContextLoader will set a loaded context as the
        ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE in the MockServletContext when
        context hierarchies are used if the context has no parent or if the
        context has a parent that is not a WAC.
      - Where appropriate, updated Javadoc to refer to the
        ServletTestExecutionListener, which was introduced in 3.2.0.
      - Updated Javadoc to avoid and/or suppress warnings in spring-test.
      - Suppressed remaining warnings in code in spring-test.
      
      Issue: SPR-5613, SPR-9863
      98074e77
  23. 14 1月, 2013 1 次提交
    • S
      Minor changes to AnnotationUtils · 8694a0aa
      Sam Brannen 提交于
      - Polished Javadoc for isAnnotationDeclaredLocally() and
        isAnnotationInherited().
      - Removed unnecessary call to Arrays.asList() in
        isAnnotationDeclaredLocally().
      8694a0aa
  24. 29 12月, 2012 1 次提交
  25. 17 5月, 2012 1 次提交
    • P
      Fix annotation search ending too early · ef7e728b
      Petr Janecek 提交于
      In AnnotationUtils#findAnnotation(Method, Class), the search for a
      method annotation fails if:
      
       - the original method does not have the annotation
      
       - an abstract superclass does not have an equivalent method declared
      
       - an interface implemented by the superclass has the method and
         the annotation -> this should be found, but is not!
      
      This happens because the try-catch block in #findAnnotation is too wide:
      cl.getDeclaredMethod() can throw NoSuchMethodException and skip the
      '#searchOnInterfaces' call prematurely.
      
      The try-catch block was made narrower to allow #searchOnInterfaces to
      be called even if the abstract class does not have the method declared
      at all.
      
      Issue: SPR-9342
      ef7e728b
  26. 31 1月, 2012 1 次提交
    • C
      Rename modules {org.springframework.*=>spring-*} · 02a4473c
      Chris Beams 提交于
      This renaming more intuitively expresses the relationship between
      subprojects and the JAR artifacts they produce.
      
      Tracking history across these renames is possible, but it requires
      use of the --follow flag to `git log`, for example
      
          $ git log spring-aop/src/main/java/org/springframework/aop/Advisor.java
      
      will show history up until the renaming event, where
      
          $ git log --follow spring-aop/src/main/java/org/springframework/aop/Advisor.java
      
      will show history for all changes to the file, before and after the
      renaming.
      
      See http://chrisbeams.com/git-diff-across-renamed-directories
      02a4473c
  27. 30 11月, 2011 1 次提交
  28. 29 11月, 2011 1 次提交
  29. 10 10月, 2011 1 次提交
    • C
      Refactor AnnotationUtils#findAllAnnotationAttributes · 6837111b
      Chris Beams 提交于
      Remove all convenience variants of #findAllAnnotationAttributes and
      refactor the remaining method to accept a MetadataReaderFactory
      instead of creating its own SimpleMetadataReaderFactory internally.
      This allows clients to use non-default class loaders as well as
      customize the particular MetadataReaderFactory to be used (e.g.
      'simple' vs 'caching', etc).
      
      Issue: SPR-8752
      6837111b
  30. 27 7月, 2011 1 次提交
  31. 22 7月, 2011 1 次提交
  32. 07 5月, 2011 2 次提交
  33. 15 10月, 2010 1 次提交
  34. 14 10月, 2010 1 次提交
  35. 15 8月, 2010 1 次提交
  36. 15 6月, 2010 1 次提交