Commit Graph

263 Commits

Author SHA1 Message Date
lijuny b26f887a2e Simplify some code
See gh-17852
2019-08-14 08:48:16 +02:00
周武栋 6fab5b591b Simplify some code
See gh-17837
2019-08-14 08:36:17 +02:00
Phillip Webb 8bc780762a Merge branch '2.1.x' 2019-07-24 11:42:48 +01:00
Phillip Webb fb1dd8fe93 Merge branch '2.0.x' into 2.1.x 2019-07-24 11:41:32 +01:00
Phillip Webb 913e831f4e Merge '1.5.x' into 2.0.x 2019-07-24 11:39:58 +01:00
Phillip Webb a9ba7080ce Merge branch '2.1.x' 2019-07-17 21:48:42 +01:00
Phillip Webb eff1147ccc Rename classpath runner package
Remove `runner` since we're no longer tied to JUnit 4.

See gh-17491
2019-07-15 13:40:26 +01:00
Phillip Webb 1117fdb2b3 Make ModifiedClassPathExtension package private
Meta-annotate `ClassPathExclusions` and `ClassPathOverrides` with
so that the `ModifiedClassPathExtension` no longer needs to be
used directly.

See gh-17491
2019-07-15 13:38:26 +01:00
dreis2211 0f0278e69b Migrate ModifiedClassPath tests to JUnit 5
Migrate the remaining JUnit 4 tests to JUnit 5, making use of the
new `ModifiedClassPathExtension`.

See gh-17491
2019-07-15 00:31:03 +01:00
Phillip Webb 01933f9b06 Merge previously split strings
Merge some string lines that were previously split because of the
90 chars wide formatting.
2019-07-15 00:24:19 +01:00
Phillip Webb c3816bfe7b Polish output capture names 2019-07-15 00:24:18 +01:00
Johnny Lim 426ef749db Polish
See gh-17413
2019-07-09 07:40:30 +02:00
Andy Wilkinson 0d124e9857 Remove use of field injection from spring-boot-devtools
Closes gh-17442
2019-07-05 14:59:01 +01:00
Phillip Webb a66c4d3096 Unify method visibility of private classes
Apply checkstyle rule to ensure that private and package private
classes do not have unnecessary public methods. Test classes have
also been unified as much as possible to use default scoped
inner-classes.

Closes gh-7316
2019-07-03 11:39:47 -07:00
Phillip Webb 605599138e Merge branch '2.1.x' 2019-06-28 23:56:02 -07:00
Phillip Webb 92bff3c328 Merge branch '2.0.x' into 2.1.x 2019-06-28 23:42:28 -07:00
Phillip Webb cfeb0239b7 Merge branch '1.5.x' into 2.0.x 2019-06-28 23:28:34 -07:00
Stephane Nicoll e560b7f6ba Remove public modifier on JUnit5 lifecycle methods
See gh-17292
2019-06-21 18:09:05 +02:00
Andy Wilkinson cffc870fd6 Fix test failures on Windows
Since the move to JUnit 5, a number of tests were failing on Windows.
The majority were failing due to open file handles preventing the
clean up of the tests' temporary directory. This commit addresses
these failures by updating the tests to close JarFiles, InputStreams,
OutputStreams etc.

