1. 01 3月, 2014 11 次提交
  2. 28 2月, 2014 15 次提交
  3. 27 2月, 2014 2 次提交
    • B
      Update documentation with coding guidelines · 11c41993
      Brian Clozel 提交于
      This commit:
      * adds a reference to the Spring Code Style wiki page in the main
      CONTRIBUTING document
      * updates the link to the Spring team in README
      * adds a note regarding Intellij IDEA 13 issues
      11c41993
    • 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
  4. 26 2月, 2014 8 次提交
    • S
      Merge changes from sbrannen/SPR-11475 · 0f5a27c3
      Sam Brannen 提交于
      * SPR-11475:
        Favor 'local' annotations over inherited ones
      0f5a27c3
    • 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
    • J
      Upgraded JSP build dependency to 2.2 · 0616cbcc
      Juergen Hoeller 提交于
      0616cbcc
    • S
      Clean up warnings that show up in Gradle build · fbdebc1b
      Sam Brannen 提交于
      fbdebc1b
    • S
      Delete work-around for Ant 1.8 in Gradle build · 019d29c9
      Sam Brannen 提交于
      Ant 1.9.2 is packaged with Gradle since release 1.10. Since the Spring
      Framework build now uses Gradle 1.11, there is no longer a need for the
      "javac1.7" build compiler work-around for the spring-oxm module.
      019d29c9
    • S
      Polish Javadoc for ConfigurationClassParser · 1ac08e4a
      Sam Brannen 提交于
      1ac08e4a
    • 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
    • R
      Update documentation · 651e0a44
      Rossen Stoyanchev 提交于
      Clarify ability to use @MessageMapping methods on both @Controller as
      well as @RestController.
      
      Add section on configuring connections (including credentials) to the
      message broker and clarify the use of the login/passcode headerers of
      the STOMP CONNECT frame.
      
      Add note on when to add the reactor-tcp dependency.
      
      Issue: SPR-11464, SPR-11436, SPR-11449
      651e0a44
  5. 25 2月, 2014 4 次提交
    • S
      Fix 'method' typo in @PropertySources · ce0d9164
      Sam Brannen 提交于
      ce0d9164
    • S
      Merge changes from sbrannen/SPR-11455 · 39eb7442
      Sam Brannen 提交于
      * SPR-11455:
        Always supply test class to ContextLoaders in TCF
      39eb7442
    • S
      Always supply test class to ContextLoaders in TCF · 78b69f5d
      Sam Brannen 提交于
      Prior to this commit, the following methods in ContextLoaderUtils
      treated a composed @ContextConfiguration annotation (i.e., a custom
      annotation that is meta-annotated with @ContextConfiguration) as the
      "declaring class" instead of the actual test class.
      
      - resolveContextConfigurationAttributes()
      - resolveContextHierarchyAttributes()
      
      As a consequence, if @ContextConfiguration is used as a
      meta-annotation, the meta-annotated class is stored as the
      "declaringClass" in ContextConfigurationAttributes. Thus, when a
      ContextLoader (or SmartContextLoader) attempts to detect default
      resource locations or configuration classes, it does so for the
      composed annotation class instead of for the declaring test class.
      
      This commit ensures that ContextLoaders are supplied the declaring test
      class instead of the composed annotation class in such use cases.
      
      Issue: SPR-11455
      78b69f5d
    • S
      Upgrade to TestNG 6.8.8 · 76cc6db5
      Sam Brannen 提交于
      Issue: SPR-11482
      76cc6db5