Commit Graph

409 Commits

Author SHA1 Message Date
Stephane Nicoll 585135a280 Polish 2018-05-22 13:40:40 +02:00
Stephane Nicoll d5abd57a91 Remove deprecated use of spring.main.web-environment
Closes gh-13231
2018-05-22 13:39:02 +02:00
Stephane Nicoll a124379dd9 Remove use of deprecated `web` methods
Closes gh-13231
2018-05-22 12:51:06 +02:00
Phillip Webb 2dc4f1df00 Polish 2018-05-21 21:32:42 -07:00
Stephane Nicoll 300f6bf4d7 Polish contribution
Closes gh-13208
2018-05-18 14:20:31 +02:00
Johnny Lim 75639aa682 Polish
Closes gh-13192
2018-05-17 15:29:50 +02:00
Andy Wilkinson 73e525a280 Merge branch '1.5.x' into 2.0.x 2018-05-14 20:07:46 +01:00
Stephane Nicoll 8f53c2e2bb Support for custom comment prefix
Some Quartz initialization scripts have comments in a different format.

This commit introduces a `comment-prefix` property that should be set by
the user if their target database has a script that contains those
unusual comments.

Closes gh-13041
2018-05-14 09:32:42 +02:00
Johnny Lim 3dd2f5bb05 Polish
See gh-13148
2018-05-14 08:19:10 +02:00
Andy Wilkinson 3992dacdc8 Bind empty string to empty collection or array of rich types
Previously, when an empty String was bound to a collection or
array of rich types it would fail as there was no converter capable
of creating a Collection<RichType> or RichType[] from the String.

This commit updates IndexedElementsBinder to apply special treatment
to empty String values. Now, when such a value is being processed,
an empty Collection or array is the result.

Closes gh-12965
2018-05-11 16:41:37 +01:00
Andy Wilkinson 45f4e8795e Merge branch '1.5.x' into 2.0.x 2018-05-11 13:32:08 +01:00
dreis2211 e6a23fa3ff Remove unnecessary semicolons
Closes gh-13144
2018-05-11 14:23:47 +02:00
Andy Wilkinson 972d952716 Merge branch '1.5.x' into 2.0.x 2018-05-11 11:54:12 +01:00
Johnny Lim 75e591e76e Polish
Closes gh-13130
2018-05-11 10:00:15 +02:00
Andy Wilkinson fbf974478a Merge branch '1.5.x' into 2.0.x 2018-05-10 15:46:28 +01:00
Stephane Nicoll 9dccf5b895 Polish
See gh-13078
2018-05-07 14:48:56 +02:00
dreis2211 e3862d9bdf Fix deprecation warning in OriginTrackedYamlLoader
Closes gh-13085
2018-05-07 14:38:22 +02:00
Phillip Webb 5b3cb8a698 Update copyright header year for changed files 2018-05-04 15:59:26 -07:00
Phillip Webb 57bfbfb3ad Fix checkstyle errors 2018-05-04 15:58:59 -07:00
Phillip Webb 6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00
Phillip Webb 41efea51a7 Polish ternary expressions
Consistently format ternary expressions and always favor `!=` as the
the check.
2018-05-03 22:43:12 -07:00
Phillip Webb bbf94c22da Polish 2018-05-03 22:42:49 -07:00
Phillip Webb e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Johnny Lim e7d2f22911 Polish IgnoreTopLevelConverterNotFoundBindHandlerTests
Closes gh-13022
2018-05-02 16:12:37 +02:00
Johnny Lim 12cdc8b0e0 Fix @since for IgnoreTopLevelConverterNotFoundBindHandler
Closes gh-13019
2018-05-02 16:11:37 +02:00
Andy Wilkinson f019d5c85b Merge branch '1.5.x' into 2.0.x 2018-05-02 12:22:04 +01:00
Andy Wilkinson 49089546f8 Merge branch '1.5.x' into 2.0.x 2018-05-02 10:57:29 +01:00
Johnny Lim a723ac95a9 Polish
Closes gh-12999
2018-04-30 16:44:46 +02:00
Johnny Lim b941c5f1a6 Polish
Closes gh-12981
2018-04-27 09:29:16 +02:00
Madhura Bhave f2d8ca8b3a Fix failing NettyReactiveWebServerFactoryTests
NettyReactiveWebServerFactoryTests.portInUseExceptionIsThrownWhenPortIsAlreadyInUse
started failing on CI following this change in reactor netty:
e6634c27f6
Instead of a `BindException`, a `NativeIoException` is thrown. Since that Exception
is for internal use only, we throw a generic `WebServerException`
instead of the `PortInUseException`.
2018-04-26 15:39:08 -07:00
Andy Wilkinson a358f3f0e8 Merge branch '1.5.x' into 2.0.x 2018-04-25 11:58:31 +01:00
Madhura Bhave 877c4f702e Use empty key-store-password if storeprovider present
For tomcat, if an SslStoreProvider is configured,
`SslStoreProviderUrlStreamHandlerFactory` stores the keyStore with an
empty password. Previously, if a password was supplied using the
ssl.key-store-password property, that would be the password used to
load the keystore and the connector would fail with a
"Password verification failed" exception.

