Commit Graph

187 Commits (ac84f76e088879a7273e71218ec9c944cc6841a7)

Author SHA1 Message Date
Stephane Nicoll 329a6905d8 Polish "Permit use of @JsonTest without Jackson"
Closes gh-16070
6 years ago
fidel 36f7188334 Permit use of @JsonTest without Jackson
See gh-16070
6 years ago
Spring Buildmaster b04710d744 Next development version 6 years ago
Spring Buildmaster 9bb64a3493 Next Development Version 6 years ago
Phillip Webb 79b5dd3ae7 Protect against NPE when collecting annotations
Update `AnnotationsPropertySource` to ensure that `null` results from
`findMergedAnnotation` are not added to the annotation list.

Prior to this commit, if `findMergedAnnotation` returned `null` then
`AnnotationsPropertySource.collectProperties` would throw an NPE.
Although `findMergedAnnotation` should never return `null`, we're
best off being defensive so that bugs such as SPR-17495 won't cause
problems.

Closes gh-15175
6 years ago
Spring Buildmaster 4d24feb443 Next development version 6 years ago
Andy Wilkinson da1a17e8b2 Stop adding filters with disabled registrations to MockMvc
Closes gh-14636
6 years ago
Spring Buildmaster 46df506b0a Next development version 6 years ago
Phillip Webb 9543fcf44d Upgrade to spring-javaformat 0.0.6 6 years ago
Spring Buildmaster 73bf744cb0 Next Development Version 6 years ago
Spring Buildmaster 36b8639853 Next Development Version 7 years ago
Spring Buildmaster 010b4fccbd Next development version 7 years ago
Phillip Webb 99dad81e9a Update copyright header year for changed files 7 years ago
Phillip Webb 3ee777e142 Polish ternary expressions
Consistently format ternary expressions and always favor `!=` as the
the check.
7 years ago
Spring Buildmaster c10aad165f Next Development Version 7 years ago
Spring Buildmaster ade4760842 Next Development Version 7 years ago
Phillip Webb a8f366a554 Fix copyright header for edited files 7 years ago
Stephane Nicoll b4a7e1d64b Use toLowerCase() and toUpperCase() with Locale.ENGLISH
This commit updates all `toLowerCase()` and `toUpperCase` invocations to
use the variant that takes a `Locale` to avoid locale-specific side
effect.

Closes gh-12213
7 years ago
Phillip Webb 798522d890 Format with Eclipse Oxygen SR2 7 years ago
Spring Buildmaster 6414b42335 Next Development Version 7 years ago
Andy Wilkinson 5bbd31e7a3 Rename test classes so that their tests are run by Maven 7 years ago
Spring Buildmaster df2ae7aa19 Next Development Version 7 years ago
dreis2211 27d569e25e Fix typos in AutoConfigureRestDocs
Closes gh-10810
7 years ago
Spring Buildmaster c0f9f64776 Next Development Version 7 years ago
Spring Buildmaster 30eb937a83 Next Development Version 7 years ago
Andy Wilkinson 7967c64d65 Avoid NPE in AnnotationsPropertySource if getAnnotations returns null
Closes gh-9914
7 years ago
Andy Wilkinson 25d0cc167e Polish "Avoid NPE in PropertyMappingContextCustomizer"
See gh-9914
7 years ago
Dennis Kieselhorst e7a6b8c260 Avoid NPE in PropertyMappingContextCustomizer
See gh-9914
7 years ago
Spring Buildmaster 17a5bb0be4 Next development version 7 years ago
Spring Buildmaster 41c5c0e7c9 Next development version 7 years ago
Phillip Webb b9cfe21193 Make @ImportAutoConfiguration not register package
Update `@ImportAutoConfiguration` so that it is no longer annotated with
`@AutoConfigurationPackage` and as such isn't a marker for
`AutoConfigurationPackages`.

Having `@ImportAutoConfiguration` marked as an auto-configuration
package is particularly problematic in tests since it frequently breaks
context caching.

Fixes gh-9282
7 years ago
Andy Wilkinson b7080ddec5 Polish "Ensure SpringBootDITEL fails with the original failure" 7 years ago
Danny Thomas 2c48087604 Ensure SpringBootDITEL fails with the original failure
See gh-9534
7 years ago
Phillip Webb aa57ca7e18 Polish 7 years ago
Andy Wilkinson 99d53a5980 Polish 8 years ago
Andy Wilkinson 0aa0fd0670 Ensure that Jackson and GSON are auto-configured by @AutoConfigureJsonTesters
Previously, @AutoConfigureJsonTesters only imported
JsonTestersAutoConfiguration and relied on something else pulling in
the Jackson and GSON auto-configuration upon which it depends. This
worked with @JsonTest which imported those auto-configurations. It
did not work with @SpringBootTest which would use
@EnableAutoConfiguration and the ordering was then wrong and
JsonTestersAutoConfiguration would be processed before the Jackson
and GSON auto-configurations had a chance to create the beans that
JsonTestersAutoConfiguration needs.

This commit updates the spring.factories configuration for
JsonTestersAutoConfiguration so that it imports
JacksonAutoConfiguration and GsonAutoConfiguration.
Appropriate @AutoConfigureAfter has also been added to
JsonTestersAutoConfiguration to ensure that it is considered after
JacksonAutoConfiguration and GsonAutoConfiguration.

Lastly, ExampleJsonApplication and associated classes have been moved
into an app sub-package to prevent its component scanning from
pulling in JsonTestersAutoConfiguration as if it were user
configuration.

Closes gh-9515
8 years ago
Andy Wilkinson 59122358d3 Clean up and format code 8 years ago
Spring Buildmaster 05d4d0281c Next Development Version 8 years ago
Spring Buildmaster 9768b0a8c2 Next Development Version 8 years ago
Phillip Webb 8eb79b3c0f Polish 8 years ago
Phillip Webb f46d799f31 Polish 8 years ago
Madhura Bhave 9e2d54feae Support json view with JacksonTester
Closes gh-8672
8 years ago
Stephane Nicoll 934d33685a Polish
See gh-8879
8 years ago
Phillip Webb ad38776de3 Polish 8 years ago
Madhura Bhave f73714bdcc Do not filter HttpMessageConverters in WebMvcTest
Closes gh-8617
8 years ago
Spring Buildmaster d23fa24340 Next Development Version 8 years ago
Phillip Webb ca1540cefe Update header copyright for changed files 8 years ago
Andy Wilkinson 98a2ae3b91 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 1abd91dc23 Start building against Spring Framework 4.3.7 snapshots
See gh-8248
8 years ago
Johnny Lim 0adab8a2be Use logical 'and' instead of bitwise 'and'
Closes gh-8198
8 years ago