9764f0e59b
Merge branch '5.3.x'
...
# Conflicts:
# spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java
# spring-web/src/test/java/org/springframework/http/server/reactive/HeadersAdaptersTests.java
# spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
# spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
# spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
# spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java
# spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java
# spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java
2022-03-16 15:07:53 +01:00
c462fe30ed
Use Named arguments in parameterized tests
2022-03-16 14:45:47 +01:00
67b7c16bc0
Fix visibility of DefaultSockJsSchedulerContainer
...
Closes gh-28146
2022-03-09 16:38:10 +01:00
8c6d59aaaf
Polish contribution
...
See gh-28014
2022-02-19 14:43:26 +01:00
c5c926726d
Use enhanced switch expressions where feasible
...
Closes gh-28014
2022-02-19 14:34:05 +01:00
4782d4c080
Merge branch '5.3.x' into main
2022-02-14 20:52:09 +00:00
11cb938232
Polishing contribution
...
Closes gh-28000
2022-02-14 20:51:02 +00:00
f004bb1b64
Add formatting for SockJS GoAway frame
...
Prevents infinite loop for xhr-polling and xhr-streaming transports.
See gh-28000
2022-02-14 20:51:02 +00:00
b3f786728e
Use modern language features in tests
2022-02-03 15:35:32 +01:00
54565e95b5
Merge branch '5.3.x'
2022-02-03 14:58:36 +01:00
f8a5a8d7be
Use modern language features in tests
2022-02-03 14:50:10 +01:00
7067461d71
Fix exception in Jetty10RequestUpgradeStrategy
...
Closes gh-27899
2022-01-12 15:04:05 +00:00
29fe109440
SockJS TaskScheduler container bean is package private
...
See gh-27903
2022-01-11 13:59:03 +00:00
368201975a
Hide default SockJS TaskScheduler for @EnableWebSocket
...
Closes gh-27903
2022-01-11 10:16:27 +00:00
d57bc176f2
Merge branch '5.3.x'
2022-01-10 14:21:25 +01:00
df263d01b9
Use idiomatic AssertJ assertions for true, false, and null
2022-01-10 14:15:55 +01:00
202b7ea47b
Merge branch '5.3.x'
2022-01-04 15:17:05 +01:00
c3ce4f0f90
Polish contribution
...
See gh-27823
2022-01-04 15:12:29 +01:00
e1200f34e7
Use try-with-resources for AutoClosables where feasible
...
Where unfeasible, this commit adds inline comments to explain why
try-with-resources must not be used in certain scenarios. The purpose
of the comments is to avoid accidental conversion to try-with-resources
at a later date.
Closes gh-27823
2022-01-04 15:12:29 +01:00
7021eb5bb1
Apply "instanceof pattern matching" in additional locations
...
Closes gh-27696
2022-01-03 16:52:38 +01:00
ba468a731f
Remove JamonPerformanceMonitorInterceptor support
...
Includes upgrade to Tomcat 10.0.14, Undertow 2.2.14, Apache HttpClient 5.1.2, Hibernate ORM 5.6.2, Mockito 4.1.
Closes gh-27786
2021-12-14 09:46:08 +01:00
a15393836c
Merge branch '5.3.x' into main
2021-12-09 15:35:21 +00:00
e9083d7d20
Apply LogFormatUtils in more places
2021-12-09 14:53:52 +00:00
7f43128a0e
Merge branch '5.3.x'
...
# Conflicts:
# build.gradle
# spring-web/src/main/java/org/springframework/web/server/MediaTypeNotSupportedStatusException.java
# spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
# spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java
2021-12-03 22:42:05 +01:00
70974e006e
Upgrade to Tomcat 9.0.55, Undertow 2.2.13, RxJava 3.1.3, SmallRye Mutiny 1.2, Joda-Time 2.10.13, JRuby 9.2.20.1, HtmlUnit 2.55, Checkstyle 9.2
2021-12-03 22:32:00 +01:00
4750a9430c
Early removal of 5.x-deprecated code
...
Closes gh-27686
2021-11-18 09:18:06 +01:00
32af39d6e6
Use 'toString(Charset)' instead of 'toString(String)' for encodings ( #27646 )
...
Co-authored-by: 홍성민(SungMin Hong)/Platform Engineering팀/11ST <devmonster@11stcorp.com>
2021-11-10 15:11:33 +01:00
b51813e408
Apply "instanceof pattern matching" in spring-websocket
...
This commit also applies additional clean-up tasks such as the following.
- final fields
- diamond operator (<>) for anonymous inner classes
This has only been applied to `src/main/java`.
2021-10-17 19:04:32 +02:00
08bce08018
Use text blocks with JUnit Jupiter 5.8.1
...
See gh-27450
2021-09-28 14:20:31 +02:00
93efb20a53
Fix broken links in Javadoc
...
This commit removes several links that were broken due to the removal
of various APIs in 6.0.
See gh-27480
2021-09-28 13:34:33 +02:00
16bf39ea1b
Merge branch '5.3.x'
2021-09-28 10:35:18 +02:00
2567b20949
Upgrade to spring-javaformat 0.0.28 and downgrade to Checkstyle 8.41
...
In order to be able to use text blocks and other new Java language
features, we are upgrading to a recent version of Checkstyle.
The latest version of spring-javaformat-checkstyle (0.0.28) is built
against Checkstyle 8.32 which does not include support for language
features such as text blocks. Support for text blocks was added in
Checkstyle 8.36.
In addition, there is a binary compatibility issue between
spring-javaformat-checkstyle 0.0.28 and Checkstyle 8.42. Thus we cannot
use Checkstyle 8.42 or higher.
In this commit, we therefore upgrade to spring-javaformat-checkstyle
0.0.28 and downgrade to Checkstyle 8.41.
This change is being applied to `5.3.x` as well as `main` in order to
benefit from the enhanced checking provided in more recent versions of
Checkstyle.
Closes gh-27481
2021-09-28 10:29:31 +02:00
48875dc44f
Fix Jetty WebSocket test failures
...
See gh-27424
2021-09-17 14:53:09 +01:00
d84ca2ba90
Jakarta EE 9 migration
...
Upgrades many dependency declarations; removes old EJB 2.x support and outdated Servlet-based integrations (Commons FileUpload, FreeMarker JSP support, Tiles).
Closes gh-22093
Closes gh-25354
Closes gh-26185
Closes gh-27423
See gh-27424
2021-09-17 09:14:07 +02:00
cecc0849a8
Upgrade to Gradle 7.2
...
This commit upgrades Gradle to 7.2.
Gradle configuration names are updated accordingly.
This also upgrades Gradle build plugins.
See gh-26870
2021-09-13 09:37:35 +02:00
9f7a94058a
Update copyright date
...
See gh-27298
2021-08-19 16:23:38 +02:00
caf6760ddd
Fix grammatical errors in Javadoc
...
Closes gh-27298
2021-08-19 16:21:15 +02:00
af6fd6c303
Polish "Fix duplicate "the" in Javadoc and XSD"
...
See gh-27291
2021-08-19 08:54:38 +02:00
ac72277258
Fix duplicate "the" in Javadoc and XSD
...
See gh-27291
2021-08-19 08:44:03 +02:00
42edef0bcc
Avoid StringIndexOutOfBoundsException in WebSocketMessageBrokerStats
...
Prior to this commit, if the TaskExecutor configured in
WebSocketMessageBrokerStats for the inboundChannelExecutor or
outboundChannelExecutor was not a ThreadPoolTaskExecutor, a
StringIndexOutOfBoundsException was thrown when attempting to parse the
results of invoking toString() on the executor.
The reason is that ThreadPoolTaskExecutor delegates to a
ThreadPoolExecutor whose toString() implementation generates text
containing "pool size = ...", and WebSocketMessageBrokerStats'
getExecutorStatsInfo() method relied on the presence of "pool" in the
text returned from toString().
This commit fixes this bug by ensuring that the text returned from
toString() contains "pool" before parsing the text. If "pool" is not
present in the text, getExecutorStatsInfo() now returns "unknown"
instead of throwing a StringIndexOutOfBoundsException.
Closes gh-27209
2021-07-25 19:05:02 +02:00
e94811f1b9
Polish WebSocketMessageBrokerConfigurationSupportTests
2021-07-24 21:45:31 +03:00
c6e644e5c3
Polish "Downcast to InetSocketAddress for Jetty 10"
...
This commit uses the target type where getRemoteAddress and
getLocalAddress are defined.
See gh-27120
2021-07-13 09:38:37 +02:00
6d01d49b76
Downcast to InetSocketAddress for Jetty 10
...
Closes gh-27120
2021-07-12 15:04:14 +01:00
fbf4724d78
Replace Jetty 9 only constant with explicit value
...
Closes gh-27121
2021-07-09 20:16:58 +01:00
a2ef6badc4
Use StringBuilder.append(char) where possible
...
To slightly improve performance, this commit switches to
StringBuilder.append(char) instead of StringBuilder.append(String)
whenever we append a single character to a StringBuilder.
Closes gh-27098
2021-06-25 10:44:28 +02:00
23f396a231
Nullability refinements
2021-06-08 14:23:06 +02:00
8d17bcea5b
Validate top-level SockJS URL
...
Closes gh-26933
2021-05-26 11:26:02 +01:00
27c4e74e24
Update CORS Javadoc in spring-websocket
...
Closes gh-26753
2021-04-13 17:43:40 +01:00
0fd774e69f
Add allowedOriginPatterns to WebSocketHandlerRegistration
...
Closes gh-26593
2021-02-24 09:37:20 +00:00
1dd7d53de0
More precise mapping for WebSocket handshake requests
...
Closes gh-26565
2021-02-19 11:49:44 +00:00
Sam Brannen
Stephane Nicoll
a.yazychyan
rstoyanchev
Ivan Zbykovskyi
Marten Deinum
liuzhifei
Juergen Hoeller
SungMin
Brian Clozel
LEE Juchan
Sanghyuk Jung