1. 10 6月, 2014 3 次提交
    • S
      polishing · c7b10657
      Stephane Nicoll 提交于
      Reorganized class structure to match our code style (setter for
      properties at the top of the class, public method before private
      implementation).
      
      Removed DisposableBean as it the lifecycle is already taking care
      of removing MBeans on stop.
      
      Cleaned test suite
      
      Issue: SPR-8045
      c7b10657
    • M
      Using SmartLifecycle to register MBeans · 2ede219e
      Marten Deinum 提交于
      Prior to this commit, MBeans were registered in a post construct
      call of MBeanExporter. This commit moves that logic after the
      initialization phase using the SmartLifecycle callback.
      
      Issue: SPR-8045
      2ede219e
    • R
      Allow custom UrlPathHelper for WebSocket requests · fc91add3
      Rossen Stoyanchev 提交于
      Issue: SPR-117711
      fc91add3
  2. 09 6月, 2014 2 次提交
    • R
      Polish MappingJackson2JsonView · 0cb6f8c8
      Rossen Stoyanchev 提交于
      0cb6f8c8
    • S
      Add JSONP support to MappingJackson2JsonView · 5dc27ee1
      Sebastien Deleuze 提交于
      Enable JSONP support by wrapping the JSON output into
      a callback when a JSONP query parameter specifying the
      function name to use as callback is detected.
      
      Default query parameter names recognized as JSONP ones
      are "jsonp" and "callback". This list can be customized if
      needed.
      
      This commit also fixes JSONView support by removing
      the view name specified in the model from the output.
      
      Issue: SPR-8346
      5dc27ee1
  3. 08 6月, 2014 2 次提交
    • R
      Add dependency ordering for @ModelAttribute methods · 56a82c1c
      Rossen Stoyanchev 提交于
      Before this change @ModelAttribute methods were not invoked in any
      particular order other than ensuring global @ControllerAdvice methods
      are called first and local @Controller methods second.
      
      This change introduces a simple algorithm that selects the next
      @ModelAttribute method to invoke by making a pass over all methods and
      looking for one that has no dependencies (i.e. @ModelAttribute
      input arguments) or has all dependencies resolved (i.e. available in
      the model). The process is repeated until no more @ModelAttribute
      methods remain.
      
      If the next @ModelAttribute method cannot be determined because all
      remaining methods have unresolved dependencies, the first available
      method is picked anyway just as before, i.e. with required
      dependencies created through the default constructor.
      
      Examples in ModelFactoryOrderingTests.
      
      Issue: SPR-6299
      56a82c1c
    • R
      Polish ModelFactory · e374769e
      Rossen Stoyanchev 提交于
      e374769e
  4. 07 6月, 2014 6 次提交
  5. 06 6月, 2014 12 次提交
    • R
      Improve no content handling in MockHttpServletRequest · c269d27b
      Rossen Stoyanchev 提交于
      Issue: SPR-11764
      c269d27b
    • R
      Update Javadoc on SockJS client library URL · 9706e5cc
      Rossen Stoyanchev 提交于
      Issue: SPR-11766
      9706e5cc
    • J
      Support for java.util.Optional within ObjectFactory/Provider · 5cb3f8ea
      Juergen Hoeller 提交于
      Includes support for arbitrary deep nesting levels in DependencyDescriptor's getDependencyType() and MethodParameter's getNestedParameterType().
      
      Issue: SPR-11833
      5cb3f8ea
    • J
      Support for Java 8's java.util.Optional at injection points · 7d03daf8
      Juergen Hoeller 提交于
      Issue: SPR-11833
      7d03daf8
    • J
      ConfigurationClassParser falls back to ASM-based resolution of member classes... · 6aa9c405
      Juergen Hoeller 提交于
      ConfigurationClassParser falls back to ASM-based resolution of member classes in case of NoClassDefFoundError
      
      Issue: SPR-11844
      6aa9c405
    • S
      Merge pull request #558 from VasylTretiakov/patch01 · bb8d0f17
      Stephane Nicoll 提交于
      * patch01:
        Reference manual polishing
      bb8d0f17
    • V
      Reference manual polishing · abc37760
      Vasyl Tretiakov 提交于
      abc37760
    • S
      Polish Javadoc for TestContextTransactionUtils · f48bdafd
      Sam Brannen 提交于
      f48bdafd
    • S
      Polish Eclipse import script · 56ad0cf3
      Sam Brannen 提交于
      56ad0cf3
    • S
      Update regarding tested versions of Eclipse & STS · f2c37fcd
      Sam Brannen 提交于
      f2c37fcd
    • S
      Merge pull request #557 from sbrannen/SPR-7655 · ae29f48f
      Sam Brannen 提交于
      Introduce annotation to execute SQL scripts in the TCF
      ae29f48f
    • S
      Introduce annotation to execute SQL scripts in the TCF · 5fd6ebb5
      Sam Brannen 提交于
      Prior to this commit, it was possible to execute SQL scripts
      programmatically via ResourceDatabasePopulator, JdbcTestUtils, and
      ScriptUtils. Furthermore, it was also possible to execute SQL scripts
      declaratively via the <jdbc> XML namespace. However, it was not
      possible to execute SQL scripts declaratively on a per test class or
      per test method basis.
      
      This commit makes it possible to declaratively configure SQL scripts
      for execution in integration tests via annotations that can be declared
      at the class or method level. Details follow.
      
       - Introduced a repeatable @DatabaseInitializer annotation that can be
         used to configure SQL scripts at the class or method level with
         method-level overrides. @DatabaseInitializers serves as a container
         for @DatabaseInitializer.
      
       - Introduced a new DatabaseInitializerTestExecutionListener that is
         responsible for parsing @DatabaseInitializer and
         @DatabaseInitializers and executing SQL scripts.
      
       - DatabaseInitializerTestExecutionListener is registered by default in
         abstract base test classes as well as in TestContextBootstrapper
         implementations.
      
       - @DatabaseInitializer and @DatabaseInitializers may be used as
         meta-annotations; however, attribute overrides are not currently
         supported for repeatable annotations used as meta-annotations. This
         is a known limitation of Spring's AnnotationUtils.
      
       - The semantics for locating SQL script resources is consistent with
         @ContextConfiguration's semantics for locating XML configuration
         files. In addition, a default SQL script can be detected based
         either on the name of the annotated class or on the name of the
         annotated test method.
      
       - @DatabaseInitializer allows for specifying which DataSource and
         PlatformTransactionManager to use from the test's
         ApplicationContext, including default conventions consistent with
         TransactionalTestExecutionListener and @TransactionConfiguration.
      
       - @DatabaseInitializer supports all of the script configuration options
         currently supported by ResourceDatabasePopulator.
      
       - @DatabaseInitializer and DatabaseInitializerTestExecutionListener
         support execution phases for scripts that dictate when SQL scripts
         are executed (i.e., before or after a test method).
      
       - SQL scripts can be executed within the current test's transaction if
         present, outside of the current test's transaction if present, or
         always in a new transaction, depending on the value of the boolean
         requireNewTransaction flag in @DatabaseInitializer.
      
       - DatabaseInitializerTestExecutionListener delegates to
         ResourceDatabasePopulator#execute to actually execute the scripts.
      
      Issue: SPR-7655
      5fd6ebb5
  6. 05 6月, 2014 7 次提交
  7. 04 6月, 2014 1 次提交
  8. 02 6月, 2014 2 次提交
    • S
      Clarify the use of sessionTransacted · 674bad4c
      Stephane Nicoll 提交于
      This commit clarifies the role of the external transactionManager for
      a DMLC and the relationship with the sessionTransacted flag
      
      Issue: SPR-9200
      674bad4c
    • S
      Cache operation invocation hook point · aaae10ce
      Stephane Nicoll 提交于
      This commit adds a invokeOperation protected method in case one
      needs a hook point in the way the underlying cache method is invoked,
      and how exceptions that might be thrown by that invocation are handled.
      
      Issue: SPR-11540
      aaae10ce
  9. 31 5月, 2014 5 次提交