A change has also been made to CachingOperationInvokerTests to make
a flakey test more robust. Due to System.currentTimeMillis() being
less precise on Windows than it is on *nix platforms, the test could
fail as it would not sleep for long enough for the TTL period to have
expired.
2019-06-13 09:24:31 +01:00
Andy Wilkinson 38552065e8 Merge branch '2.1.x'
Closes gh-17114
2019-06-12 11:37:05 +01:00
Andy Wilkinson 7103eab2e6 Close JarFiles when looking for Class-Path manifest entries
Fixes gh-17095
2019-06-12 11:36:34 +01:00
Andy Wilkinson c11f25bf8b Merge branch '2.1.x'
Closes gh-17104
2019-06-11 10:52:03 +01:00
Andy Wilkinson 95d0e26c35 Fix command DevTools uses to shut down in-memory Derby DB
Closes gh-17099
2019-06-11 10:29:09 +01:00
Phillip Webb 266d6334b2 Fix checkstyle RedundantModifier test violations 2019-06-07 20:46:33 -07:00
Andy Wilkinson b18fffaf14 Move tests to JUnit 5 wherever possible 2019-06-07 12:25:54 +01:00
Andy Wilkinson aef92b9295 Merge branch '2.1.x'
Closes gh-17079
2019-06-07 11:00:44 +01:00
Andy Wilkinson 24925c3dae Merge branch '2.0.x' into 2.1.x
Closes gh-17078
2019-06-07 10:50:34 +01:00
Andy Wilkinson c6c139d980 Merge branch '1.5.x' into 2.0.x 2019-06-07 10:46:31 +01:00
Phillip Webb d306b31ce9 Merge branch '2.1.x' 2019-06-04 02:08:00 -07:00
Phillip Webb ccfbd03482 Merge branch '2.0.x' into 2.1.x 2019-06-04 02:07:14 -07:00
Phillip Webb 5fba43aa31 Merge branch '1.5.x' into 2.0.x 2019-06-04 00:05:57 -07:00
Stephane Nicoll f30e29a4ad Rename spring.reactor.stacktrace-mode.enabled property
Closes gh-16537
2019-06-03 12:18:07 +02:00
Andy Wilkinson 0644a79401 Repackage output capture and always use extension declaratively
Closes gh-17029
2019-05-31 18:33:10 +01:00
Andy Wilkinson 3432044997 Use deferred logging to report Class-Path manifest attribute problems
Closes gh-16883
2019-05-23 11:20:15 +01:00
Johnny Lim 7aaad7e5f4 Fix assertion for outcomeWhenDevtoolsShouldBeEnabledIsTrueShouldMatch()
Closes gh-16815
2019-05-20 14:27:38 +02:00
Phillip Webb 3a9ca5fa30 Update copyright header of changed files 2019-05-14 21:05:53 -07:00
Brian Clozel 08cb8368ef Delete Devtools cache reset support for HATEOAS
As of spring-projects/spring-hateoas#854, Spring HATEOAS is not relying
on Objenesis anymore and removed the cache that was being used for it.

This commit removes the support for clearing that cache when running an
application with Devtools enabled.

See gh-16833
2019-05-13 22:20:42 +02:00
Andy Wilkinson ef11af8676 Polish "Remove unnecessary latches in tests"
Closes gh-16733
2019-05-09 12:12:23 +01:00
Johnny Lim 0baceb4aa4 Remove unnecessary latches in tests
See gh-16733
2019-05-09 12:09:54 +01:00
Johnny Lim 7c8bf48ebb Polish DevToolsEnablementDeducer and OnEnabledDevToolsCondition
See gh-16732
2019-05-09 12:01:33 +01:00
Phillip Webb 17aaf26590 Use consistent javadoc style for annotation links
Closes gh-13920
2019-04-24 19:37:59 -07:00
Madhura Bhave ac2b0093c7 Disable DevTools' post-processors and auto-config when running tests
Closes gh-5307
2019-04-16 11:07:33 -07:00
Madhura Bhave 3c203e9b0d Update devtools to use @Lazy(false)
Fixes gh-16184
2019-04-05 18:02:27 -07:00
Stephane Nicoll c432288ed1 Migrate ApplicationContext to common hierarchy
This commit migrates `AnnotationConfigReactiveWebApplicationContext`
parent to the `GenericApplicationContext` abstraction. Any use of
`AnnotationConfigWebApplicationContext` is also removed as it also
inherits from the `AbstractRefreshableApplicationContext` outdated
hierarchy.

A new `AnnotationConfigServletWebApplicationContext` context is
introduced instead, extending from `GenericApplicationContext` and
providing the counter part of the reactive context for the Servlet-based
web app tests.

