Commit Graph

4472 Commits (791e3048cf252b90203a3f3110682d22f91291da)
 

Author SHA1 Message Date
Andy Wilkinson 9a703ab4d1 Correct quotation marks in spring-boot-actuator’s README
Closes gh-4095
9 years ago
Andy Wilkinson d793d5abcb Work around intermittent failure caused by SPR-13079
See gh-4098
9 years ago
Andy Wilkinson 6387f36efa Work around MockMvc bug (SPR-13079) that has only been fixed in 4.2
See gh-4098
9 years ago
Andy Wilkinson b8b4ea489e Improve MetricsFilter’s handling of async requests
Previously, MetricsFilter would treat async requests the same as
sync requests and would record their response status as soon as the
request had been processed by the filter chain. This would result in a
200 response being recorded and the actual response status produced by
the async processing being ignored. Furthermore, the time that was
recorded for the request would not include the time take for any async processing.

This commit updates MetricsFilter to check whether or not an async
request has been started before it records the metrics for the request.
In the event of an async request having been started no metrics are
recorded. Instead, the StopWatch is stored in a request attribute that
is then retrieved during the filtering of the request’s async
dispatch(es). Once the async processing has completed (isAsyncStarted()
returns false), the StopWatch is stopped, removed from the request’s
attributes and the metrics for the request are recorded.

Closes gh-4098
9 years ago
Andy Wilkinson a94f3a0cbf Only try to auto-configure Jetty when jetty-webapp is on the classpath
Closes gh-4089
9 years ago
Phillip Webb 87a515f6a0 Fix TemplateAvailabilityProvider binding issues
Update all TemplateAvailabilityProvider implementations to use the
relaxed property binder. Also fix FreeMarkerTemplateAvailabilityProvider
to use `template-loader-path` rather than `path`.

Fixes gh-4085
9 years ago
Phillip Webb 891faa9d35 Fix test cleanup to reset commons logging 9 years ago
Gary Russell 48ba1d888f Update Spring AMQP to 1.4.6 9 years ago
Stephane Nicoll 8978f54cc3 Use spring.velocity.charset for template encoding
Previously `spring.velocity.charset` only controlled the output encoding
with the templates being loaded with the default encoding. We now
consistently set the same value for both the input and output encodings.

It is still possible to override it to a different value using
`spring.velocity.properties.input.encoding`

Closes gh-3994
9 years ago
Phillip Webb b0d9a8322e Support `.` and `_` binder prefix joins
Update RelaxedDataBinder so that both `.` and `_` are considered in
getPropertyValuesForNamePrefix(...).

With Spring Boot 1.2.5 binding environment variables of the form
`FOO_BAR_BAZ` to `@ConfigurationProperties(prefix="foo-bar")` objects
worked thanks to a happy accident. When `PropertySourcesPropertyValues`
processed a non enumerable `PropertySource` it called the resolver
with a property name `FOO_BAR.BAZ`. A `SystemEnvironmentPropertySource`
will replace `.` with `_` and hence find a value.

Commit 1abd0879 updated non enumerable processing such that the resolver
was never called.

Replicating the problem is quite involved as you need to ensure that you
have both a SystemEnvironmentPropertySource and a non-enumerable
property source (e.g. RandomPropertySource). A test has been added to
PropertiesConfigurationFactoryTests which passes on 1.2.5, fails on
1.2.6 and passes again following this commit.

Fixes gh-4045
9 years ago
Andy Wilkinson 31705982a0 Upgrade to Spring Social Twitter 1.1.1.RELEASE
Closes gh-3913
9 years ago
Phillip Webb d22d0683b2 Fixup build following release 9 years ago
Spring Buildmaster 9409c49c10 Next development version 9 years ago
Phillip Webb 11d59df3fd Add registerErrorPageFilter option flag
Update SpringBootServletInitializer with a registerErrorPageFilter flag
that can be used to disable ErrorPageFilter registration.

Fixes gh-3603
9 years ago
Phillip Webb de48223a2e Only handle status errors when sendError is called
Update ErrorPageFilter to only handle errors when `response.sendError`
has been called. This should allow custom @ExceptionHandlers to
completely handle errors and return custom status codes without
triggering the "Cannot forward to error page" log message.

The Javadoc for sendError states:

  "The server defaults to creating the response to look like an
   HTML-formatted server error page containing the specified message"

Where as setStatus states

  "This method is used to set the return status code when there is
   no error "

Fixes gh-2745
9 years ago
Phillip Webb 5f250ebbc1 Add exception endpoints to tomcat-jsp sample
Update `spring-boot-sample-tomcat-jsp` to include endpoints that trigger
exceptions. Primarily to aid testing of the ErrorPageFilter.

See gh-2745
9 years ago
Phillip Webb 86d5c19259 Don't mix collection values from different sources
Update PropertySourcesPropertyValues so that collection values are only
added from a single PropertySource. Prior to this commit, given the
following:

    PropertySource-A
     list[0]=x

    PropertySource-B
     list[0]=y
     list[1]=z

PropertySourcesPropertyValues would take `x` from A and `z` from B,
resulting in a binding of `[x,z]`. The updated code now returns the
more logical `[x]`.

Fixes gh-2611
9 years ago
Phillip Webb 16a1bd0483 Revert "Only format changed lines"
This reverts commit e04fb15574.

Formatting only changed lines doesn't appear to work well.
9 years ago
Phillip Webb e97042507b Restore cargo downloads directory to /tmp
Using the $home directory seems to be causing intermittent failures on
the CI box.

See gh-3861
9 years ago
Phillip Webb 624350f41e Merge pull request #3605 from tan9/patch-3
* pr/3605:
  Catch more general Hibernate 4.2 LinkageError
