1. 02 Feb, 2017 2 commits
    • Andy Wilkinson's avatar
      Merge branch '1.4.x' into 1.5.x · b9b0cdb3
      Andy Wilkinson authored
      b9b0cdb3
    • Andy Wilkinson's avatar
      Apply root to URIs directly rather than relying on expansion · 2f50d515
      Andy Wilkinson authored
      Previously, TestRestTemplate applied the root URI to URIs by
      converting them to a String and then passing the String to the
      RestTemplate delegate. Being a String, meant that the URI passed
      through RestTemplate's standard URI template expansion processing
      using the configured UriTemplateHandler. While this caused the root
      URI to be applied, it also had the unwanted side-effect of
      encoding the URI for a second time.
      
      This commit updates TestRestTemplate so that, when configured with a
      RootUriTemplateHandler, it applies the root URI directly and then
      passes a modified URI to the RestTemplate delegate. Being a URI means
      that no template expansion is performed and the possible double
      encoding is avoided.
      
      Closes gh-8163
      2f50d515
  2. 01 Feb, 2017 7 commits
  3. 31 Jan, 2017 1 commit
    • Phillip Webb's avatar
      Ensure `JmxEndpoint` beans get context object IDs · 21234b36
      Phillip Webb authored
      Update `EndpointMBeanExporter` to ensure that `JmxEndpoint` as well
      as regular `Endpoint` beans are considered when searching the parent
      context.
      
      Prior to this commit if the same `JmxEndpoint` was registered in the
      both the child and parent context then the `context=` element of the
      name wasn't added.
      
      Fixes gh-8152
      21234b36
  4. 30 Jan, 2017 6 commits
  5. 28 Jan, 2017 4 commits
    • Phillip Webb's avatar
      Merge pull request #7948 from szantopeter/master · 1c75d002
      Phillip Webb authored
      * pull7948:
        Document AWS Elastic Beanstalk deployment
      1c75d002
    • Peter Szanto's avatar
      Document AWS Elastic Beanstalk deployment · 14bd404b
      Peter Szanto authored
      Update the reference documentation to include details of Amazon
      Elastic Beanstalk.
      
      Closes gh-7948
      14bd404b
    • Phillip Webb's avatar
      Refine ImportsContextCustomizer cache logic · fa6a1385
      Phillip Webb authored
      Update `ImportsContextCustomizer` so that whenever possible a more
      specific cache key is used.
      
      Prior to this commit the customizer would generate a key based on *all*
      annotations on the test class. This has repeatedly caused issues where
      test classes that should have the same cache key did not due to
      unrelated annotations.
      
      A new `DeterminableImports` interface has been added that can be
      implemented by `ImportSelector` and `ImportBeanDefinitionRegistrar`
      implementations that are able to determine their imports early. The
      existing `ImportAutoConfigurationImportSelector` and
      `AutoConfigurationPackages` classes have been retrofitted with
      this interface.
      
      Fixes gh-7953
      fa6a1385
    • Phillip Webb's avatar
      Fix TypeExcludeFiltersContextCustomer key · aaf118c5
      Phillip Webb authored
      Update `TypeExcludeFiltersContextCustomer` to use filter instances
      as part of the key, rather than class references. In order to be used
      in tests, `TypeExcludeFilter` implementations must now implement valid
      `hashCode` and `equals` methods.
      
      Fixes gh-8125
      aaf118c5
  6. 26 Jan, 2017 20 commits