Commit Graph

195 Commits

Author SHA1 Message Date
Andy Wilkinson
4b6bddd476 Merge branch '1.4.x' into 1.5.x 2019-03-20 16:30:04 +00:00
Andy Wilkinson
6920c39349 Merge branch '1.3.x' into 1.4.x 2019-03-20 15:06:50 +00:00
Spring Operator
991ba550d3 Update build and setup configuration to use HTTPS
See gh-16245
2019-03-19 16:48:30 +00:00
Spring Operator
e2837843e1 Update build and setup configuration to use HTTPS
See gh-16244
2019-03-19 16:44:10 +00:00
Andy Wilkinson
821ee0cf83 Ensure that @Bean methods are only declared on @Configuration classes
Closes gh-16190
2019-03-11 15:01:59 +00:00
Stephane Nicoll
329a6905d8 Polish "Permit use of @JsonTest without Jackson"
Closes gh-16070
2019-03-04 14:48:39 +01:00
fidel
36f7188334 Permit use of @JsonTest without Jackson
See gh-16070
2019-03-04 14:48:12 +01:00
Spring Buildmaster
b04710d744 Next development version 2019-01-11 15:59:00 +00:00
Spring Buildmaster
9bb64a3493 Next Development Version 2018-11-29 09:52:39 +00:00
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
2018-11-14 15:50:53 -08:00
Spring Buildmaster
4d24feb443 Next development version 2018-10-16 08:44:44 +00:00
Andy Wilkinson
da1a17e8b2 Stop adding filters with disabled registrations to MockMvc
Closes gh-14636
2018-10-01 13:30:33 +01:00
Spring Buildmaster
46df506b0a Next development version 2018-09-11 14:24:40 +00:00
Phillip Webb
9543fcf44d Upgrade to spring-javaformat 0.0.6 2018-08-30 15:59:27 -07:00
Spring Buildmaster
73bf744cb0 Next Development Version 2018-07-30 13:37:38 +00:00
Spring Buildmaster
36b8639853 Next Development Version 2018-06-14 10:05:31 +00:00
Spring Buildmaster
010b4fccbd Next development version 2018-05-09 09:31:46 +00:00
Phillip Webb
99dad81e9a Update copyright header year for changed files 2018-05-04 12:15:13 -07:00
Phillip Webb
3ee777e142 Polish ternary expressions
Consistently format ternary expressions and always favor `!=` as the
the check.
2018-05-03 09:46:15 -07:00
Spring Buildmaster
c10aad165f Next Development Version 2018-04-09 23:14:33 +00:00
Spring Buildmaster
ade4760842 Next Development Version 2018-04-05 09:01:52 +00:00
Phillip Webb
a8f366a554 Fix copyright header for edited files 2018-03-16 15:07:23 -07:00
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
2018-02-26 17:49:03 +01:00
Phillip Webb
798522d890 Format with Eclipse Oxygen SR2 2018-02-08 15:46:49 -08:00
Spring Buildmaster
6414b42335 Next Development Version 2018-01-30 23:29:33 +00:00
Andy Wilkinson
5bbd31e7a3 Rename test classes so that their tests are run by Maven 2018-01-05 11:49:39 +00:00
Spring Buildmaster
df2ae7aa19 Next Development Version 2017-11-28 09:55:46 +00:00
dreis2211
27d569e25e Fix typos in AutoConfigureRestDocs
Closes gh-10810
2017-10-29 14:01:25 +01:00
Spring Buildmaster
c0f9f64776 Next Development Version 2017-10-16 12:36:43 +00:00
Spring Buildmaster
30eb937a83 Next Development Version 2017-09-12 10:54:22 +00:00
Andy Wilkinson
7967c64d65 Avoid NPE in AnnotationsPropertySource if getAnnotations returns null
Closes gh-9914
2017-08-09 11:42:38 +01:00
Andy Wilkinson
25d0cc167e Polish "Avoid NPE in PropertyMappingContextCustomizer"
See gh-9914
2017-08-09 11:41:39 +01:00
Dennis Kieselhorst
e7a6b8c260 Avoid NPE in PropertyMappingContextCustomizer
See gh-9914
2017-08-09 11:40:41 +01:00
Spring Buildmaster
17a5bb0be4 Next development version 2017-07-27 08:00:21 +00:00
Spring Buildmaster
41c5c0e7c9 Next development version 2017-07-26 08:30:55 +00:00
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
2017-07-24 12:54:24 -07:00
Andy Wilkinson
b7080ddec5 Polish "Ensure SpringBootDITEL fails with the original failure" 2017-07-24 11:37:40 +01:00
Danny Thomas
2c48087604 Ensure SpringBootDITEL fails with the original failure
See gh-9534
2017-07-24 11:23:16 +01:00
Phillip Webb
aa57ca7e18 Polish 2017-07-06 16:53:04 -07:00
Andy Wilkinson
99d53a5980 Polish 2017-06-23 16:59:24 -07:00
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
2017-06-23 14:44:08 -07:00
Andy Wilkinson
59122358d3 Clean up and format code 2017-06-16 08:58:14 +01:00
Spring Buildmaster
05d4d0281c Next Development Version 2017-06-08 12:47:16 +00:00
Spring Buildmaster
88e43c8421 Next Development Version 2017-06-08 09:52:43 +00:00
Spring Buildmaster
9768b0a8c2 Next Development Version 2017-04-21 08:32:01 +00:00
Spring Buildmaster
d719d2cbbc Next Development Version 2017-04-20 12:46:19 +00:00
Phillip Webb
8eb79b3c0f Polish 2017-04-18 11:13:12 -07:00
Phillip Webb
f46d799f31 Polish 2017-04-17 22:08:51 -07:00
Madhura Bhave
9e2d54feae Support json view with JacksonTester
Closes gh-8672
2017-04-17 11:14:26 -07:00
Stephane Nicoll
934d33685a Polish
See gh-8879
2017-04-11 09:40:54 +02:00