From 0e5f27c94e5fa33a294d342dbc9ed61e6c032468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=85=B6=E8=8B=97?= Date: Fri, 20 Mar 2020 22:59:47 +0800 Subject: [PATCH] Introduce NonNull to package-info --- .../socket/server/jetty/JettyRequestUpgradeStrategy.java | 8 ++++++-- .../web/socket/server/jetty/package-info.java | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java index b3a10faf881..2cbbb90ed29 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/JettyRequestUpgradeStrategy.java @@ -39,6 +39,7 @@ import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.http.server.ServletServerHttpResponse; +import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.CollectionUtils; @@ -67,15 +68,18 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Serv private static final ThreadLocal containerHolder = new NamedThreadLocal<>("WebSocketHandlerContainer"); - + @Nullable private WebSocketPolicy policy; + @Nullable private WebSocketServerFactory factory; + @Nullable private ServletContext servletContext; private volatile boolean running = false; + @Nullable private volatile List supportedExtensions; @@ -196,7 +200,7 @@ public class JettyRequestUpgradeStrategy implements RequestUpgradeStrategy, Serv @Override public void upgrade(ServerHttpRequest request, ServerHttpResponse response, - String selectedProtocol, List selectedExtensions, Principal user, + @Nullable String selectedProtocol, List selectedExtensions, @Nullable Principal user, WebSocketHandler wsHandler, Map attributes) throws HandshakeFailureException { Assert.isInstanceOf(ServletServerHttpRequest.class, request, "ServletServerHttpRequest required"); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/package-info.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/package-info.java index 2a3627773a1..20a6fa642b5 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/package-info.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/jetty/package-info.java @@ -1,4 +1,9 @@ /** * Server-side support for the Jetty 9+ WebSocket API. */ +@NonNullApi +@NonNullFields package org.springframework.web.socket.server.jetty; + +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields;