1. 16 6月, 2015 12 次提交
  2. 15 6月, 2015 8 次提交
  3. 14 6月, 2015 2 次提交
    • S
      Polish Javadoc for @TransactionConfiguration · ea9d7aa3
      Sam Brannen 提交于
      ea9d7aa3
    • S
      Revise method and parameter names in annotation support · 32c17bf5
      Sam Brannen 提交于
      In AnnotatedElementUtils, all methods pertaining to merging annotation
      attributes have been renamed to "getMerged*()" and "findMerged*()"
      accordingly. Existing methods such as getAnnotationAttributes(..) have
      been deprecated in favor of the more descriptive "merged" variants.
      This aligns the naming conventions in AnnotatedElementUtils with those
      already present in AnnotationReadingVisitorUtils.
      
      The use of "annotationType" as a variable name for the fully qualified
      class name of an annotation type has been replaced with
      "annotationName" in order to improve the readability and intent of the
      code base.
      
      In MetaAnnotationUtils.AnnotationDescriptor, getMergedAnnotation() has
      been renamed to synthesizeAnnotation(), and the method is now
      overridden in UntypedAnnotationDescriptor to always throw an
      UnsupportedOperationException in order to avoid potential run-time
      ClassCastExceptions.
      
      Issue: SPR-11511
      32c17bf5
  4. 13 6月, 2015 9 次提交
  5. 12 6月, 2015 1 次提交
    • S
      Proper support for Root WAC in Spring MVC Test · f6d2fe47
      Sam Brannen 提交于
      The modifications to DefaultMockMvcBuilder performed in conjunction
      with SPR-12553 introduced a breaking change: the WebApplicationContext
      supplied to DefaultMockMvcBuilder's constructor was *always* stored in
      the ServletContext as the root WebApplicationContext, overwriting a
      root WebApplicationContext that had been set by the user or by the
      Spring TestContext Framework (TCF) -- for example, in
      AbstractGenericWebContextLoader. Consequently, the changes in SPR-12553
      cause tests that use @ContextHierarchy to fail if web components rely
      on the correct WebApplicationContext being stored under the
      WebApplicationContext#ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE key.
      
      This commit reverts the breaking changes introduced in SPR-12553: if
      the root WebApplicationContext has already been set in the
      ServletContext of the WebApplicationContext supplied to
      DefaultMockMvcBuilder, no action is taken.
      
      Furthermore, this commit introduces new code to address the initial
      intent of SPR-12553. Specifically, if the root WebApplicationContext
      has NOT been set in the ServletContext of the WebApplicationContext
      supplied to DefaultMockMvcBuilder, the application context hierarchy
      will be traversed in search of the root WebApplicationContext, and the
      root WebApplicationContext will then be stored under the
      ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE key.
      
      Issue: SPR-13075, SPR-12553
      f6d2fe47
  6. 11 6月, 2015 8 次提交