Commit Graph

5755 Commits (49fab4a60fdd68194b33d2754b1fd8570fc7f619)
 

Author SHA1 Message Date
Phillip Webb 49fab4a60f Fix broken documentation link 9 years ago
Andy Wilkinson c55900b433 Simplify Jackson-related auto-configuration for HATEOAS and Data REST
This commit simplifies the Jackson-related auto-configuration that’s
applied when Spring HATEOAS and Spring Data REST are on the classpath.

Previously, Boot used Jackson2HalModule to apply the HAL-related
ObjectMapper configuration to the context’s primary ObjectMapper. This
was to allow HAL-formatted responses to be sent for requests accepted
application/json (see gh-2147). This had the unwanted side-effect of
polluting the primary ObjectMapper with HAL-specific functionality.
Furthermore, Jackson2HalModule is an internal of Spring HATEOAS that
@olivergierke has asked us to avoid using.

This commit replaces the use of Jackson2HalModule with a new approach.
Now, the message converters of any RequestMappingHandlerAdapter beans
are examined and any TypeConstrainedMappingJackson2HttpMessageConverter
instances are modified to support application/json in addition to their
default support for application/hal+json. This behaviour can be disabled
by setting spring.hateoas.use-hal-as-default-json-media-type to false.
This property is named after Spring Data REST’s configuration option
which has the same effect when using Spring Data REST. The new property
replaces the old spring.hateoas.apply-to-primary-object-mapper property.

Previously, when Spring Data REST was on the classpath,
JacksonAutoConfiguration would be switched off resulting in the context
containing multiple ObjectMappers, none of which was primary.

This commit configures RepositoryRestMvcAutoConfiguration to run after
JacksonAutoConfiguration. This gives the latter a chance to create its
primary ObjectMapper before the former adds its ObjectMapper beans to
the context.

Previously, the actuator’s hypermedia support assumed that the
HttpMessageConverters bean would contain every HttpMessageConverter
being used by Spring MVC. When Spring HATEOAS is on the classpath this
isn’t the case as it post-processes RequestMappingHandlerAdapter beans
and adds a TypeConstrainedMappingJackson2HttpMessageConverter to them.
This wasn’t a problem in the past as the primary ObjectMapper, used by a
vanilla MappingJackson2HttpMessageConverter, was configured with Spring
HATEOAS’sJackson2HalModule. Now that this pollution has been tidied up
the assumption described above no longer holds true. MvcEndpointAdvice,
which adds links to the actuator’s json responses, has been updated
to look at the HttpMessageConverters of every
RequestMappingHandlerAdapter when it’s trying to find a converter to
use to write a response with additional hypermedia links.

Integration tests have been added to spring-boot-actuator to ensure
that the changes described above have not regressed the ability to
configure its json output using spring.jackson.* properties (see
gh-1729).

Closes gh-3891
9 years ago
Phillip Webb 028fc04777 Fix checkstyle errors 9 years ago
Phillip Webb b95bb54e8c Make BasicErrorController easier to subclass
Extract a new AbstractErrorController base class for users to extend
if they don't like the default BasicErrorController.

Fixes gh-3998
9 years ago
Phillip Webb 764c0a8bf9 Make FlywayMigrationInitializer ordered and public
Update `FlywayAutoConfiguration` to allow explicit ordering of the
`FlywayMigrationInitializer`.

Fixes gh-4011
9 years ago
Phillip Webb 06f3202c68 Improve DataSourceProperties exception messages
Update DataSourceProperties exceptions to include a less misleading
message. Errors message now note that you may need to add an embedded
database to the classpath or active a profile to pickup specific
settings.

Fixes gh-4012
9 years ago
Phillip Webb 44c122307e Tweak port usage to try and fix Windows CI build 9 years ago
Phillip Webb 676efe7ad6 Fixup following package auto-configuration moves
A string based exclude was missed in commit c629813165.

See gh-4002
9 years ago
Phillip Webb bf34dc5013 Merge pull request #3719 from sbuettner/master
* pr/3719:
  Add statsd metric export auto-configuration
9 years ago
Simon Buettner 70031cca66 Add statsd metric export auto-configuration
Update MetricExportAutoConfiguration to auto-configure statsd metrics
export when a `spring.metrics.export.statsd.host` property is set.

Closes gh-3719
9 years ago
Phillip Webb 9128f2b902 Merge pull request #3915 from fabriciocolombo/liquibase
* pr/3915:
  Add Liquibase labels and parameters properties
9 years ago
Fabricio Colombo 605eb8a14d Add Liquibase labels and parameters properties
Update `LiquibaseAutoConfiguration` and `LiquibaseProperties` to add
support for labels and parameters.

Closes gh-3915
9 years ago
Phillip Webb d0dbe93755 Merge pull request #3938 from candrews/patch-2
* pr/3938:
  Add `git.properties` to default devtools excludes
9 years ago
Craig Andrews 84da5a26a7 Add `git.properties` to default devtools excludes
Update `DevToolsProperties` to exclude `git.properties` files.

Prior to this commit any application configured to write `git.properties`
could trigger unexpected application restarts. The problem is particularly
prevalent when using Eclipse M2E in combination with the
`git-commit-id-plugin`.

Closes gh-3938
9 years ago
Phillip Webb a63ec53d2b Merge pull request #3962 from izeye/hazelcast
* pr/3962:
  Remove duplicate `@ConditionalOnMissingBean` checks.
