Commit Graph

16932 Commits

Author SHA1 Message Date
Andy Wilkinson a5d20ffed7 Avoid NPE when creating method tag for WebFlux req with non-standard method
Previously, a NullPointerException would occur when WebFluxTags
attempted to create a method Tag for a request with a non-standard
method.

This commit updates WebFluxTags to use getMethodValue(), which will
never return null, rather than getMethod(), which may return null,
when determining the tag's value for the given request.

Closes gh-13596
2018-06-28 14:27:02 +01:00
Madhura Bhave 5fd30a9dc2 Merge pull request #13572 from Christoph Dreis
* gh-13572:
  Fix typo
2018-06-27 11:32:40 -07:00
dreis2211 17edf0e2fe Fix typo 2018-06-27 11:31:06 -07:00
Madhura Bhave a1491be636 Refine DispatcherServletPathProvider creation
Closes gh-13527
2018-06-27 11:06:56 -07:00
Andy Wilkinson 04119585e8 Merge branch '1.5.x' into 2.0.x 2018-06-25 13:13:34 +01:00
Andy Wilkinson 205bb764d5 Specify ID for cache providers section in reference docs
Closes gh-13551
2018-06-25 13:11:18 +01:00
Andy Wilkinson 74b8836da4 Merge branch '1.5.x' into 2.0.x 2018-06-25 12:39:47 +01:00
Andy Wilkinson 2f952fde6c Polish 2018-06-25 12:39:31 +01:00
Andy Wilkinson 02ad1893a2 Merge branch '1.5.x' into 2.0.x 2018-06-25 12:01:25 +01:00
Andy Wilkinson 454de0bfd7 Polish 2018-06-25 12:01:17 +01:00
Andy Wilkinson 911453d478 Merge branch '1.5.x' into 2.0.x 2018-06-25 11:25:10 +01:00
Andy Wilkinson 953df7cf86 Merge pull request #13559 from Dmitry Sergeyev
* gh-13559:
  Polish “Close Database to reset Connection's auto commit property”
  Close Database to reset Connection's auto commit property
2018-06-25 11:07:47 +01:00
Andy Wilkinson 24d5209738 Polish “Close Database to reset Connection's auto commit property”
Closes gh-13559
2018-06-25 11:02:31 +01:00
dmsergeevp44 3498a91259 Close Database to reset Connection's auto commit property
Previously, LiquibaseEndpoint closed the JdbcConnection but did not
close the Database. When using a connection pool, this could leave the
underlying SQL Connection with its auto commit property set to false.

This commit updates LiquibaseEndpoint to close the Database. This
ensures that it resets that Connection's auto commit property to the
value that it had when the Database was configured to use the
Connection.

See gh-13559
2018-06-25 10:58:51 +01:00
Madhura Bhave f10972ad32 Remove redundant build_number
Fixes gh-13442
2018-06-21 11:59:05 -07:00
Madhura Bhave a7fb3cf182 Remove extra / from artifactory server param
Fixes gh-13535
2018-06-21 11:43:19 -07:00
Andy Wilkinson 30f0fd1fe4 Merge branch '1.5.x' into 2.0.x 2018-06-21 17:31:16 +01:00
Andy Wilkinson f32c66d0e1 Merge pull request #12859 from ralenmdp
* gh-12859:
  Polish "Fix JSP availability check when not running as a packaged war"
  Fix JSP availability check when not running as a packaged war
2018-06-21 17:30:24 +01:00
Andy Wilkinson b1d8cc55fc Polish "Fix JSP availability check when not running as a packaged war"
Closes gh-12859
2018-06-21 17:30:12 +01:00
Mandap 82465cf435 Fix JSP availability check when not running as a packaged war
See gh-12859
2018-06-21 17:21:00 +01:00
Andy Wilkinson aafe754746 Merge branch '1.5.x' into 2.0.x 2018-06-21 16:21:34 +01:00
Andy Wilkinson b35e1ad232 Avoid unbounded metrics creation for requests not handled by Spring MVC
Previously, if an HTTP request that used a templated URI was handled
by something other than Spring MVC, a potentially unbounded number of
metrics would be created. This happened because, in the absence of
Spring MVC's best matching pattern attribute, MetricsFilter would fall
back to using the request's path. If the handling route was templated,
MetricsFilter would be unaware and would record different metrics for
each different path, rather than a single metric for the matching
pattern.

This cimmit updates MetricsFilter so that it falls back to using
unmapped when Spring MVC's best matching pattern attribute is not
available. This ensures that an unbounded number of metrics will no
longer be created, at the cost of losing specific metrics for requests
that are not handled by Spring MVC and that do not use a templated
path.

