From c83d741d3c3e4dcb9baf216eaa19533c56c0c990 Mon Sep 17 00:00:00 2001 From: "robin.bygrave" Date: Tue, 10 Dec 2024 15:19:17 +1300 Subject: [PATCH] Make websockets.Util final and not public --- .../net/httpserver/websockets/Util.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/robaho/net/httpserver/websockets/Util.java b/src/main/java/robaho/net/httpserver/websockets/Util.java index b62ef1b..c83e610 100644 --- a/src/main/java/robaho/net/httpserver/websockets/Util.java +++ b/src/main/java/robaho/net/httpserver/websockets/Util.java @@ -41,25 +41,25 @@ import com.sun.net.httpserver.HttpExchange; -public class Util { +final class Util { - public static final String HEADER_UPGRADE = "Upgrade"; + static final String HEADER_UPGRADE = "Upgrade"; - public static final String HEADER_UPGRADE_VALUE = "websocket"; + static final String HEADER_UPGRADE_VALUE = "websocket"; - public static final String HEADER_CONNECTION = "Connection"; + static final String HEADER_CONNECTION = "Connection"; - public static final String HEADER_CONNECTION_VALUE = "Upgrade"; + static final String HEADER_CONNECTION_VALUE = "Upgrade"; - public static final String HEADER_WEBSOCKET_VERSION = "sec-websocket-version"; + static final String HEADER_WEBSOCKET_VERSION = "sec-websocket-version"; - public static final String HEADER_WEBSOCKET_VERSION_VALUE = "13"; + static final String HEADER_WEBSOCKET_VERSION_VALUE = "13"; - public static final String HEADER_WEBSOCKET_KEY = "sec-websocket-key"; + static final String HEADER_WEBSOCKET_KEY = "sec-websocket-key"; - public static final String HEADER_WEBSOCKET_ACCEPT = "sec-websocket-accept"; + static final String HEADER_WEBSOCKET_ACCEPT = "sec-websocket-accept"; - public static final String HEADER_WEBSOCKET_PROTOCOL = "sec-websocket-protocol"; + static final String HEADER_WEBSOCKET_PROTOCOL = "sec-websocket-protocol"; private final static String WEBSOCKET_KEY_MAGIC = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; @@ -67,7 +67,7 @@ private static String encodeBase64(byte[] buf) { return Base64.getEncoder().encodeToString(buf); } - public static String makeAcceptKey(String key) throws NoSuchAlgorithmException { + static String makeAcceptKey(String key) throws NoSuchAlgorithmException { MessageDigest md = MessageDigest.getInstance("SHA-1"); String text = key + Util.WEBSOCKET_KEY_MAGIC; md.update(text.getBytes(), 0, text.length()); @@ -77,7 +77,7 @@ public static String makeAcceptKey(String key) throws NoSuchAlgorithmException { private static final String CONTENT_TYPE = "Content-type"; - public static void sendResponseHeaders(HttpExchange exchange, int code, String reason) throws IOException { + static void sendResponseHeaders(HttpExchange exchange, int code, String reason) throws IOException { var bytes = reason.getBytes(); exchange.getRequestHeaders().set(CONTENT_TYPE, "text/plain"); exchange.sendResponseHeaders(code, bytes.length);