Commit Graph

14947 Commits

Author SHA1 Message Date
Phillip Webb
fc29f54868 Make Context implement AnnotationConfigRegistry
Update `AnnotationConfigReactiveWebServerApplicationContext` to
implement `AnnotationConfigRegistry`.

Fixes gh-11686
2018-01-18 23:21:51 -08:00
Phillip Webb
f3379668ac Polish 2018-01-18 23:21:51 -08:00
Phillip Webb
6d93573db0 Merge branch '1.5.x' 2018-01-18 22:03:51 -08:00
Phillip Webb
8e783cdae9 Polish 2018-01-18 21:42:11 -08:00
Stephane Nicoll
ba6be4f22f Merge branch '1.5.x' 2018-01-18 22:35:32 +01:00
Stephane Nicoll
71ab5dd748 Restore proper handling of array types
Closes gh-11512
2018-01-18 22:07:49 +01:00
Stephane Nicoll
8704cf1fe7 Harmonize metric property names
See gh-11667
2018-01-18 17:21:40 +01:00
Stephane Nicoll
efd941bbe0 Merge branch '1.5.x' 2018-01-18 17:05:22 +01:00
Stephane Nicoll
6086bc714f Fix json structure 2018-01-18 17:04:37 +01:00
Johnny Lim
97a51ddcaa Use the platform-specific line separator
See gh-11674
2018-01-18 17:00:18 +01:00
Stephane Nicoll
e30d1da889 Merge pull request #11665 from izeye:line-separator
* pr/11665:
  Polish "Use System.lineSeparator()""
  Use System.lineSeparator()
2018-01-18 16:56:18 +01:00
Stephane Nicoll
aa748cb0ef Polish "Use System.lineSeparator()""
Closes gh-11665
2018-01-18 16:45:29 +01:00
Johnny Lim
d8c83af987 Use System.lineSeparator()
See gh-11665
2018-01-18 16:45:09 +01:00
Stephane Nicoll
7002507304 Polish 2018-01-18 16:34:56 +01:00
Stephane Nicoll
171cbc650c Merge pull request #10887 from acogoluegnes:rabbitmq-metrics-autoconfiguration-spring-boot-2
* pr/10887:
  Polish "Add auto-configuration for RabbitMQ metrics"
  Add auto-configuration for RabbitMQ metrics
2018-01-18 16:17:24 +01:00
Stephane Nicoll
beaa49a2d6 Polish "Add auto-configuration for RabbitMQ metrics"
Closes gh-10887
2018-01-18 16:16:26 +01:00
Arnaud Cogoluègnes
58c8c4d56a Add auto-configuration for RabbitMQ metrics
See gh-10887
2018-01-18 16:11:50 +01:00
Andy Wilkinson
1d9f9716e9 Merge branch '1.5.x'
# Conflicts:
#	spring-boot-project/spring-boot-dependencies/pom.xml
2018-01-18 14:52:30 +00:00
Andy Wilkinson
330881db78 Start building against snapshots for Spring Data Ingalls SR10
See gh-11673
2018-01-18 13:56:46 +00:00
Andy Wilkinson
77fea8e328 Upgrade to Lombok 1.16.20
Closes gh-11672
2018-01-18 13:56:46 +00:00
Andy Wilkinson
8279fed385 Upgrade to Narayana 5.5.31.Final
Closes gh-11671
2018-01-18 13:56:46 +00:00
Andy Wilkinson
9721fa0951 Upgrade to Jaybird 2.2.14
Closes gh-11670
2018-01-18 13:56:46 +00:00
Andy Wilkinson
a9e9e98710 Upgrade to Httpcore 4.4.9
Closes gh-11669
2018-01-18 13:56:46 +00:00
Andy Wilkinson
55b0547316 Upgrade to Undertow 1.4.22.Final
Closes gh-11668
2018-01-18 13:56:46 +00:00
Andy Wilkinson
e1ec0562b2 Revert "Disable Reactor Netty's use of kqueue/epoll"
The failure continued to occur so this commit reverts commit
42c1ce65e9.

See gh-10569
2018-01-18 13:46:27 +00:00
Andy Wilkinson
d5c9b9e12f Start building against snapshots for Spring Data Kay SR3
See gh-11666
2018-01-18 13:45:51 +00:00
Stephane Nicoll
5cb6c086b6 Rename micrometer instrumentation flags
Closes gh-11667
2018-01-18 14:16:40 +01:00
Stephane Nicoll
49b5fe0c29 Polish
As `validation-api` 2 is available by default, this commit adds the
integration test as a regular test case. The integration test is kept to
exercise what happens in a standard project.

See gh-11512
2018-01-18 14:05:24 +01:00
Stephane Nicoll
60f5cf10ba Merge branch '1.5.x' 2018-01-18 13:59:19 +01:00
Stephane Nicoll
927c2cacfa Rework type generation algorithm
The initial solution to gh-11512 was still using a plain `toString` that
could potentially break with a JDK upgrade. Turns out that JDK9 actually
uses the same type for AnnotatedType and ClassType so the trick of using
a visitor doesn't work anymore.