9 years ago
Pei-Tang Huang a5430d8a0c Catch more general Hibernate 4.2 LinkageError
Update HibernateJpaAutoConfiguration to catch LinkageError rather than
NoClassDefFoundError. Required due to the fact that JBoss EAP 6 wraps
NoClassDefFoundErrors.

Fixes gh-3605
9 years ago
Phillip Webb b7e9f805c9 Set ignoreUnknownFields=true on ServerProperties
Update ServerProperties so that unknown SERVER_* environment properties
do not cause startup failures.

Fixes gh-3903
9 years ago
Phillip Webb e69a5879b0 Merge pull request #3926 from trecloux/gh-3924_propagate-log-level-to-JUL
* gh-3926:
  Propagates logback log levels to java.util.logging
9 years ago
Thomas Recloux 22e0a50a11 Propagates logback log levels to java.util.logging
Adds the LevelChangePropagator logback listener in order to propagate
Logback's log level changes to java.util.logging loggers.

Logback documentation :
http://logback.qos.ch/manual/configuration.html#LevelChangePropagator

Fixes gh-3924
Closes gh-3926
9 years ago
Phillip Webb e04fb15574 Only format changed lines
Update Eclipse cleanup actions to only format changed lines. This will
hopefully help to prevent so many false diffs caused by differences
between Eclipse Luna and Eclipse Mars.
9 years ago
Phillip Webb 15686ed4fd Reformat code 9 years ago
Phillip Webb 0f6b60d8c8 Organize imports 9 years ago
Phillip Webb 653d2b2b4e Tweak eclipse settings
- Update whitespace after inline generics
- Use a more sensible import order
- Update Javadoc warning settings
9 years ago
Phillip Webb adf2c44bdd Set registerShutdownHook to false for tests
Update SpringApplicationContextLoader so that setRegisterShutdownHook
is false for tests.

Fixes gh-3763
9 years ago
Phillip Webb b4e0a77269 Polish POM whitespace 9 years ago
Phillip Webb feb2452f06 Simplify WebApplicationContext class guard
See gh-3856
9 years ago
Andy Wilkinson cb4e709ba2 Upgrade to Spring Social LinkedIn 1.0.2.RELEASE
Closes gh-3869
9 years ago
Andy Wilkinson 3d099fe9be Upgrade to Spring Social Facebook 2.0.2.RELEASE
Closes gh-3779
9 years ago
Andy Wilkinson 2429cc6766 Upgrade to Hibernate 4.3.11.Final
Closes gh-3868
9 years ago
Barry Lagerweij 8d75aa0ea9 Fix Oracle XA datasource class name
Closes gh-3846
9 years ago
Stephane Nicoll 5043c959a2 Refine check
Refine commit 8a96481 to set the web environment to false if spring web
is not available in the classpath. Thanks to @mjustin for spotting that
mistake.

Closes gh-3856
9 years ago
Stephane Nicoll 426a8dc103 Store container installs in home directory
Previously, deployment tests were storing the container archives in the
default location (that is `/tmp`) for a total weight of 160MB. In case
the temp directory is cleaned on CI, these have to be downloaded again.

We're now configuring cargo to store these archives in the home directory
instead. This should improve the speed and the stability of the
deployment tests

Closes gh-3861
9 years ago
Stephane Nicoll 8a96481423 Properly guard customization of application context class
SpringApplication wrongly expects spring-web to be on the classpath to
figure out whether or not the web environment should be enabled for a
custom context class.

We now properly guard this check so that the web environment is not
enabled (read: not checked) if `spring-web` is not available.

Closes gh-3856
9 years ago
Stephane Nicoll cd39e6a742 Upgrade to H2 1.4.188
Closes gh-3843
9 years ago
Andy Wilkinson f143bd2cfb Upgrade to Tomcat 8.0.26
Closes gh-3406
Closes gh-3526
9 years ago
Stephane Nicoll 6393569d42 Polish Externalized Configuration section
Closes gh-3823
9 years ago
Stephane Nicoll 6869b0d987 Fix wrong imports on StringUtils
Closes gh-3792
9 years ago
Stephane Nicoll 11b82cc6fe Properly guard DB health indicator
The DataSource health indicator uses `JdbcTemplate` behind the scenes
but nothing was checking that it is actually available.

`DataSourcesHealthIndicatorConfiguration` is now disabled if
`spring-jdbc` is not on the classpath.

Fixes gh-3765
9 years ago
Andy Wilkinson 190f8a7e0a Upgrade Travis configuration to run on new infrastructure
Closes gh-3760
9 years ago
Andy Wilkinson 4f0f51b5ed Upgrade to Spring Web Services 2.2.2.RELEASE
Closes gh-3423
9 years ago
Andy Wilkinson a2f4c1cc4a Add support for configuring allowSessionOverride via the environment
This commit adds support for using the environment to configure the
Freemarker and Velocity view resolvers to allow session overrides.

Closes gh-3410
9 years ago
Andy Wilkinson f9a775518f Upgrade to Spring Batch 3.0.5.RELEASE
Closes gh-3421
9 years ago
Stephane Nicoll 1ee31e73d3 Avoid NPE if @ConfigurationProperties is not present
The annotation processor detects `@ConfigurationProperties` bean or
method definition and merges manual meta-data. The former step will fail
with a NPE if the annotation is not present on the classpath. This could
happen if the annotation processor is added to a module that is not
actually using Spring Boot.

We now have a defensive check that skips that steps but still attempts to
merge manual meta-data if present.

Closes gh-3720
9 years ago
Thomas Traude 2b6d7a3f15 Update URL to Groovy Docs
Closes gh-3715
9 years ago
Stephane Nicoll f88d548de0 Fix typo
Closes gh-3700
9 years ago