Commit Graph

8738 Commits

Author SHA1 Message Date
Johnny Lim caa4c0800f Polish
Closes gh-6872
2016-09-13 09:25:06 +02:00
Phillip Webb 3684c2ec56 Ensure argument matchers work with AOP spies
Update MockitoAopProxyTargetInterceptor to deal with deal with any
existing argument matchers when working with the VerificationMode.

Prior to this commit `@SpyBean` when combined with AOP could not support
argument matchers.

Fixes gh-6871
2016-09-12 14:53:07 -07:00
Phillip Webb 41a36c4d40 Prevent CastCastException when stripping root URI
Update RootUriRequestExpectationManager to only wrap requests when
they cannot be cast to MockClientHttpRequest. This prevents later
ClassCastExceptions from being thrown with @RestClientTests that
define expected body content.

Fixes gh-6845
2016-09-12 12:44:31 -07:00
Phillip Webb c56f30fd91 Formatting 2016-09-12 12:44:31 -07:00
Stephane Nicoll c662986628 Merge branch '1.3.x' 2016-09-12 16:30:25 +02:00
Stephane Nicoll 6eb0449aa9 Use BDD mockito
See gh-6869
2016-09-12 16:30:07 +02:00
Stephane Nicoll d87d60f746 Merge branch '1.3.x' 2016-09-12 16:02:28 +02:00
Stephane Nicoll b88cb35ea2 Fix JMS health indicator
This commit improves the JMS health indicator to identify a broken broker
that uses failover. An attempt to start the connection is a good way to
make sure that it is effectively available.

Closes gh-6818
2016-09-12 15:59:18 +02:00
Stephane Nicoll 5b0d916910 Merge pull request #6651 from vpavic:improve-batch-autoconfig
* pr/6651:
  Polish contribution
  Validate Spring Batch database initializer configuration
2016-09-12 14:53:27 +02:00
Stephane Nicoll ee668e6782 Polish contribution
Closes gh-6651
2016-09-12 14:53:02 +02:00
Vedran Pavic 06a1f44128 Validate Spring Batch database initializer configuration
This commit adds Spring Batch configuration validation that disables
database initializer in case custom table prefix is configured with
default schema.

See gh-6651
2016-09-12 14:42:07 +02:00
Stephane Nicoll def40bf27f Polish 2016-09-12 14:36:12 +02:00
Stephane Nicoll dd3d2ad35e Merge pull request #6649 from vpavic:improve-session-jdbc-autoconfig
* pr/6649:
  Polish contribution
  Validate Spring Session database initializer configuration
2016-09-12 14:34:59 +02:00
Stephane Nicoll a347a780e7 Polish contribution
Closes gh-6649
2016-09-12 14:34:40 +02:00
Vedran Pavic 9141177f1a Validate Spring Session database initializer configuration
This commit adds Spring Session JDBC configuration validation that
disables database initializer in case custom table name is configured
with default schema.

See gh-6649
2016-09-12 14:11:00 +02:00
Phillip Webb 07b2fe1d67 Support relaxed binding to 'mixedCASE' names
Update relaxed binding so that names of the form `initSQL` can now
be bound against properties of the form `init-s-q-l`.

Fixes gh-6803
2016-09-09 15:36:38 -07:00
Phillip Webb 3570f7730a Prevent erroneous "empty locations" log warnings
Update our `ResourceHttpRequestHandler` subclass so that the following
warning is no longer displayed:

  "Locations list is empty. No resources will be served unless a
  custom ResourceResolver is configured as an alternative to
  PathResourceResolver."

Fixes gh-6791
2016-09-09 13:19:58 -07:00
Phillip Webb ca2b97b915 Merge pull request #6851 from vpavic/authz-listener-details
* pr/6851:
  Include AuditEvent details in AuditListener
2016-09-09 12:58:05 -07:00
Vedran Pavic d87bec11fb Include AuditEvent details in AuditListener
Update `AuthorizationAuditListener` to include `AuditEvent` data if
found.