9 years ago
izeye efb699de60 Remove duplicate `@ConditionalOnMissingBean` checks. 9 years ago
Ivan Chen 926b40e46c Delete duplicate application.properties
Closes gh-4004
9 years ago
Phillip Webb 2e6bbd3538 Merge pull request #4010 from tbadie/master
* pr/4010:
  Fix synchronization issue in OpenTSDBMetricWriter
9 years ago
Thomas Badie 2fd1cacbf3 Fix synchronization issue in OpenTSDBMetricWriter
Closes gh-4010
9 years ago
Phillip Webb c629813165 Rationalize Spring Data auto-configurations
Relocate several auto-configuration classes to `...autoconfigure.data`
to make it clearer that they are Spring Data specific.

Also moved `EntityManagerFactoryBuilder` to `spring-boot` since it is
generally useful and doesn't need to be directly tied to the
auto-configuration module.

Fixes gh-4002
9 years ago
Andy Wilkinson e9349ee53f Suppress warning from M2E by explicitly ignoring invoker plugin 9 years ago
Andy Wilkinson 051ebf3fac Polishing: fix a number of compiler warnings reported by Eclipse 9 years ago
Andy Wilkinson a38f01f9e5 Fix compile errors in Eclipse (STS 3.6.4) in UserInfoTokenServicesTests 9 years ago
Andy Wilkinson d10dd13714 Fix deprecation warning in ConfigurationPropertiesReportEndpoint 9 years ago
Andy Wilkinson 1be4394855 Add lifecycle mapping for checkstyle plugin to keep Eclipse happy 9 years ago
Andy Wilkinson 262dbc85e8 Merge branch '1.2.x' 9 years ago
Andy Wilkinson ecf7baf917 Merge branch '1.2.x' 9 years ago
Andy Wilkinson 31705982a0 Upgrade to Spring Social Twitter 1.1.1.RELEASE
Closes gh-3913
9 years ago
Phillip Webb 7ed1534c7b Exclude validation JARs from deployment tests
Exclude spring-boot-starter-validation since those jars are provided
by the container.
9 years ago
Phillip Webb 21de97da50 Make jackson-module-parameter-names optional
Update the spring-boot-autoconfigure POM so that
jackson-module-parameter-names is optional.

See gh-3804
9 years ago
Phillip Webb f2ce59c403 Polish 9 years ago
Phillip Webb 86daf44435 Add @Since tag 9 years ago
Andy Wilkinson 7f2be6ce27 Add auto-configuration for Jackson's parameter names module
The parameter names module allows users of Java 8 that have compiled
their code with the -parameters option to avoid the name for
annotations to map the json onto constructor and method parameters
with the names of the parameters being used instead.

This commit adds auto-configuration for the module that will only
be enabled when running on Java 8.

Closes gh-3804
9 years ago
Andy Wilkinson 6c59e75874 Update tests to align with changes made in 8094076
See gh-3900
9 years ago
Andy Wilkinson 80940764f6 Do not trigger a restart when a test class is changed
Previously, dev tools would restart the application when any .class
file changed. This included test classes. This commit updates the
default excludes to ignore any classes with a name that ends in 
Test.class or Tests.class.

Closes gh-3900
9 years ago
Andy Wilkinson c3e447c84c Order char encoding filter so it sets encoding before request is read
For the character encoding filter to work, it's vital that it sets
the request's encoding before any other filters attempt to read the
request. This commit updates the order of
OrderedCharacterEncodingFilter to be HIGHEST_PRECEDENCE and improves
the existing test to check that the ordering is as required.

Closes gh-3912
9 years ago
Andy Wilkinson 702b8d041f Remove code used for documentation generation from actuator-docs jar
Closes gh-3902
9 years ago
Andy Wilkinson 94a737638e Update launch script to specify -jar as last option
The recommended usage for the java executable is:

    java [-options] -jar jarfile [args...]

This commit updates the default launch script to match this recommended
usage by moving -jar to be the last option, after both the
disableJarChecking system property and any JAVA_OPTS.

Closes gh-3930
9 years ago
Andy Wilkinson 1ce0ba6171 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
Stephane Nicoll 9a8dcab1db Merge pull request #3967 from izeye/patch-40
* pr/3967:
  Polish Javadoc
9 years ago
izeye 97167ce608 Polish Javadoc
Closes gh-3967
9 years ago
Andy Wilkinson be07a8a4c2 Merge branch 'gh-3943' 9 years ago
Andy Wilkinson bfc0745616 Add test for merging packages from multiple @ServletComponentScans 9 years ago
izeye 20da79e9bd Use mergedPackages in ServletComponentScanRegistrar
Closes gh-3943
9 years ago
Andy Wilkinson c274162e6f Correct since version in javadoc of Any and AllNestedCondition 9 years ago
Andy Wilkinson a9d67213be Override Eclipse’s formatting to keep Checkstyle happy
See gh-3964
9 years ago
Andy Wilkinson 95c8af462e Merge branch 'gh-3955' 9 years ago
Andy Wilkinson 2fd8a58197 Polish contribution
- Rename local variable to avoid shadowing field with the same name
 - Add a test to verify that local.mongo.port is set on the parent
   context

Closes gh-3955
9 years ago