Commit Graph

9011 Commits

Author SHA1 Message Date
Stephane Nicoll 5863e6f78c Fix class name in generated meta-data
Previously, the algorithm that computes the String representation of a
class reference and a property type was shared. This lead to generic
information for group's `type` and `sourceType` property.

This commit separates that logic in two: `getQualifiedName` is now
responsible to generate a fully qualified class name while the existing
`getType` is solely responsible to generate a type representation for the
property. Only the latter has generic information.

Closes gh-7236
2016-10-28 13:23:47 +02:00
Andy Wilkinson 6a68c8f7e0 Restore Handler logic that was changed during its merge
This commit restores the logic in Handler that was changed when
d20ac56a was merged, while leaving the structural improvements intact.

In addition to a couple of changes where a typo meant the wrong
variable was being referenced, some logic branches now return false
rather than called super. This realigns our Handler's behaviour with
that of the JDK's.

Some more tests have also been added to try to catch the problems that
were introduced during the merge.

Closes gh-7021
2016-10-26 11:10:38 +01:00
Andy Wilkinson d20ac56afd Align our jar URL stream handler with the JDK's
Previously our handler didn't override parseURL or sameFile which
resulted in behaviour that differed from that of the JDK's handler.
Crucially, this would result in our JarURLConnection being passed
a spec that didn't contain a "!/". A knock-on effect of this was
that the connection would point to the root of the jar rather than
the intended entry.

Closes gh-7021
2016-10-25 20:16:32 -07:00
Andy Wilkinson ee7141cf63 Allow PropertyLauncher loader.path to be configured using manifest
Closes gh-7178
2016-10-24 22:14:56 +01:00
Stephane Nicoll a638dcd51b Remove unnecessary use of System.out.println 2016-10-24 18:07:40 +02:00
Andy Wilkinson 8150cbd0d1 Remove commentary on Neo4j's licence
Closes gh-7214
2016-10-24 14:36:35 +01:00
Andy Wilkinson 2b46a4876f Start building against Spring Framework 4.3.4 snapshots
Closes gh-7174
See gh-7213
2016-10-24 14:10:12 +01:00
Andy Wilkinson be597d7ce9 Fix handling of cyrillic characters in AsciiBytes hashCode method
Closes gh-7202
2016-10-24 12:19:57 +01:00
Stephane Nicoll 713fd51f9c Merge pull request #6954 from vpavic:update-docs
* pr/6954:
  Improve systemd service documentation
2016-10-24 11:39:14 +02:00
Vedran Pavic 469a4e3444 Improve systemd service documentation
Closes gh-6954
2016-10-24 11:37:53 +02:00
Stephane Nicoll 4603d8259a Make MockitoTestExecutionListener public
Closes gh-7016
2016-10-24 11:37:20 +02:00
Stephane Nicoll 2ad3a7f8a3 Merge pull request #7043 from kazuki43zoo:standard-travis-ci
* pr/7043:
  Speed up Travis build
2016-10-24 11:19:05 +02:00
Kazuki Shimizu 7c1f9eb1b9 Speed up Travis build
Modify to use standard mode and directory cache for Travis CI build.

Closes gh-7043
2016-10-24 11:18:12 +02:00
Stephane Nicoll 4ec77d4420 Merge pull request #7193 from izeye:patch-22
* pr/7193:
  Polish contribution
  Add a missing return
2016-10-24 11:11:38 +02:00
Stephane Nicoll a03ce0a9d1 Polish contribution
Add missing test

Closes gh-7193
2016-10-24 11:11:15 +02:00
Johnny Lim 0b5fbbedf4 Add a missing return
This commit adds a missing`return` in `getDataSourceBeanDefinition()`.

See gh-7193
2016-10-24 10:41:20 +02:00
Stephane Nicoll 74d3a6616b Upgrade to liquibase 3.5.3
Closes gh-7208
2016-10-24 10:36:16 +02:00
Stephane Nicoll f3c43e5e1a Merge pull request #6966 from izeye:unused-20160921
* pr/6966:
  Remove unused
2016-10-24 10:07:48 +02:00
Johnny Lim eb7c0e4dc8 Remove unused
Closes gh-6966
2016-10-24 10:07:10 +02:00
Stephane Nicoll 120ece726d Merge pull request #7203 from kdombeck:fix-typo
* pr/7203:
  Correct typo in docs
