Commit Graph

158 Commits

Author SHA1 Message Date
Phillip Webb
6d01bc915b Make intermediate classes of public classes public
Backport gh-12590 to 1.5.x and also pick up a few classes that were
missed. This commit also makes a few properties bound classes public.

Closes gh-17337
2019-06-28 12:18:07 -07:00
Andy Wilkinson
8f1be4cded Upgrade to spring-javaformat 0.0.11 2019-06-07 09:44:58 +01:00
Phillip Webb
a99131f727 Polish resource files to all end with a new line 2019-06-04 00:52:45 -07:00
Phillip Webb
2ff74b1559 Reformat code with spring-javaformat 0.0.8
See gh-16418
2019-04-02 13:30:25 -07:00
Andy Wilkinson
94633cfd89 Merge branch '1.4.x' into 1.5.x 2019-03-27 14:04:32 +00:00
Spring Operator
189eeefbb1 Use HTTPS for external links wherever possible
See gh-16317
2019-03-27 12:30:55 +00:00
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
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
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
Andy Wilkinson
da1a17e8b2 Stop adding filters with disabled registrations to MockMvc
Closes gh-14636
2018-10-01 13:30:33 +01:00
Phillip Webb
9543fcf44d Upgrade to spring-javaformat 0.0.6 2018-08-30 15:59:27 -07: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
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
Andy Wilkinson
5bbd31e7a3 Rename test classes so that their tests are run by Maven 2018-01-05 11:49:39 +00:00
dreis2211
27d569e25e Fix typos in AutoConfigureRestDocs
Closes gh-10810
2017-10-29 14:01:25 +01: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
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
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
Phillip Webb
ad38776de3 Polish 2017-04-04 09:48:10 -07:00
Madhura Bhave
f73714bdcc Do not filter HttpMessageConverters in WebMvcTest
Closes gh-8617
2017-03-23 14:21:04 -07:00
Phillip Webb
ca1540cefe Update header copyright for changed files 2017-02-27 20:41:18 -08:00
Andy Wilkinson
98a2ae3b91 Merge branch '1.4.x' into 1.5.x 2017-02-21 16:12:06 +00:00
Andy Wilkinson
1abd91dc23 Start building against Spring Framework 4.3.7 snapshots
See gh-8248
2017-02-20 14:05:04 +00:00
Johnny Lim
0adab8a2be Use logical 'and' instead of bitwise 'and'
Closes gh-8198
2017-02-06 10:35:13 +01:00
Johnny Lim
846994e498 Polish
Closes gh-8148
2017-02-01 09:07:47 +01:00
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
2017-01-27 17:19:52 -08:00
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
2017-01-27 17:18:58 -08:00
Phillip Webb
2c89d9918f Relocate AutoConfigurations from root package
Move PropertyPlaceholder and MessageSource auto-configuration from the
root package to the `context` subpackage.

Fixes gh-8071
2017-01-23 17:32:45 -08:00
Phillip Webb
5703fb1515 Polish 2017-01-23 16:03:59 -08:00
Stephane Nicoll
915c959a28 Polish contribution
Closes gh-7600
2017-01-20 16:40:48 +01:00
Michael J. Simons
8648520876 Add slide test annotation for MongoDB
This commits adds a slice test infrastructure for MongoDB, similar to
what `@DataJpaTest` does with JPA.

By default, an embedded Mongod process is used if available.

See gh-7600
2017-01-20 16:40:47 +01:00
Phillip Webb
f3cd0ad22c Polish 2017-01-19 12:44:57 -08:00
Phillip Webb
655fa59db0 Merge branch '1.4.x' into 1.5.x 2017-01-19 12:33:42 -08:00