Skip to content

Make websockets.Util final and not public #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rob-bygrave wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make websockets.Util final and not public #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/main/java/robaho/net/httpserver/websockets/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,33 +41,33 @@

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";

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());
Expand All @@ -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);
Expand Down