Closes gh-5875
2018-06-21 15:10:47 +01:00
Andy Wilkinson fd125b4a4a Remove assumption that a file URI can be turned into a File
Closes gh-13493
2018-06-21 12:47:23 +01:00
Stephane Nicoll f2cc6e2ef2 Fix link of RESTEasy repository
Closes gh-13538
2018-06-21 13:32:07 +02:00
Stephane Nicoll c594768640 Remove wro4j starter reference
This starter does not look maintained anymore and there is an
alternative that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
Stephane Nicoll 8858c88a4c Remove GraphQL starter reference
This starter does not look maintained anymore and there is a fork of it
that we also reference and has support for Spring Boot 2.
2018-06-21 13:32:07 +02:00
Andy Wilkinson 48c5e70ac8 Merge branch '1.5.x' into 2.0.x 2018-06-21 12:18:35 +01:00
Andy Wilkinson 29e87257b4 Provide Gradle example for using Log4j2
Closes gh-12729
2018-06-21 12:16:12 +01:00
Andy Wilkinson 2624748911 Merge branch '1.5.x' into 2.0.x 2018-06-21 11:41:02 +01:00
Andy Wilkinson 8a0f0354df Disable Log4J2's shutdown hook by default
Log4J2 enables its shutdown hook by default. When the JVM is exiting,
this creates a race between logging that happens during the
application context being closed and Log4J2 being shut down such that
the logging is lost.

This commit updates SpringBootConfigurationFactory so that it
produces a custom sub-class of DefaultConfiguration that disables the
shutdown hook by default. In addition to solving the problem described
above, this also aligns the Log4J2 logging system with the
logging.register-shutdown-hook property which defaults to false.

Closes gh-11360
2018-06-21 11:35:20 +01:00
Stephane Nicoll 7683d346e3 Merge pull request #13534 from izeye:polish-20180621
* pr/13534:
  Polish
2018-06-21 09:21:31 +02:00
Johnny Lim b9ea0fd5a7 Polish
See gh-13534
2018-06-21 09:20:50 +02:00
Stephane Nicoll 9e9e746554 Merge branch '1.5.x' into 2.0.x 2018-06-21 09:17:05 +02:00
Stephane Nicoll 36605b3b49 Polish
See gh-13534
2018-06-21 09:16:44 +02:00
Andy Wilkinson 9b4680c3fd Merge branch '1.5.x' into 2.0.x 2018-06-20 18:56:22 +01:00
Andy Wilkinson 9f7106c778 Polish 2018-06-20 18:56:14 +01:00
Andy Wilkinson e6222ce6d3 Merge branch '1.5.x' into 2.0.x 2018-06-20 16:53:21 +01:00
Andy Wilkinson 6cc0968b8d Polish 2018-06-20 16:52:18 +01:00
Andy Wilkinson 4fc0a33094 Merge branch '1.5.x' into 2.0.x 2018-06-20 16:49:53 +01:00
Phillip Webb 2bb7a430cf Clean up access logging threads when Undertow is stopped
Closes gh-12742
2018-06-20 14:15:21 +01:00
Andy Wilkinson e2d6280d83 Merge branch '1.5.x' into 2.0.x 2018-06-20 13:56:55 +01:00
Andy Wilkinson e7b03f7ca3 Don't auto-configure MultipartConfigElement when using Commons FileUpload
Previously, when a user had declared a custom MultipartResolver bean
that is a CommonsMultipartResolver, part resolution would fail. The
failure was occurring as the servlet container was consuming the parts
before CommonsMultipartResolver had a chance to read them. This was
happening because a MultipartConfigElement was being auto-configured.

This commit updates the multipart auto-configuration so that a
MultipartConfigElement is not auto-configured when there is a
CommonsMultipartResolver bean in the context.

Closes gh-7735
2018-06-20 12:05:23 +01:00
Andy Wilkinson e730382718 Merge branch '1.5.x' into 2.0.x 2018-06-20 11:12:51 +01:00
Andy Wilkinson 92f62043d4 Fix placeholder support in <springProfile>'s name attribute
Closes gh-13450
2018-06-20 10:48:55 +01:00
Andy Wilkinson e1774672af Prefer servlet to reactive when Jersey and WebFlux are both available
Closes gh-13521
2018-06-20 10:10:35 +01:00
Andy Wilkinson 814e90805e Merge branch '1.5.x' into 2.0.x 2018-06-19 20:06:44 +01:00
Stephane Nicoll 864a6b3e91 Merge branch '1.5.x' into 2.0.x 2018-06-19 20:59:27 +02:00
Andy Wilkinson 6081db5c34 Make ZipHeaderInputStream read sub 5 byte entries correctly
Closes gh-13525
2018-06-19 19:48:14 +01:00
Stephane Nicoll 99f993bc82 Add tests for JndiConnectionFactoryAutoConfiguration
Closes gh-13526
2018-06-19 20:47:23 +02:00
Andy Wilkinson 497902de4e Only bridge JUL into SLF4J when JUL has not be customized
Previously, Slf4jLoggingSystem would install SLF4JBridgeHandler into
JUL but would only remove a single root handler that was a
ConsoleHandler. If there were was than one root handler or the single
root handler was of a different type, they would not be uninstalled.
When deploying an application to Tomcat, this led to duplicate log
messages appearing in Tomcat’s console output and to logging from
other application or Tomcat itself being routed into an
application-specific log file enabled using the logging.file
configuration property.

A secondary, related problem was that LogbackLoggingSystem installs a
LevelChangePropagator so that Logback’s log level configuration is
propagated into JUL. This meant that an individual Boot app with
custom log level configuration could change the log levels of Tomcat
itself and of any other applications that had been deployed to Tomcat
and use JUL.

This commit updates both Slf4jLoggingSystem and LogbackLoggingSystem
so that they only change JUL’s configuration if it hasn’t already been
customized. The configuration is deemed to have not been customised if
there’s a single root handler and its a console handler.

Closes gh-13470
2018-06-19 15:29:46 +01:00