Closes gh-6851
2016-09-09 12:48:30 -07:00
Phillip Webb 56544c8dd5 Polish 2016-09-09 10:27:44 -07:00
Phillip Webb a3c63b9c34 Fix broken Gradle test
Update test broken by recent Jetty changes.

See gh-6692
2016-09-09 09:58:17 -07:00
Brian Clozel 274734e787 Add `spring.thymeleaf.check-template` property
This commit adds a new `spring.thymeleaf.check-template` property which
is only used for Thymeleaf 3.0+.

Since thymeleaf/thymeleaf#419, the Thymeleaf template resolver
implementations can implement the `setCheckExistence` method - this
enables the template existence verification at **resolution** time,
which means the resolver can return null as a `TemplateResolution`
and let other template resolvers in the chain try.

This new property is set to `true` by default and can be disabled if the
application only has a single resolver and the template existence check
is considered as a performance penalty with the configured resolver.

Fixes gh-6500
2016-09-09 16:35:57 +02:00
Brian Clozel 6687eb6f35 Merge pull request #6776 from making
* pr/6776:
  Add spring.http.multipart.resolve-lazily
2016-09-09 10:53:16 +02:00
making 8a5c026a9d Add spring.http.multipart.resolve-lazily
This commit adds the `spring.http.multipart.resolve-lazily`
property, in order to configure whether the multipart request
should be resolved lazily, as the parameters are accessed.
2016-09-09 10:34:49 +02:00
Brian Clozel f0259c82de Fix documentation on extending Spring MVC
When extending `WebMvcConfigurerAdapter`, developers should always
declare those as `@Configuration` classes rather than `@Bean`s, which
can lead to dependency issues as described in #6853.

Fixes gh-6853
2016-09-09 09:45:54 +02:00
Stephane Nicoll 0233455612 Merge branch '1.3.x' 2016-09-09 07:43:41 +02:00
Stephane Nicoll e3ca5e7107 Merge pull request #6847 from htynkn:fix-document-for-trace-end-point
* pr/6847:
  Trace endpoint defaults to 100
2016-09-09 07:43:20 +02:00
Huang YunKun 9cb269d14d Trace endpoint defaults to 100
Closes gh-6847
2016-09-09 07:42:56 +02:00
Phillip Webb ede1657d79 Include Jetty EL dependency in starter
Update spring-boot-starter-jetty to include an EL dependency.

Fixes gh-6692
2016-09-08 16:52:53 -07:00
Phillip Webb 6ec3648a10 Merge pull request #6842 from izeye/fix-test-20160908
* pr/6842:
  Fix ResetMocksTestExecutionListenerTests
2016-09-08 16:14:47 -07:00
Johnny Lim 11aa4d0749 Fix ResetMocksTestExecutionListenerTests
Align test implementation with names.

Closes gh-6842
2016-09-08 16:13:59 -07:00
Stephane Nicoll 91e6a5fbee Merge pull request #6836 from altfatterz:polish-doc-rabbit-properties
* pr/6836:
  Fix description for max-interval property
2016-09-08 07:56:02 +02:00
Zoltan Altfatter 2ed479fdc4 Fix description for max-interval property
Closes gh-6836
2016-09-08 07:55:10 +02:00
Stephane Nicoll d9ab051148 Merge pull request #6843 from vpavic:upgrade-spring-session
* pr/6843:
  Upgrade Spring Session to 1.2.2.RELEASE
2016-09-08 07:49:28 +02:00
Vedran Pavic 5c605cbb8f Upgrade Spring Session to 1.2.2.RELEASE
Closes gh-6843
2016-09-08 07:48:49 +02:00
Stephane Nicoll b450fece2e Add NoSuchBeanDefinitionException failure analyzer
Add a `FailureAnalyzer` that handles the case where the context does
not start because no candidate bean was found for an `InjectionPoint`.

