Skip to content

Commit 0e5f27c

Browse files
chenqimiaojhoeller
authored andcommitted
Introduce NonNull to package-info
1 parent e11373f commit 0e5f27c

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.springframework.http.server.ServerHttpResponse;
4040
import org.springframework.http.server.ServletServerHttpRequest;
4141
import org.springframework.http.server.ServletServerHttpResponse;
42+
import org.springframework.lang.Nullable;
4243
import org.springframework.util.Assert;
4344
import org.springframework.util.ClassUtils;
4445
import org.springframework.util.CollectionUtils;
@@ -67,15 +68,18 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Serv
6768
private static final ThreadLocal<WebSocketHandlerContainer> containerHolder =
6869
new NamedThreadLocal<>("WebSocketHandlerContainer");
6970

70-
71+
@Nullable
7172
private WebSocketPolicy policy;
7273

74+
@Nullable
7375
private WebSocketServerFactory factory;
7476

77+
@Nullable
7578
private ServletContext servletContext;
7679

7780
private volatile boolean running = false;
7881

82+
@Nullable
7983
private volatile List<WebSocketExtension> supportedExtensions;
8084

8185

@@ -196,7 +200,7 @@ private Set<String> getExtensionNames() {
196200

197201
@Override
198202
public void upgrade(ServerHttpRequest request, ServerHttpResponse response,
199-
String selectedProtocol, List<WebSocketExtension> selectedExtensions, Principal user,
203+
@Nullable String selectedProtocol, List<WebSocketExtension> selectedExtensions, @Nullable Principal user,
200204
WebSocketHandler wsHandler, Map<String, Object> attributes) throws HandshakeFailureException {
201205

202206
Assert.isInstanceOf(ServletServerHttpRequest.class, request, "ServletServerHttpRequest required");
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
/**
22
* Server-side support for the Jetty 9+ WebSocket API.
33
*/
4+
@NonNullApi
5+
@NonNullFields
46
package org.springframework.web.socket.server.jetty;
7+
8+
import org.springframework.lang.NonNullApi;
9+
import org.springframework.lang.NonNullFields;

0 commit comments

Comments
 (0)