See gh-16096
2019-04-05 14:17:41 +02:00
Phillip Webb 2376f973f4 Merge branch '2.1.x' 2019-04-02 13:46:36 -07:00
Phillip Webb 47c6bf741d Merge branch '2.0.x' into 2.1.x 2019-04-02 13:40:21 -07:00
Phillip Webb 07c000c5b7 Merge branch '1.5.x' into 2.0.x 2019-04-02 13:34:28 -07:00
Andy Wilkinson 878a635bfb Merge branch '2.1.x' 2019-03-28 11:48:47 +00:00
Andy Wilkinson 864942ad4f Merge branch '2.0.x' into 2.1.x 2019-03-28 09:35:53 +00:00
Spring Operator 1a4c6f2dac Use HTTPS for external links wherever possible
See gh-16319
2019-03-27 20:06:52 +00:00
Andy Wilkinson ba4671f0ab Merge branch '1.5.x' into 2.0.x 2019-03-27 19:59:36 +00:00
Andy Wilkinson 36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson 9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Andy Wilkinson b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
Andy Wilkinson a36aa67b52 Merge branch '2.0.x' into 2.1.x 2019-03-19 17:04:41 +00:00
Spring Operator 3e2b6ac8ed Update build and setup configuration to use HTTPS
See gh-16246
2019-03-19 16:58:31 +00:00
Andy Wilkinson 68bfb020aa Reduce need for bean method proxying and disable where not needed
Closes gh-9068
2019-03-12 13:18:42 +00:00
Andy Wilkinson aa2008bc5a Merge branch '2.1.x' 2019-03-11 16:40:19 +00:00
Andy Wilkinson f0ef693376 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:28:29 +00:00
Andy Wilkinson c2eeeb032c Work around javac bug 2019-03-11 16:27:56 +00:00
Andy Wilkinson 8c3cec8f13 Merge branch '2.0.x' into 2.1.x 2019-03-11 16:14:19 +00:00
Andy Wilkinson 361437f4e2 Merge branch '1.5.x' into 2.0.x 2019-03-11 15:53:34 +00:00
Andy Wilkinson 2bd3d19bee Ensure that DevTools' beans use eager init even when app is lazy
Closes gh-15870
2019-03-08 10:05:40 +00:00
Andy Wilkinson d6a869fa98 Switch to Jakarta EE API dependencies where possible
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00:00
Stephane Nicoll 2ad234b605 Adapt to breaking change in Spring Hateoas 2019-02-28 13:42:27 +01:00
Andy Wilkinson de0c065625 Inject single-use configuration dependencies into bean methods
Closes gh-15751
2019-02-20 17:02:43 +00:00
Johnny Lim 55f5f2f910 Polish
Closes gh-15987
2019-02-19 09:14:40 +01:00
Andy Wilkinson bd504e68fc Merge branch '2.1.x' 2019-02-14 15:21:30 +00:00
Andy Wilkinson 33b9321071 Track condition evaluation per-context when determining delta
Closes gh-15766
2019-02-14 15:11:18 +00:00
Andy Wilkinson be40d000ba Merge branch '2.1.x' 2019-02-14 14:46:59 +00:00
Andy Wilkinson 1be794fe65 Retry upload for any SocketException not just a ConnectException
Previously, DevTools would retry the upload of the changes to an
application in the event of a ConnectException. If a different
network-level failure occurred, it would not be retried and would
cause the file watching thread to die.

This commit attempts to make things more robust by retrying all
SocketExceptions and not just ConnectExceptions. A warning is
logged when a failure occurs. A separate debug message that
includes the exception is also logged.

