1248 Commits

Author SHA1 Message Date
Johnny Lim
62549ffb49 Polish
Closes gh-16597
2019-04-19 10:02:46 +02:00
Phillip Webb
b879972d0d Migrate to MergedAnnotations API
Migrate away from `AnnotationUtils` and `AnnotatedElementUtils`
when possible to the new `MergedAnnotations` API.

Closes gh-16551
2019-04-18 15:40:02 -07:00
Madhura Bhave
eda14fb0f6 Analyze failure if configprop scanning results in two beans
Closes gh-16581
2019-04-18 11:43:53 -07:00
Andy Wilkinson
15f28dcc68 Polish "Determine Spring Boot version correctly when using module path"
See gh-16182
2019-04-18 15:09:17 +01:00
Hendrig Sellik
ec8fb614f7 Determine Spring Boot version correctly when using module path
In Java 9, a package may return null for its implementation version
even when the manifest attribute specifying the version is present
in the jar from which the package was loaded.

This commit updates SpringBootVersion to fall back to
accessing the jar and its manifest attributes directly when the
implementation version of its package is null.

See gh-16182
2019-04-18 15:09:11 +01:00
Stephane Nicoll
a79e49f1dd Merge branch '2.1.x' 2019-04-17 11:57:32 +02:00
Johnny Lim
363994515b Polish
See gh-16575
2019-04-17 11:56:31 +02:00
Phillip Webb
5f1bbf8c72 Update copyright header of changed files 2019-04-15 17:51:08 -07:00
Phillip Webb
2dfd916c96 Polish 2019-04-15 17:51:08 -07:00
Madhura Bhave
08260388bf Merge branch '2.1.x' 2019-04-15 16:30:07 -07:00
Rudy Adams
0aa25fb742 Add tests for CompressionConnectorCustomizer
Closes gh-16515
2019-04-15 16:17:29 -07:00
Brian Clozel
71362299ae Polish RSocket server bootstrap
See gh-16021
2019-04-15 21:42:21 +02:00
Brian Clozel
9eb7260699 Polish RSocket server support
Relax the `NettyRSocketBootstrap` contract to allow all types of
`SocketAcceptor` implementations.

See gh-16021
2019-04-11 20:52:49 +02:00
Brian Clozel
2112e02eda Polish
Closes gh-15952
2019-04-11 19:07:14 +02:00
Dmytro Nosan
2c20d01e25 Add requestId info to ErrorAttributes in WebFlux
See gh-15952
2019-04-11 19:06:52 +02:00
Brian Clozel
b33944b53f Add RSocket server support with Spring Messaging
This commit adds support for RSocket server applications.
The auto-configuration will either add RSocket support to an existing
Reactor Netty server in a WebFlux application (as a WebSocket endpoint),
or bootstrap a brand new RSocket server instance.

Spring Boot will also auto-configure the Spring Messaging infrastructure
that supports Controller beans with `@MessageMapping` annotated methods.

Fixes gh-16021
2019-04-11 15:44:17 +02:00
Madhura Bhave
ce0282406f Skip lazy init for beans that explicitly set lazy to false
This commit also adds tests to ensure that the child
management context works when lazy initialization is
enabled. Also, it adds a BeanFactoryPostProcessor to
the child context so that the server is created and
listening for requests but other beans in the child
context are not created until requested.

See gh-16184
2019-04-05 18:02:26 -07:00
Phillip Webb
8626a33bbb Polish "Migrate ApplicationContext to common hierarchy"
Users calling the methods will still face problems but at least they
will have some guidance.

Closes gh-16096
2019-04-05 14:17:49 +02: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
Stephane Nicoll
dbf8245c1d Polish "Polish embedded tomcat setup"
Closes gh-16446
2019-04-05 08:44:54 +02:00
Rudy Adams
06028f83b2 Polish embedded tomcat setup
See gh-16446
2019-04-05 08:44:54 +02:00
Madhura Bhave
7587af343d Merge pull request #16342 Pascal Zwick
* pr/16342:
  Polish "Simplify the configuration of the ProtocolHandler"
  Simplify the configuration of the ProtocolHandler
2019-04-04 12:41:15 -07:00
Madhura Bhave
ad767ca4e1 Polish "Simplify the configuration of the ProtocolHandler"
Closes gh-16342
2019-04-04 12:41:05 -07:00
Pascal Zwick
2eaa64f82e Simplify the configuration of the ProtocolHandler
This commit introduces a new callback interface that can
be used to customize the ProtocolHandler on a Tomcat Connector.

See gh-16342
2019-04-04 12:24:47 -07:00
Stephane Nicoll
763c1a99e0 Polish 2019-04-04 11:01:10 +02:00
Phillip Webb
ad7eebee9e Merge branch '2.1.x' 2019-04-03 17:00:25 -07:00
Phillip Webb
f12ab1ff90 Update copyright header of changed files 2019-04-03 16:13:00 -07:00
Phillip Webb
34fee1adfa Polish 2019-04-03 16:12:37 -07: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
mmitropolitsky
deaf5fa433 Replace ${sys:PID} with %pid in log4j2 configuration
Replacing property sys:PID which was set in the code with the default
log4j2 Pattern in log4j2.xml and log4j2-file.xml files.

Closes gh-16174
2019-04-02 17:07:54 +02:00
Stephane Nicoll
57cad53ea9 Adapt to latest API change 2019-04-02 15:17:23 +02:00
Andy Wilkinson
512fbae715 Merge branch '2.1.x' 2019-04-02 10:47:30 +01:00
Andy Wilkinson
22c9364237 Only use AprLifecycleListener when native library is available
Closes gh-16040
2019-04-02 10:47:24 +01:00
Andy Wilkinson
6615e11e65 Merge branch '2.1.x' 2019-03-29 16:12:40 +00:00
Andy Wilkinson
4e734669fe Merge branch '2.0.x' into 2.1.x 2019-03-29 16:12:27 +00:00
Andy Wilkinson
7990c8ba68 Merge branch '1.5.x' into 2.0.x 2019-03-29 16:06:47 +00:00
Stephane Nicoll
d7d2c345c1 Merge branch '2.1.x' 2019-03-29 15:58:00 +01:00
Stephane Nicoll
b894696efb Polish "Automatically detect log4j2.properties"
Closes gh-16262
2019-03-29 15:57:06 +01:00
Mohamed Rifni
2cb4403cd0 Automatically detect log4j2.properties
See gh-16262
2019-03-29 15:55:49 +01:00
Andy Wilkinson
5e22b421c5 Merge branch '2.1.x' 2019-03-29 11:14:06 +00:00
Andy Wilkinson
6aa78801ff Merge branch '2.0.x' into 2.1.x 2019-03-29 11:13:53 +00:00
Andy Wilkinson
6507d1723d Merge branch '1.5.x' into 2.0.x 2019-03-29 11:02:56 +00:00
Johnny Lim
40d0d6b113 Polish
Closes gh-16299
2019-03-28 16:42:27 +01: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
Andy Wilkinson
14b21026bf Polish "Use HTTPS for external links wherever possible"
See gh-16319
2019-03-28 09:17:50 +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