Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java
#	spring-websocket/src/main/java/org/springframework/web/socket/adapter/standard/StandardToWebSocketExtensionAdapter.java
#	spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/SockJsClient.java
This commit is contained in:
Sam Brannen
2022-07-11 21:37:13 +02:00
parent bcb6f13fc4 03f0c57704
commit 7751c44487
25 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpReceivingTransportHandlerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
/**
* Test fixture for {@link AbstractHttpReceivingTransportHandler} and sub-classes
* Test fixture for {@link AbstractHttpReceivingTransportHandler} and subclasses
* {@link XhrReceivingTransportHandler}.
*
* @author Rossen Stoyanchev

2
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpSendingTransportHandlerTests.java
View File

@@ -36,7 +36,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
/**
* Test fixture for {@link AbstractHttpSendingTransportHandler} and sub-classes.
* Test fixture for {@link AbstractHttpSendingTransportHandler} and subclasses.
*
* @author Rossen Stoyanchev
*/