The implementation inspects the auto-configuration report for beans
that are candidate and output the condition(s) that lead to such beans
to be discarded on startup. If a whole auto-configuration class is
disabled (or excluded), its beans are inspected and candidates are
extracted in a similar way.

This works for both injection by type and by name.

Closes gh-6612
2016-09-07 16:50:25 -07:00
Phillip Webb 7396ccfe04 Harmonize ConditionOutcome messages
Add ConditionMessage class to help build condition messages in a
uniform format and update existing conditions to use it.

Fixes gh-6756
2016-09-07 10:50:39 -07:00
Phillip Webb 41dc53f5dd Polish 2016-09-07 08:34:45 -07:00
Dave Syer b5294a48b2 Use context class loader instead of one-off for command location
This works, and feels like the right thing to do, since there is no
guarantee that extensions won't in turn use ServiceLoader for things
that we haven't yet anticipated.

Fixes gh-6829. Cc @wilkinsona in case he has an opinion.
2016-09-07 10:00:34 +01:00
Stephane Nicoll b446505cef Fix escaping 2016-09-06 17:35:24 +02:00
Stephane Nicoll b803384348 Merge pull request #6817 from izeye:polish-20160905
* pr/6817:
  Polish
2016-09-05 09:08:28 +02:00
Johnny Lim 4b9f6869f0 Polish
Closes gh-6817
2016-09-05 09:08:08 +02:00
Stephane Nicoll b7da0bd301 Merge branch '1.3.x' 2016-09-05 09:00:52 +02:00
Stephane Nicoll 8a71ee0eff Merge pull request #6815 from vpavic:polish-javadoc
* pr/6815:
  Polish `HealthEndpoint` javadoc
2016-09-05 09:00:36 +02:00
Vedran Pavic b88889f020 Polish `HealthEndpoint` javadoc
Closes gh-6815
2016-09-05 09:00:08 +02:00
Stephane Nicoll 7e9aa92f5c Add reference to LDAP starter
See gh-2645
2016-09-04 22:56:36 +02:00
Stephane Nicoll 6f70d53285 Add documentation for `FailureAnalyzer`
Closes gh-6775
2016-09-02 13:11:50 +02:00
Andy Wilkinson 0e00a49dcc Prevent beans created with @MockBean from being post-processed
Post-processing of mocked beans causes a number of problems:

 - The mock may be proxied for asynchronous processing which can cause
   problems when configuring expectations on a mock (gh-6573)
 - The mock may be proxied so that its return values can be cached or
   so that its methods can be transactional. This causes problems with
   verification of the expected calls to a mock (gh-6573, gh-5837)
 - If the mock is created from a class that uses field injection, the
   container will attempt to inject values into its fields. This causes
   problems if the mock is being created to avoid the use of one of
   those dependencies (gh-6663)
 - Proxying a mocked bean can lead to a JDK proxy being created
   (if proxyTargetClass=false) as the mock implements a Mockito
   interface. This can then cause injection failures as the types don’t
   match (gh-6405, gh-6665)

All of these problems can be avoided if a mocked bean is not
post-processed. Avoiding post-processing prevents proxies from being
created and autowiring from being performed. This commit avoids
post-processing by registering mocked beans as singletons as well as
via a bean definition. The latter is still used by the context for type
matching purposes.

Closes gh-6573, gh-6663, gh-6664
2016-09-02 10:23:06 +02:00
Stephane Nicoll 52d7282f5e Auto-configure JdbcTemplate with DataJpaTest
This commit adds `JdbcTemplateAutoConfiguration` to the list of auto-
configurations that are applied with `DataJpaTest`. This effectively
allows to inject a `JdbcTemplate` in any `@DataJpaTest` test.

Closes gh-6802
2016-09-02 09:38:07 +02:00
Phillip Webb 65b4f61a35 Polish 2016-09-01 18:02:00 +01:00