Closes gh-10317
2019-02-14 14:46:52 +00:00
Andy Wilkinson d9ec48ef12 Merge branch '2.1.x' 2019-02-11 16:13:52 +00:00
Andy Wilkinson 3f32fbd0de Polish "Remove unwanted @Nullable annotations"
See gh-15876
2019-02-11 16:11:40 +00:00
wonwoo 2855321074 Remove unwanted @Nullable annotations
See gh-15876
2019-02-11 16:07:29 +00:00
Andy Wilkinson 45cc649c7d Merge branch '2.1.x' 2019-02-04 12:36:33 +00:00
Andy Wilkinson 82bc87560c Use AssertJ’s exception assertions rather than fail
Closes gh-15761
2019-02-04 11:48:26 +00:00
dreis2211 d4ab101223 Use Assertions.contentOf() where possible
Closes gh-15793
2019-01-28 10:08:57 +01:00
Stephane Nicoll dca6879d4e Polish "Remove an unused interface in RestarterTests"
Closes gh-15666
2019-01-10 13:25:34 +01:00
Johnny Lim d7f0c1d63c Remove an unused interface in RestarterTests
See gh-15666
2019-01-10 13:25:14 +01:00
Andy Wilkinson 61d04db0d7 Minimize and centralize assumptions about build output
Closes gh-15471
2018-12-14 17:50:20 +00:00
Andy Wilkinson db5ab1d14c Do not rely on test runner using static main method in RestarterTests
Closes gh-15461
2018-12-13 13:39:19 +00:00
igor-suhorukov a2ebba8db1 Replace explicit generic type with diamond operator
See gh-15424
2018-12-09 11:42:27 +01:00
igor-suhorukov 5c1813aef8 Replace this lambda with a method reference
See gh-15401
2018-12-07 11:01:42 +01:00
Phillip Webb 5e50f762a3 Revert DevTools polish
It seems like we can't use constructor injection at the
moment.
2018-10-29 18:37:58 -07:00
Phillip Webb f3fa20b2d1 Polish 2018-10-29 14:25:45 -07:00
Andy Wilkinson 743782de7e Revert reloadable message source support
Closes gh-14882
See gh-14699
See gh-13377
2018-10-29 16:24:59 +00:00
Andy Wilkinson 8ec9f23719 Polish "Add Log Output when DevTools restart is disabled"
Closes gh-14807
2018-10-29 12:38:43 +00:00
Marcus Eisele e76605ff75 Add Log Output when DevTools restart is disabled
This covers the cases when:
  * An Java agent based reloader (e.g. JRebel) is being used
  * The reloader was disabled by using a system property

See gh-14807
2018-10-29 12:38:21 +00:00
Phillip Webb c393f6262e Merge branch '2.0.x' 2018-10-26 16:36:02 -07:00
Phillip Webb 33c7a74bee Update copyright year for changed files 2018-10-26 16:35:28 -07:00
Madhura Bhave 5f24af6c3c Polish
Closes gh-14915
2018-10-23 13:51:13 -07:00
michal 7181e76135 Skip restarter for JUnit5
See gh-14915
2018-10-23 13:50:57 -07:00
Madhura Bhave 80bb7ea9d6 Merge branch '2.0.x' 2018-10-23 13:43:40 -07:00
Madhura Bhave bc58d4456f Rationalize DefaultRestartInitializerTests
Closes gh-14927
2018-10-23 13:43:11 -07:00
Stephane Nicoll 1a0d53dec0 Replace ReflectionTestUtils usage by hasFieldOrPropertyWithValue
Closes gh-14696
2018-10-15 08:25:10 +02:00
Phillip Webb 1d8e4a8f5c Make devtools set spring.messages.reloadable=true
Update `DevToolsPropertyDefaultsPostProcessor` to automatically set
the recently introduced `spring.messages.reloadable` property to
`true`.

Closes gh-14699
2018-10-05 13:59:26 -07:00
Johnny Lim 335775892b Polish
See gh-14667
2018-10-03 13:57:18 +02:00
Phillip Webb d76bba5e6f Migrate from ExpectedException rule to AssertJ
Replace ExpectedException JUnit rules with AssertJ exception
assertions.

Closes gh-14336
2018-10-02 10:55:28 -07:00
Johnny Lim 698bbd6a9e Polish
Closes gh-14597
2018-09-26 11:45:21 -04:00