Commit Graph

6942 Commits

Author SHA1 Message Date
Andy Wilkinson
9836d6ef89 Merge branch '1.3.x' 2016-02-12 09:39:19 +00:00
Andy Wilkinson
ac5c6f725c Correct the scope of the postgresql dependency in spring-boot-devtools 2016-02-12 09:39:05 +00:00
Andy Wilkinson
2cee11620e Merge branch '1.3.x' 2016-02-11 19:40:04 +00:00
Andy Wilkinson
295dc65b78 Fix LoggingSystem tests following System property changes 2016-02-11 19:38:47 +00:00
Andy Wilkinson
2be90eca98 Merge branch '1.3.x' 2016-02-11 18:02:07 +00:00
Andy Wilkinson
7787321db4 Polishing 2016-02-11 18:02:04 +00:00
Andy Wilkinson
72928de518 Merge branch '1.3.x' 2016-02-11 18:00:10 +00:00
Andy Wilkinson
ddfadce94d Set all documented system properties in LoggingApplicationListener
Closes gh-5073
2016-02-11 17:52:16 +00:00
Stephane Nicoll
f3c622ad89 Merge branch '1.3.x' 2016-02-11 17:52:57 +01:00
Stephane Nicoll
4cbbd48f18 Polish documentation
Closes gh-5131
2016-02-11 17:52:38 +01:00
Andy Wilkinson
3894ff84e3 Merge branch '1.3.x' 2016-02-11 16:28:28 +00:00
Andy Wilkinson
31aa5ad8dd Remove redundant public modifier 2016-02-11 16:28:15 +00:00
Andy Wilkinson
f3aa236e92 Merge branch '1.3.x' 2016-02-11 16:01:29 +00:00
Andy Wilkinson
a8f4708ffb Shut down in-memory database when DevTools restarts the context
Previously an in-memory database that wasn’t pooled (an
EmbeddedDatabase) would be shutdown when the context restarted, but
an in-memory database wrapped in a connection pool was not. This meant
that the former would be be wiped clean after each restart, whereas the
latter would not. In addition to being inconsistent, this also
caused problems with schema.sql and data.sql scripts when using
DevTools. If you were using an in-memory database wrapped in a
connection pool, a failure may occur during a restart as the scripts
were not being run against in clean database.

This commit adds an auto-configured bean to DevTools that, when the
context is being closed, will execute “SHUTDOWN” if it identifies that
the DataSource is not an EmbeddedDatabase and is for an in-memory
database.

Closes gh-4699
2016-02-11 16:01:07 +00:00
Stephane Nicoll
187d26ae10 Merge branch '1.3.x' 2016-02-11 17:00:16 +01:00
Stephane Nicoll
abf9d66edf Document how to configure access logging
Also, the section on `server.*` configuration was poor so this commit
also improves it.

Closes gh-4989
2016-02-11 16:59:47 +01:00
Andy Wilkinson
3f0686fa7e Merge branch '1.3.x' 2016-02-11 14:27:07 +00:00
Andy Wilkinson
fc2e51a773 Preserve ordering when auto-configuring WebSocket MessageConverters
Previously, WebSocketMessagingAutoConfiguration added a single
additional converter. This was a MappingJackson2MessageConverter
configured with the auto-configured ObjectMapper.
AbstractMessageBrokerConfiguration places additional converters before
any of the default converters. This meant that the auto-configuration
had the unwanted side-effect of changing the ordering of the
converters. A MappingJackson2MessageConverter was now first in the
list, whereas, by default, it's last in the list after a
StringMessageConverter and a ByteArrayMessageConverter.

This commit updates WebSocketMessagingAutoConfiguration so that it
switches off the registration of the default converters and registers
a StringMessageConverter, ByteArrayMessageConverter and
MappingJackson2MessageConverter in that order. A test has been
added to verify that the types of these three converters match
the types of the default converters. A second test that verifies
that String responses are converted correctly has also been added
alongside the existing test that verified the behaviour for JSON
responses.

Closes gh-5123
2016-02-11 14:18:24 +00:00
Stephane Nicoll
b3069e4d43 Merge branch '1.3.x' 2016-02-11 15:05:55 +01:00
Stephane Nicoll
c10943c653 Polish Javadoc
Closes gh-4936
2016-02-11 15:05:07 +01:00
Stephane Nicoll
63d9f9e91f Merge branch '1.3.x' 2016-02-11 14:49:35 +01:00
Stephane Nicoll
594c8910c5 Clarify precedence of property sources
When the `locations` attribute is set for a given bean annotated with
`@ConfigurationProperties`, the configuration at these specified
locations take precedence over any other property sources. This means
that such values can't be overridden by a system property or a command
line switch for instance.

This commit clarifies this rules in the documentation.

Closes gh-5111
2016-02-11 14:49:11 +01:00
Andy Wilkinson
a754e63e46 Merge pull request #5162 from Kazuki Shimizu
* gh-5126:
  Auto-configure ResourceUrlEncodingFilter when using FreeMarker
