Commit Graph

9233 Commits (f2c7e2273158113d24e1e7ff9d3e8b1d35e5fad2)
 

Author SHA1 Message Date
Stephane Nicoll aec85787d2 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll f3c43e5e1a Merge pull request #6966 from izeye:unused-20160921
* pr/6966:
  Remove unused
8 years ago
Johnny Lim eb7c0e4dc8 Remove unused
Closes gh-6966
8 years ago
Stephane Nicoll 363798e9ad Fix unresolved merge commit
Closes gh-7206
8 years ago
Stephane Nicoll 7fc2566650 Merge branch '1.5.x' 8 years ago
Stephane Nicoll b0474b7c9d Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 120ece726d Merge pull request #7203 from kdombeck:fix-typo
* pr/7203:
  Correct typo in docs
8 years ago
Ken Dombeck 4621f82b0e Correct typo in docs
Closes gh-7203
8 years ago
Phillip Webb df3c152813 Merge '1.5.x' 8 years ago
Phillip Webb 2ba978b4ad Polish 8 years ago
Phillip Webb 1e1d929dde Merge branch '1.5.x' 8 years ago
Madhura Bhave ab81d993e6 Add CloudFoundryDiscoveryMvcEndpoint
Update Cloud Foundry support with a discovery endpoint that shows what
endpoints are available.

See gh-7108
8 years ago
Madhura Bhave 7afb161fcf Add CloudFoundry EndpointHandlerMapping
Add a CloudFoundryEndpointHandlerMapping that can expose actuator
endpoints for Cloud Foundry "appsmanager" to use.

See gh-7108
8 years ago
Andy Wilkinson 3eb9397c9d Merge branch '1.5.x' 8 years ago
Andy Wilkinson 570b292df7 Disable JspServlet's development mode by default
This commit switches off the auto-configured JspServlet's
development mode by default. Development mode is then switched on
when DevTools is on the class path.

Closes gh-7039
8 years ago
Andy Wilkinson 8832df3303 Merge branch '1.5.x' 8 years ago
Andy Wilkinson c2d97c9757 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 5ebfa4b139 Start building against Spring Integration 4.3.5 snapshots
See gh-7197
8 years ago
Andy Wilkinson 702d904d53 Merge branch '1.5.x' 8 years ago
Andy Wilkinson d7e2708687 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 999fa123df Deprecate support for Gradle 2.7 and earlier 8 years ago
Andy Wilkinson 2017e763c3 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 129c20965b Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 943a054b61 Remove ineffective, premature optimisation from ErrorPageFilter
ErrorPageFilter contained an optimisation for looking up the path
of an error page by exception type. For cases where there was no
mapping for the type of the exception that was thrown but there
was a mapping for one of its super classes, it was intended to
speed up the lookup. Unfortunately, there was a bug in the
implementation which meant that the optimisation had no effect.

Analysis with JMH reveals that for an Exception with a deep type
hierarchy, such as Spring Framework's UnsatisfiedDependencyException,
and an error page mapping for Exception, searching up the hierarchy
until a mapping is found takes 0.0000001s. With the same mapping,
a lookup for Exception takes 0.00000001s, i.e. it's 10x faster.
The optimisation, when correctly implemented, brings the time for
UnsatisfiedDependencyException down to 0.00000001s and into line
with a lookup for Exception. However, the amount of time involved is
so small compared to the overall time spent processing a request that
the added complexity of the optimisation is not justified.

Closes gh-7010
8 years ago
Andy Wilkinson 86034e5c5c Merge branch '1.5.x' 8 years ago
Andy Wilkinson 3ea09d2e04 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 02e89acd1e Add managed version for kotlin-runtime to spring-boot-parent
See gh-7101
8 years ago
Andy Wilkinson b1026db330 Merge branch '1.5.x' 8 years ago
Andy Wilkinson f942fe4947 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 64d32191cf Ignore Kotlin annotations when creating test context cache key
Every classes that's compiled by Kotlin is annotated with
kotlin.Metadata. The attributes of this annotation always differ so
if they are used in the cache key, context caching will effectively
be disabled.

This commit updates the key used by ImportsContextCustomizer to
ignore the kotlin.Metadata annotation. Additionally, to align with
with Java where annotations in java.lang.annotation are ignored,
annotations in kotlin.annotation are also ignored.

Closes gh-7101
8 years ago
Andy Wilkinson 8a547facd1 Merge branch '1.5.x' 8 years ago
Andy Wilkinson c9e6aff374 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 639b0f554d Suggest the use of @AutoConfigureMockMvc when using WebEnvironment.MOCK
Closes gh-7112
8 years ago
Andy Wilkinson 57450042bb Merge branch '1.5.x' 8 years ago
Andy Wilkinson 7962818294 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 6ac041c43b Update Thymeleaf 3 related versions in docs and sample
See gh-6991
Closes gh-7183
8 years ago
Andy Wilkinson 3dd0b9d59a Merge branch '1.5.x' 8 years ago
Andy Wilkinson 7d68c14d03 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson a531173691 Merge pull request #7183 from Raja Dilip Kolli
* gh-7183:
  Update docs on using Thmyeleaf 3 to reference latest version
8 years ago
Raja Dilip Kolli 4b1ddddea3 Update docs on using Thmyeleaf 3 to reference latest version
Closes gh-7183
8 years ago
Andy Wilkinson 81d8e4ab89 Merge branch '1.5.x' 8 years ago
Andy Wilkinson de578cb004 Upgrade to Spring Web Services 2.4.0.RELEASE
Closes gh-7185
8 years ago
Andy Wilkinson a4bc341028 Merge branch '1.5.x' 8 years ago
Andy Wilkinson a416f496c0 Clean up deprecation and unused code warnings 8 years ago
Andy Wilkinson f17be6e9f1 Merge branch '1.5.x' 8 years ago
Andy Wilkinson c58852e05b Start building against Spring Security 4.2.0 snapshots
See gh-7186
8 years ago
Andy Wilkinson 2a685a8c15 Merge branch '1.5.x' 8 years ago
Andy Wilkinson b7c55fb192 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson a31180dd68 Avoid calling URL.getContent() when defining a package
URL.getContent() is shorthand for URL.openConnection().getContent().
It creates an InputStream that isn't explicitly closed. This means
that a file handle remains open until the URLConnection is garbage
collected. This can lead to the process exceeding the limit for open
files.

Previously, LaunchedURLClassLoader was using getConent() when
proactively defining a package for a class that is about to be loaded.
getContent() was used to access nested jar files to check if they
contained the package and, if so, to retrieve the jar's manifest.

In place of using getContent(), this commit uses JarURLConnection's
getJarFile() method which provides access to the JarFile without the
unwanted side-effect of opening an input stream.

Closes gh-7180
8 years ago
Stephane Nicoll d79546da74 Merge branch '1.5.x' 8 years ago