1. 16 Jul, 2018 6 commits
  2. 13 Jul, 2018 8 commits
  3. 12 Jul, 2018 4 commits
  4. 11 Jul, 2018 10 commits
  5. 10 Jul, 2018 9 commits
    • Johnny Lim's avatar
      Fix parameter order for RequestMatcherAssert.doesNotMatch() · f94ce495
      Johnny Lim authored
      Closes gh-13707
      f94ce495
    • Stephane Nicoll's avatar
    • Stephane Nicoll's avatar
      Detect DispatcherServlets registered via ServletRegistrationBean · 3423c5dd
      Stephane Nicoll authored
      Previously, when a DispatcherServlet was registered via a
      ServletRegistrationBean, the mappings endpoint did not expose any
      information about it as it wasn't detected.
      
      This commit fixes the detection of available DispatcherServlets in the
      context so that the mappings endpoint include them all.
      
      Closes gh-13186
      3423c5dd
    • Stephane Nicoll's avatar
      Merge pull request #13545 from izeye:fix-traceable-query-string · dd2b0eb7
      Stephane Nicoll authored
      * pr/13545:
        Fix query string encoding in TraceableHttpServletRequest
      dd2b0eb7
    • Johnny Lim's avatar
      Fix query string encoding in TraceableHttpServletRequest · 46e6aa59
      Johnny Lim authored
      Closes gh-13545
      46e6aa59
    • Stephane Nicoll's avatar
      Merge pull request #13710 from izeye:get-url-mappings · 419bf0d1
      Stephane Nicoll authored
      * pr/13710:
        Separate logging from getUrlMappings()
      419bf0d1
    • Johnny Lim's avatar
      Separate logging from getUrlMappings() · 0de83179
      Johnny Lim authored
      Closes gh-13710
      0de83179
    • Andy Wilkinson's avatar
      Merge branch '1.5.x' into 2.0.x · 57e2bb9c
      Andy Wilkinson authored
      57e2bb9c
    • Andy Wilkinson's avatar
      Avoid overriding beans and ensure import order is used for DataSource · 73a08dd6
      Andy Wilkinson authored
      During processing of a configuration class, the class's complete
      hierarchy is processed and during the processing of each class its
      member classes are processed. Previously, each pool-specific
      inner-class of DataSourceConfiguration extended the abstract outer
      class. This meant that when the import from
      DataSourceAutoConfiguration.PooledDataSourceConfiguration caused the
      first pool-specific inner-class to be  processed,
      DataSourceConfiguration would be processed as it was the inner-class's
      superclass. In turn all of DataSourceConfiguration's member classes
      would then be processed. This caused the first import (of
      DataSourceConfiguration.Tomcat) to trigger processing of all of the
      other pool-specific inner-classes in whatever order they were found
      rather than them being processed in the order in which they are
      imported by DataSourceAutoConfiguration.PooledDataSourceConfiguration.
      
      Another part of the problem was that none of the pool-specific
      inner-classes were conditional on a missing DataSource bean. This
      meant that, when multiple pools were on the classpath, each class
      after the first would override the previous class's definition of the
      DataSource bean.
      
      This commit updates each of the pool-specific inner-classes so that
      they no longer extend DataSourceConfiguration. This ensures that
      the inner classes are processed in the order defined in the import
      on PooledDataSourceConfiguration. Each of the classes has also been
      annotated with @ConditionalOnMissingBean(DataSource.class). This
      prevents the DataSource bean definition from being overridden and
      ensures that the order of precedence for the pool that will be used
      is as defined in the import.
      
      Closes gh-13737
      73a08dd6
  6. 09 Jul, 2018 3 commits