2016-02-11 11:34:29 +00:00
Kazuki Shimizu
4e177eeed7 Auto-configure ResourceUrlEncodingFilter when using FreeMarker
Closes gh-5126
2016-02-11 11:33:57 +00:00
Stephane Nicoll
1f106ddf8c Enable connection validation by default
Hikari and Commons DBCP2 are already validating that the connection is
valid before borrowing it from the pool. This commit makes that behaviour
consistent by enabling that feature for the Tomcat and Commons DBCP data
sources.

Since a validation query is required in those cases, the infrastructure
of `DataSourceHealthIndicator` has been merged in a single place: the
`DatabaseDriver` enum provides not only the driver class names but also
the validation query, if any.

Closes gh-4906
2016-02-11 12:03:18 +01:00
Stephane Nicoll
eb7b1ec33c Merge branch '1.3.x' 2016-02-10 14:29:59 +01:00
Stephane Nicoll
2a8a3741f5 Merge DriverClassNameProvider in DatabaseDriver
DriverClassNameProvider is unused but was probably restored by a merge
commit at some point. It wasn't obvious and updated that class rather
than `DatabaseDriver`.

This commit updates `DatabaseDriver` and deletes
`DriverClassNameProvider`.

Closes gh-5076
2016-02-10 14:28:58 +01:00
Andy Wilkinson
4597b61626 Merge branch '1.3.x' 2016-02-10 12:05:33 +00:00
Andy Wilkinson
ec8f7d3a0f Upgrade to SLF4J 1.7.15
Closes gh-5044
2016-02-10 12:05:14 +00:00
Andy Wilkinson
9c40d43a72 Merge branch '1.3.x' 2016-02-10 11:34:00 +00:00
Andy Wilkinson
aab678f499 Upgrade to Undertow 1.3.17.Final
Closes gh-5108
2016-02-10 11:33:48 +00:00
Stephane Nicoll
b82fb5e5a6 Merge branch '1.3.x' 2016-02-10 11:44:08 +01:00
Stephane Nicoll
6710c05750 Document DeprecatedConfigurationProperty
Closes gh-5118
2016-02-10 11:43:37 +01:00
Stephane Nicoll
ebffa493e4 Harmonize ConfigurationProperties bean name
When `@EnableConfigurationProperties` is defined, Spring Boot
automatically registers a bean in the context for each class specified
on the annotation. Previously, the name of the bean only included the
prefix which leads to conflict if two different classes use the same
prefix.

This commit changes the bean name structure to be <prefix>-<fqn> where
prefix is the prefix used on the annotation and <fqn> the fully qualified
name of the target class.

Closes gh-4395
2016-02-09 17:19:11 +01:00
Phillip Webb
2b18e99ac7 Polish 2016-02-08 11:01:52 -08:00
Andy Wilkinson
77d426c284 Merge branch '1.3.x' 2016-02-08 16:14:52 +00:00
Andy Wilkinson
a1fefb15ba Merge pull request #5059 from Vedran Pavić
* gh-5059:
  Remove Docker container after launch script test execution
2016-02-08 16:14:41 +00:00
Vedran Pavic
6540b1f383 Remove Docker container after launch script test execution
Closes gh-5059
2016-02-08 16:14:35 +00:00
Andy Wilkinson
f12bb26649 Merge branch '1.3.x' 2016-02-08 16:07:53 +00:00
Andy Wilkinson
29c7b93640 Update SpringApplicationBuilder to pass args to parent when it's run
Closes gh-5103
2016-02-08 16:02:03 +00:00
Stephane Nicoll
b896de404e Merge pull request #4188 from eddumelendez/gh-4131
* pr/4188:
  Polish contribution
  Add support of Jackson in Jersey
2016-02-08 15:44:43 +01:00
Stephane Nicoll
a27176807f Polish contribution
Closes gh-4188
2016-02-08 15:44:09 +01:00
Eddú Meléndez
5776d6a8d7 Add support of Jackson in Jersey
If Jackson is configured for the project, the `ObjectMapper` is now
reused and added in the Jersey's context.

Closes gh-4131
2016-02-08 15:34:44 +01:00
Phillip Webb
410dedc567 Add AssertJ to Eclipse Oomph Setup 2016-02-06 16:04:04 -08:00
Phillip Webb
f15f12d7e4 Merge branch 'gh-5083' 2016-02-06 15:51:43 -08:00
Phillip Webb
cc5d4b8b7f Add AssertJ checkstyle rule
Closes gh-5083
2016-02-06 15:51:27 -08:00
Phillip Webb
c5add2ef08 Use AssertJ in spring-boot-deployment-tests
See gh-5083
2016-02-06 15:51:27 -08:00
Phillip Webb
e214fa0949 Use AssertJ in spring-boot-integration-tests
See gh-5083
2016-02-06 15:51:27 -08:00
Phillip Webb
1cc1fc6431 Use AssertJ in spring-boot-samples
See gh-5083
2016-02-06 15:51:26 -08:00
Phillip Webb
962a598531 Use AssertJ in spring-boot-cli
See gh-5083
2016-02-06 15:51:26 -08:00