Retrospectively, it is quite easy to generate the full type once we have
the DeclaredType as we already have some logic to get the qualified,
that is raw, type and we have access to the type parameters.

This commit still uses a `toString` to generate the representation of
the type parameters but this looks much safer than trying to redo what
such a simple `toString` should do. Also, the additional metadata that
we could get on an ExecutableElement does not apply to them.

Closes gh-11512
2018-01-18 13:52:12 +01:00
Andy Wilkinson
849baa4c02 Do not require after in audit events endpoint
Closes gh-11605
2018-01-18 11:59:46 +00:00
Brian Clozel
c233125f1d Don't render error view if response is committed
This commit prevents the default error view from rendering itself if the
response has been committed already. In this case, it is impossible to
change the HTTP response status and write a proper response - trying to
do so often results in a `IllegalStateException` since the response body
has already been written to.

Fixes gh-11580
2018-01-18 11:40:11 +01:00
Andy Wilkinson
42c1ce65e9 Disable Reactor Netty's use of kqueue/epoll
There is a suspicion that the use of epoll is causing the intermittent
failures being tracked by gh-10569. This commit disables the use of
epoll to see if it improves the situation.

See gh-10569
2018-01-18 10:18:13 +00:00
Stephane Nicoll
40c537daa0 Polish 2018-01-18 10:20:48 +01:00
Andy Wilkinson
6fb629227c Fix race condition in SampleQuartzApplicationTests 2018-01-17 20:56:42 +00:00
Andy Wilkinson
87182a3a2b Stop configuring the Logback console appender to use UTF-8
Previously, the default Logback configuration set the console
appenders charset to UTF-8. This was inconsistent with the Logback
file appender and Log4j2's console and file appenders, all of which
used the platform's default.

This commit removes the configuration of the Logback console
appender's charset. This means that it will use the platform's
default charset, aligning it with the Logback file appender and
both Log4j2 appenders.

Closes gh-11611
2018-01-17 19:07:34 +00:00
Andy Wilkinson
54c0cf513b Polish 2018-01-17 19:03:23 +00:00
Andy Wilkinson
3904f49c9f Configure ServletContext before initializing S…C…Initializer beans
Previously, the ServletContext was configured after any
ServletContextInitializer beans had been initialized. This meant that
any configuration class that provided such a bean would be initialized
before the ServletContext was configured. If the configuration class
used the ServletContext in its initializtaion that it would see it in
its default, unconfigured state.

This commit reworks the configuration of the ServletContext so that
it happens before any ServletContextInitializer beans are initialized.

Closes gh-10699
2018-01-17 17:32:23 +00:00
Andy Wilkinson
d8b3c7cc3c Make AnnotationConfigSWSApp…Context implement AnnotationConfigRegistry
Closes gh-11658
2018-01-17 17:30:16 +00:00
Stephane Nicoll
a5fd3fbfbd Merge branch '1.5.x' 2018-01-17 15:53:28 +01:00
Stephane Nicoll
7ea4501fd5 Polish 2018-01-17 15:47:53 +01:00
Stephane Nicoll
4f0a94e362 Merge pull request #11621 from eddumelendez:gh-11613
* pr/11621:
  Polish "Add test to spring-boot-sample-quartz"
  Add test to spring-boot-sample-quartz
2018-01-17 14:32:42 +01:00
Stephane Nicoll
51f0d88eec Polish "Add test to spring-boot-sample-quartz"
Closes gh-11621
2018-01-17 14:31:52 +01:00
Eddú Meléndez
5f1f04a33a Add test to spring-boot-sample-quartz
See gh-11621
2018-01-17 14:27:02 +01:00
Stephane Nicoll
8ffce59fe4 Merge pull request #11655 from izeye:polish-20170117
* pr/11655:
  Polish
2018-01-17 14:16:29 +01:00
Johnny Lim
e7185ea2b1 Polish
Closes gh-11655
2018-01-17 14:16:07 +01:00
Stephane Nicoll
4f194c215d Merge pull request #11624 from igor-suhorukov:master
* pr/11624:
  Polish "Fix potential resource leaks"
  Fix potential resource leaks
2018-01-17 14:15:52 +01:00
Stephane Nicoll
d43346d6c2 Polish "Fix potential resource leaks"
Closes gh-11624
2018-01-17 13:56:53 +01:00
igor-suhorukov
5a4238acfc Fix potential resource leaks
See gh-11624
2018-01-17 13:54:50 +01:00
Stephane Nicoll
0b22eb90b5 Merge pull request #11648 from izeye:fix-wrong-import
* pr/11648:
  Fix a wrong import for SocketChannel
2018-01-17 13:51:33 +01:00