Commit Graph

10747 Commits (aa19cad77099d5730fe1bfd889ba0d0f71ec7ed3)
 

Author SHA1 Message Date
Andy Wilkinson aa19cad770 Merge branch '1.5.x' 8 years ago
Andy Wilkinson b9b0cdb342 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 2f50d515a1 Apply root to URIs directly rather than relying on expansion
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
8 years ago
Andy Wilkinson 07c39f1c62 Upgrade to AssertJ 3.6.2
Closes gh-8182
8 years ago
Andy Wilkinson 77b5c63ec0 Build against SI 5.0.0 snapshots in preparation for M3
See gh-8180
8 years ago
Andy Wilkinson 071668a2e6 Start building against Spring Kafka 2.0 snapshots
See gh-8179
8 years ago
Stephane Nicoll 10ca22082b Polish
See gh-8148
8 years ago
Stephane Nicoll 5c663a9ece Merge branch '1.5.x' 8 years ago
Stephane Nicoll 9b952dd3a8 Merge pull request #8148 from izeye:polish-20170131
* pr/8148:
  Polish
8 years ago
Johnny Lim 846994e498 Polish
Closes gh-8148
8 years ago
Stephane Nicoll eca61af8b1 Merge pull request #8161 from izeye:clean-system-property
* pr/8161:
  Clear system property in SpringApplicationTests
8 years ago
Johnny Lim cedc4cd9f4 Clear system property in SpringApplicationTests
See gh-8101
Closes gh-8161
8 years ago
Stephane Nicoll 715f8d7436 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 8a0f8cf953 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 7e44029224 Merge pull request #8157 from rajadilipkolli:patch-1
* pr/8157:
  Polish contribution
  Update copyright header
8 years ago
Stephane Nicoll b9ede6b281 Polish contribution
Closes gh-8157
8 years ago
Raja Kolli a1c601ca28 Update copyright header
See gh-8157
8 years ago
Phillip Webb eb4803832b Merge branch '1.5.x' 8 years ago
Phillip Webb 4fa38aeba4 Consider hierarchy when searching for @Validated
Update `ConfigurationPropertiesBindingPostProcessor` to use a more
exhaustive hierarchy search when checking for `@Validated`.

Fixes gh-8150
8 years ago
Phillip Webb 36c1db0223 Merge branch '1.5.x' 8 years ago
Phillip Webb 21234b36de Ensure `JmxEndpoint` beans get context object IDs
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
8 years ago
Brian Clozel 1709a3ad96 Adapt to Assert.instanceOf changes
Since SPR-15196, the behavior of `Assert` methods changed and some were
deprecated. This commit adapts to the new error mechanism implemented in
`Assert.instanceOf`.

Fixes gh-8140
8 years ago
Brian Clozel 7f39d5a865 Remove usage of Assert.notNull(Object)
This commit updates the Spring Boot codebase to adapt to the removal of
`Assert.notNull(Object)` in SPR-15196.

See gh-8140
8 years ago
Madhura Bhave 29dc6a973c Merge branch '1.5.x' 8 years ago
Madhura Bhave 5dafa3ae9c Fixup version numbers following release 8 years ago
Andy Wilkinson 95f659f4f9 Add new WebApplicationType enum to pave the way for Web Flux support
Closes gh-8077
8 years ago
Spring Buildmaster 5c12500366 Next Development Version 8 years ago
Andy Wilkinson 4e3d606fad Merge pull request #7744 from Artem Bilan
* gh-7744:
  Make use of new extensions point in IntegrationComponentScanRegistrar
8 years ago
Artem Bilan eccefd1343 Make use of new extensions point in IntegrationComponentScanRegistrar
SI 5 has made IntegrationComponentScanRegistrar more extensible by
offering a method for getting the back packages that can be
overridden.

This commit takes advantage of that change by removing our creation
of "fake" annotation metadata and overriding getBackPackages to return
the auto-configuration packages instead.

Closes gh-7744
8 years ago
Andy Wilkinson c00638fee3 Remove Thymeleaf's layout dialect from its starter and update samples
Closes gh-7557
8 years ago
Andy Wilkinson 9a7e5caea7 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 20c1370107 Correct the scope of the spring-boot-test-support dependency
Closes gh-8136
8 years ago
Andy Wilkinson d9f4f51e5b Merge branch '1.5.x' 8 years ago
Andy Wilkinson a9656145de Fix up version numbers following release 8 years ago
Spring Buildmaster a2696bf873 Next Development Version 8 years ago
Andy Wilkinson 95ccd760ae Merge pull request #5344 from Eddú Meléndez
* gh-5344:
  Polish "Upgrade to Flyway 4.0"
  Upgrade to Flyway 4.0
8 years ago
Andy Wilkinson 4ea7dc6f31 Polish "Upgrade to Flyway 4.0"
See gh-5344
8 years ago
Eddú Meléndez a270c13d6f Upgrade to Flyway 4.0
Closes gh-5344
8 years ago
Andy Wilkinson 15639d39b0 Merge branch '1.5.x' 8 years ago
Andy Wilkinson dd4051686b Remove empty test
The caching behaviour when using ImportAutoConfiguration is covered
by tests in spring-boot-test-auto-configuration, specifically by
ImportsContextCustomizerFactoryWithAutoConfigurationTests.

See gh-7953
8 years ago
Stephane Nicoll 784c08514d Merge pull request #8132 from royclarkson:mobile-version
* pr/8132:
  Upgrade to Spring Mobile 2.0.0.M1
8 years ago
Roy Clarkson 868be078f1 Upgrade to Spring Mobile 2.0.0.M1
Closes gh-8132
8 years ago
Andy Wilkinson 74510bd844 Make GroovyBeanDefinitionSource accessible to the CLI again
It was made package-private in 31b0e817 but it needs to be protected
due to its use in the CLI's GroovyBeansTransformation.
8 years ago
Phillip Webb 8747e039ee Merge branch '1.5.x' 8 years ago
Phillip Webb 1c75d002c3 Merge pull request #7948 from szantopeter/master
* pull7948:
  Document AWS Elastic Beanstalk deployment
8 years ago
Peter Szanto 14bd404b71 Document AWS Elastic Beanstalk deployment
Update the reference documentation to include details of Amazon
Elastic Beanstalk.

Closes gh-7948
8 years ago
Phillip Webb fa6a138598 Refine ImportsContextCustomizer cache logic
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
8 years ago
Phillip Webb aaf118c544 Fix TypeExcludeFiltersContextCustomer key
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
8 years ago
Andy Wilkinson f69c994df5 Merge pull request #6857 from Eddú Meléndez
* gh-6857:
  Add @FunctionalInterface to remaining public and protected interfaces
  Annotate interfaces with @FunctionaInterface
8 years ago
Andy Wilkinson 31b0e81765 Add @FunctionalInterface to remaining public and protected interfaces
See gh-6857
8 years ago