diff options
author | LordFokas <lordfokas@gmail.com> | 2015-10-23 01:43:29 +0100 |
---|---|---|
committer | LordFokas <lordfokas@gmail.com> | 2015-10-23 01:43:29 +0100 |
commit | fba310e36e98bb3a7596038f136a4f41f75f3b82 (patch) | |
tree | 1a6690db9045f6f347dbe950d01d4cd2739c2057 | |
parent | e032d6b74e6df5385ecef58a044e0fc574f49eb0 (diff) | |
download | nanohttpd-fba310e36e98bb3a7596038f136a4f41f75f3b82.tar.gz |
Rename NanoWebSocketServer to NanoWSD.
-rw-r--r-- | websocket/src/main/java/fi/iki/elonen/NanoWSD.java (renamed from websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java) | 52 | ||||
-rw-r--r-- | websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java | 6 | ||||
-rw-r--r-- | websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java | 4 | ||||
-rw-r--r-- | websocket/src/test/java/fi/iki/elonen/WebSocketResponseHandlerTest.java | 16 | ||||
-rw-r--r-- | websocket/src/test/java/fi/iki/elonen/samples/echo/EchoWebSocketsTest.java | 4 |
5 files changed, 41 insertions, 41 deletions
diff --git a/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java b/websocket/src/main/java/fi/iki/elonen/NanoWSD.java index 420bfc2..6ccf21c 100644 --- a/websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java +++ b/websocket/src/main/java/fi/iki/elonen/NanoWSD.java @@ -48,11 +48,11 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import fi.iki.elonen.NanoWebSocketServer.WebSocketFrame.CloseCode; -import fi.iki.elonen.NanoWebSocketServer.WebSocketFrame.CloseFrame; -import fi.iki.elonen.NanoWebSocketServer.WebSocketFrame.OpCode; +import fi.iki.elonen.NanoWSD.WebSocketFrame.CloseCode; +import fi.iki.elonen.NanoWSD.WebSocketFrame.CloseFrame; +import fi.iki.elonen.NanoWSD.WebSocketFrame.OpCode; -public abstract class NanoWebSocketServer extends NanoHTTPD { +public abstract class NanoWSD extends NanoHTTPD { public static enum State { UNCONNECTED, @@ -93,8 +93,8 @@ public abstract class NanoWebSocketServer extends NanoHTTPD { this.handshakeRequest = handshakeRequest; this.in = handshakeRequest.getInputStream(); - this.handshakeResponse.addHeader(NanoWebSocketServer.HEADER_UPGRADE, NanoWebSocketServer.HEADER_UPGRADE_VALUE); - this.handshakeResponse.addHeader(NanoWebSocketServer.HEADER_CONNECTION, NanoWebSocketServer.HEADER_CONNECTION_VALUE); + this.handshakeResponse.addHeader(NanoWSD.HEADER_UPGRADE, NanoWSD.HEADER_UPGRADE_VALUE); + this.handshakeResponse.addHeader(NanoWSD.HEADER_CONNECTION, NanoWSD.HEADER_CONNECTION_VALUE); } public boolean isOpen(){ @@ -140,14 +140,14 @@ public abstract class NanoWebSocketServer extends NanoHTTPD { try { this.in.close(); } catch (IOException e) { - NanoWebSocketServer.LOG.log(Level.FINE, "close failed", e); + NanoWSD.LOG.log(Level.FINE, "close failed", e); } } if (this.out != null) { try { this.out.close(); } catch (IOException e) { - NanoWebSocketServer.LOG.log(Level.FINE, "close failed", e); + NanoWSD.LOG.log(Level.FINE, "close failed", e); } } this.state = State.CLOSED; @@ -728,7 +728,7 @@ public abstract class NanoWebSocketServer extends NanoHTTPD { /** * logger to log to. */ - private static final Logger LOG = Logger.getLogger(NanoWebSocketServer.class.getName()); + private static final Logger LOG = Logger.getLogger(NanoWSD.class.getName()); public static final String HEADER_UPGRADE = "upgrade"; @@ -775,10 +775,10 @@ public abstract class NanoWebSocketServer extends NanoHTTPD { byte b2 = i < size ? buf[i++] : 0; int mask = 0x3F; - ar[a++] = NanoWebSocketServer.ALPHABET[b0 >> 2 & mask]; - ar[a++] = NanoWebSocketServer.ALPHABET[(b0 << 4 | (b1 & 0xFF) >> 4) & mask]; - ar[a++] = NanoWebSocketServer.ALPHABET[(b1 << 2 | (b2 & 0xFF) >> 6) & mask]; - ar[a++] = NanoWebSocketServer.ALPHABET[b2 & mask]; + ar[a++] = NanoWSD.ALPHABET[b0 >> 2 & mask]; + ar[a++] = NanoWSD.ALPHABET[(b0 << 4 | (b1 & 0xFF) >> 4) & mask]; + ar[a++] = NanoWSD.ALPHABET[(b1 << 2 | (b2 & 0xFF) >> 6) & mask]; + ar[a++] = NanoWSD.ALPHABET[b2 & mask]; } switch (size % 3) { case 1: @@ -791,30 +791,30 @@ public abstract class NanoWebSocketServer extends NanoHTTPD { public static String makeAcceptKey(String key) throws NoSuchAlgorithmException { MessageDigest md = MessageDigest.getInstance("SHA-1"); - String text = key + NanoWebSocketServer.WEBSOCKET_KEY_MAGIC; + String text = key + NanoWSD.WEBSOCKET_KEY_MAGIC; md.update(text.getBytes(), 0, text.length()); byte[] sha1hash = md.digest(); return encodeBase64(sha1hash); } - public NanoWebSocketServer(int port) { + public NanoWSD(int port) { super(port); } - public NanoWebSocketServer(String hostname, int port) { + public NanoWSD(String hostname, int port) { super(hostname, port); } private boolean isWebSocketConnectionHeader(Map<String, String> headers) { - String connection = headers.get(NanoWebSocketServer.HEADER_CONNECTION); - return connection != null && connection.toLowerCase().contains(NanoWebSocketServer.HEADER_CONNECTION_VALUE.toLowerCase()); + String connection = headers.get(NanoWSD.HEADER_CONNECTION); + return connection != null && connection.toLowerCase().contains(NanoWSD.HEADER_CONNECTION_VALUE.toLowerCase()); } protected boolean isWebsocketRequested(IHTTPSession session) { Map<String, String> headers = session.getHeaders(); - String upgrade = headers.get(NanoWebSocketServer.HEADER_UPGRADE); + String upgrade = headers.get(NanoWSD.HEADER_UPGRADE); boolean isCorrectConnection = isWebSocketConnectionHeader(headers); - boolean isUpgrade = NanoWebSocketServer.HEADER_UPGRADE_VALUE.equalsIgnoreCase(upgrade); + boolean isUpgrade = NanoWSD.HEADER_UPGRADE_VALUE.equalsIgnoreCase(upgrade); return isUpgrade && isCorrectConnection; } @@ -826,26 +826,26 @@ public abstract class NanoWebSocketServer extends NanoHTTPD { public Response serve(final IHTTPSession session) { Map<String, String> headers = session.getHeaders(); if (isWebsocketRequested(session)) { - if (!NanoWebSocketServer.HEADER_WEBSOCKET_VERSION_VALUE.equalsIgnoreCase(headers.get(NanoWebSocketServer.HEADER_WEBSOCKET_VERSION))) { + if (!NanoWSD.HEADER_WEBSOCKET_VERSION_VALUE.equalsIgnoreCase(headers.get(NanoWSD.HEADER_WEBSOCKET_VERSION))) { return newFixedLengthResponse(Response.Status.BAD_REQUEST, NanoHTTPD.MIME_PLAINTEXT, - "Invalid Websocket-Version " + headers.get(NanoWebSocketServer.HEADER_WEBSOCKET_VERSION)); + "Invalid Websocket-Version " + headers.get(NanoWSD.HEADER_WEBSOCKET_VERSION)); } - if (!headers.containsKey(NanoWebSocketServer.HEADER_WEBSOCKET_KEY)) { + if (!headers.containsKey(NanoWSD.HEADER_WEBSOCKET_KEY)) { return newFixedLengthResponse(Response.Status.BAD_REQUEST, NanoHTTPD.MIME_PLAINTEXT, "Missing Websocket-Key"); } WebSocket webSocket = openWebSocket(session); Response handshakeResponse = webSocket.getHandshakeResponse(); try { - handshakeResponse.addHeader(NanoWebSocketServer.HEADER_WEBSOCKET_ACCEPT, makeAcceptKey(headers.get(NanoWebSocketServer.HEADER_WEBSOCKET_KEY))); + handshakeResponse.addHeader(NanoWSD.HEADER_WEBSOCKET_ACCEPT, makeAcceptKey(headers.get(NanoWSD.HEADER_WEBSOCKET_KEY))); } catch (NoSuchAlgorithmException e) { return newFixedLengthResponse(Response.Status.INTERNAL_ERROR, NanoHTTPD.MIME_PLAINTEXT, "The SHA-1 Algorithm required for websockets is not available on the server."); } - if (headers.containsKey(NanoWebSocketServer.HEADER_WEBSOCKET_PROTOCOL)) { - handshakeResponse.addHeader(NanoWebSocketServer.HEADER_WEBSOCKET_PROTOCOL, headers.get(NanoWebSocketServer.HEADER_WEBSOCKET_PROTOCOL).split(",")[0]); + if (headers.containsKey(NanoWSD.HEADER_WEBSOCKET_PROTOCOL)) { + handshakeResponse.addHeader(NanoWSD.HEADER_WEBSOCKET_PROTOCOL, headers.get(NanoWSD.HEADER_WEBSOCKET_PROTOCOL).split(",")[0]); } return handshakeResponse; diff --git a/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java b/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java index 353d649..44e7068 100644 --- a/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java +++ b/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java @@ -37,13 +37,13 @@ import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -import fi.iki.elonen.NanoWebSocketServer; -import fi.iki.elonen.NanoWebSocketServer.WebSocketFrame.CloseCode; +import fi.iki.elonen.NanoWSD; +import fi.iki.elonen.NanoWSD.WebSocketFrame.CloseCode; /** * @author Paul S. Hawke (paul.hawke@gmail.com) On: 4/23/14 at 10:31 PM */ -public class DebugWebSocketServer extends NanoWebSocketServer { +public class DebugWebSocketServer extends NanoWSD { /** * logger to log to. diff --git a/websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java b/websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java index 3060146..e7d7e3b 100644 --- a/websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java +++ b/websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java @@ -35,13 +35,13 @@ package fi.iki.elonen.samples.echo; import java.io.IOException; -import fi.iki.elonen.NanoWebSocketServer; +import fi.iki.elonen.NanoWSD; public class EchoSocketSample { public static void main(String[] args) throws IOException { final boolean debugMode = args.length >= 2 && args[1].toLowerCase().equals("-d"); - NanoWebSocketServer ws = new DebugWebSocketServer(args.length > 0 ? Integer.parseInt(args[0]) : 9090, debugMode); + NanoWSD ws = new DebugWebSocketServer(args.length > 0 ? Integer.parseInt(args[0]) : 9090, debugMode); ws.start(); System.out.println("Server started, hit Enter to stop.\n"); try { diff --git a/websocket/src/test/java/fi/iki/elonen/WebSocketResponseHandlerTest.java b/websocket/src/test/java/fi/iki/elonen/WebSocketResponseHandlerTest.java index 9dd5945..243601b 100644 --- a/websocket/src/test/java/fi/iki/elonen/WebSocketResponseHandlerTest.java +++ b/websocket/src/test/java/fi/iki/elonen/WebSocketResponseHandlerTest.java @@ -51,8 +51,8 @@ import org.mockito.runners.MockitoJUnitRunner; import fi.iki.elonen.NanoHTTPD.IHTTPSession; import fi.iki.elonen.NanoHTTPD.Response; -import fi.iki.elonen.NanoWebSocketServer.WebSocketFrame; -import fi.iki.elonen.NanoWebSocketServer.WebSocketFrame.CloseCode; +import fi.iki.elonen.NanoWSD.WebSocketFrame; +import fi.iki.elonen.NanoWSD.WebSocketFrame.CloseCode; @RunWith(MockitoJUnitRunner.class) public class WebSocketResponseHandlerTest { @@ -60,11 +60,11 @@ public class WebSocketResponseHandlerTest { @Mock private IHTTPSession session; - private NanoWebSocketServer nanoWebSocketServer; + private NanoWSD nanoWebSocketServer; private Map<String, String> headers; - private static class MockedWSD extends NanoWebSocketServer{ + private static class MockedWSD extends NanoWSD{ public MockedWSD(int port) { super(port); } @@ -113,8 +113,8 @@ public class WebSocketResponseHandlerTest { assertNotNull(handshakeResponse); - assertEquals(handshakeResponse.getHeader(NanoWebSocketServer.HEADER_WEBSOCKET_ACCEPT), "HSmrc0sMlYUkAGmm5OPpG2HaGWk="); - assertEquals(handshakeResponse.getHeader(NanoWebSocketServer.HEADER_WEBSOCKET_PROTOCOL), "chat"); + assertEquals(handshakeResponse.getHeader(NanoWSD.HEADER_WEBSOCKET_ACCEPT), "HSmrc0sMlYUkAGmm5OPpG2HaGWk="); + assertEquals(handshakeResponse.getHeader(NanoWSD.HEADER_WEBSOCKET_PROTOCOL), "chat"); } @Test @@ -131,14 +131,14 @@ public class WebSocketResponseHandlerTest { public void testWrongConnectionHeaderReturnsNullResponse() { this.headers.put("connection", "Junk"); Response handshakeResponse = this.nanoWebSocketServer.serve(this.session); - assertNull(handshakeResponse.getHeader(NanoWebSocketServer.HEADER_UPGRADE)); + assertNull(handshakeResponse.getHeader(NanoWSD.HEADER_UPGRADE)); } @Test public void testWrongUpgradeHeaderReturnsNullResponse() { this.headers.put("upgrade", "not a websocket"); Response handshakeResponse = this.nanoWebSocketServer.serve(this.session); - assertNull(handshakeResponse.getHeader(NanoWebSocketServer.HEADER_UPGRADE)); + assertNull(handshakeResponse.getHeader(NanoWSD.HEADER_UPGRADE)); } @Test diff --git a/websocket/src/test/java/fi/iki/elonen/samples/echo/EchoWebSocketsTest.java b/websocket/src/test/java/fi/iki/elonen/samples/echo/EchoWebSocketsTest.java index e90ae71..d8b96ab 100644 --- a/websocket/src/test/java/fi/iki/elonen/samples/echo/EchoWebSocketsTest.java +++ b/websocket/src/test/java/fi/iki/elonen/samples/echo/EchoWebSocketsTest.java @@ -43,11 +43,11 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import fi.iki.elonen.NanoWebSocketServer; +import fi.iki.elonen.NanoWSD; public class EchoWebSocketsTest { - private static NanoWebSocketServer server; + private static NanoWSD server; @BeforeClass public static void setUp() throws Exception { |