2016-10-22 13:56:19 +02:00
Ken Dombeck 4621f82b0e Correct typo in docs
Closes gh-7203
2016-10-22 13:56:07 +02:00
Andy Wilkinson 5ebfa4b139 Start building against Spring Integration 4.3.5 snapshots
See gh-7197
2016-10-20 20:30:52 +01:00
Andy Wilkinson 999fa123df Deprecate support for Gradle 2.7 and earlier 2016-10-19 16:50:35 +01:00
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
2016-10-19 14:10:34 +01:00
Andy Wilkinson 02e89acd1e Add managed version for kotlin-runtime to spring-boot-parent
See gh-7101
2016-10-19 12:20:37 +01:00
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
2016-10-19 12:03:33 +01:00
Andy Wilkinson 639b0f554d Suggest the use of @AutoConfigureMockMvc when using WebEnvironment.MOCK
Closes gh-7112
2016-10-19 10:51:42 +01:00
Andy Wilkinson 6ac041c43b Update Thymeleaf 3 related versions in docs and sample
See gh-6991
Closes gh-7183
2016-10-19 10:43:38 +01:00
Andy Wilkinson a531173691 Merge pull request #7183 from Raja Dilip Kolli
* gh-7183:
  Update docs on using Thmyeleaf 3 to reference latest version
2016-10-19 10:36:37 +01:00
Raja Dilip Kolli 4b1ddddea3 Update docs on using Thmyeleaf 3 to reference latest version
Closes gh-7183
2016-10-19 10:34:11 +01:00
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
2016-10-18 13:35:33 +01:00
Andy Wilkinson 24f8c737fb Make relative PID_FOLDER and LOG_FOLDER absolute using jar's directory
Closes gh-7092
Closes gh-7093
2016-10-14 09:19:11 +01:00
Andy Wilkinson 03deff9a1c Handle relative pid folder correctly in the launch script
Previously, a relative PID folder was not handled correctly when
running stop, status, or force_reload. This meant that a service
could be started when configured to use a relative pid file, but
then could not be stopped.

The PID folder should be treated as relative to the service's jar
file. This commit updates stop, status, and force_reload to push the
jar file's directory so that this is now the case for those three
commands.

Closes gh-7092
2016-10-13 16:51:54 +01:00
Andy Wilkinson 7968c6b548 Assign on order to OnPropertyCondition
Closes gh-7144
2016-10-13 12:29:35 +01:00
Andy Wilkinson cc04621dc2 Assign an order to OnResourceCondition
Closes gh-7145
2016-10-13 12:27:47 +01:00
Stephane Nicoll 00a10bcf61 Restore checkstyle
Rather than disabling checkstyle altogether, this commit enables it
again, relaxing the javadoc requirement only.

See gh-7142
2016-10-12 10:37:15 +02:00
Stephane Nicoll 11cad9e0cb Fix sample in ref doc
Closes gh-7142
2016-10-12 10:27:51 +02:00
Stephane Nicoll 0d3318796e Merge branch '1.3.x' into 1.4.x 2016-10-12 10:03:41 +02:00
Stephane Nicoll bd2956c3f0 Fix `metricsFilter` reference in doc
Closes gh-7147
2016-10-12 10:03:23 +02:00
Phillip Webb db3f488d5a Polish 2016-10-11 17:54:00 -07:00
Andy Wilkinson 0333416952 Update WelcomePageHandlerMapping to handle reqs with no Accept header
Closes gh-7138
2016-10-11 13:02:36 +01:00
Stephane Nicoll b1d2552ede Merge pull request #7137 from michael-simons:polish_application-properties-docs
* pr/7137:
  Add missing parentheses
2016-10-11 08:31:59 +02:00
Michael J. Simons e87cf937e1 Add missing parentheses
Closes gh-7137
2016-10-11 08:31:44 +02:00
Stephane Nicoll 98f14f2ee9 Polish documentation
Closes gh-2642
2016-10-11 08:30:18 +02:00
Andy Wilkinson a5b4c8e6db Make cycle clearer in bean currently in creation failure analysis
Note: the fully-qualified references to @Configuration in some of the
test configuration classes are required to work around a bug in javac.
1.8.0_102 (and earlier). Without them, compilation fails as it cannot
resolve the symbol despite the import statement and the unqualified
references working elsewhere in the same source file.

Closes gh-7056
2016-10-07 17:07:44 +01:00
Stephane Nicoll 9861cb7e9c Expand the note regarding LiveReload
See gh-7080
2016-10-07 14:21:12 +02:00
Stephane Nicoll f2511cfa49 Merge pull request #7127 from herau:fix/spring-boot-docs-thymeleaf
* pr/7127:
  Fix typo
2016-10-07 14:15:04 +02:00
Aurélien Leboulanger 2c64661b58 Fix typo
Closes gh-7127
2016-10-07 14:14:50 +02:00
Stephane Nicoll 4a34c35da3 Merge pull request #7120 from izeye:fix-string-format
* pr/7120:
  Fix String.format() usages
2016-10-07 09:46:03 +02:00
Johnny Lim 1c4c0c6119 Fix String.format() usages
Closes gh-7120
2016-10-07 09:45:43 +02:00