Fixes gh-11391
2018-04-23 12:31:47 -07:00
Madhura Bhave 5afa7d1965 Reset URLStreamHandlerFactory instance between tests 2018-04-20 12:28:53 -07:00
Madhura Bhave 5792042d5d Fix verify statements in tests 2018-04-19 14:59:48 -07:00
Madhura Bhave c93f7ddff6 Make truststore & keystore optional on SslStoreProvider
Fixes gh-11395
2018-04-19 14:21:57 -07:00
Madhura Bhave 35af166750 Fix tests
See gh-11380
2018-04-18 10:47:37 -07:00
Madhura Bhave cab9bff4f4 Log included profiles according to the processing order
This commit includes some refactoring of active profiles
processing. Previously, there was a LIFO Queue for adding active
profiles. Profiles that were added last, were processed first.
Because of this reverse ordering, profiles were prepended to the
environment to preserve the order in which they were logged.
This however didn't work for "included" profiles as they were
prepended to the environment even though they were processed after
the active profile. In this commit, profiles are processed in a FIFO manner
and processed as they're found.

Fixes gh-11380
2018-04-18 10:03:12 -07:00
Brian Clozel 29a719dfb3 Upgrade to Undertow 1.4.24.Final
This commit also updates tests since UNDERTOW-1260 has been fixed in
this release.

Closes gh-12852
2018-04-13 11:48:09 +02:00
Johnny Lim f03849d502 Polish
See gh-12812
2018-04-10 11:46:16 +02:00
Andy Wilkinson 8b1a101cb6 Merge branch '1.5.x' 2018-04-09 17:39:26 +01:00
Andy Wilkinson c3bf8541d7 Do not rely on findAvailableTcpPort finding an available port
Closes gh-12779
2018-04-05 11:35:58 +01:00
Andy Wilkinson f335ec00bf Polish 2018-04-05 09:31:17 +01:00
Phillip Webb 0c98d0e7d3 Polish "Allow validation api without implementation"
Closes gh-12669
2018-04-04 21:24:25 -07:00
geo_m a74dc74ec3 Allow validation api without implementation
Allow validation api in the classpath without
a validator, as long as no bean is annotated `@Validated`

See gh-12669
2018-04-04 21:24:20 -07:00
Phillip Webb 685babc829 Polish "Use lambdas for map entry iteration where possible"
Closes gh-12626
2018-04-04 19:36:18 -07:00
igor-suhorukov 69bc19e0ca Use lambdas for map entry iteration where possible
See gh-12626
2018-04-04 19:36:10 -07:00
dreis2211 cc66de28d0 Populate cache in ConfigFileApplicationListener
Fix `ConfigFileApplicationListener` so that the loadDocumentsCache is
populated when documents are loaded.

Closes gh-12732
2018-04-04 18:09:08 -07:00
dreis2211 35b4cd01ab Polish 2018-04-04 18:08:38 -07:00
Phillip Webb 598e9bb842 Polish 2018-04-04 18:01:25 -07:00
Andy Wilkinson e44bfbea4a Merge branch '1.5.x' 2018-04-04 14:15:52 +01:00