From 6401fcd436c19e7055c25c857e914931227a469e Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Wed, 22 Mar 2017 13:56:55 -0500 Subject: [PATCH 1/2] doc: Fixes typos --- src/main/java/org/ice4j/socket/HttpDemuxFilter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/ice4j/socket/HttpDemuxFilter.java b/src/main/java/org/ice4j/socket/HttpDemuxFilter.java index 0182c0b..69b7e35 100644 --- a/src/main/java/org/ice4j/socket/HttpDemuxFilter.java +++ b/src/main/java/org/ice4j/socket/HttpDemuxFilter.java @@ -140,7 +140,7 @@ public class HttpDemuxFilter { byte[] buf = p.getData(); int off = p.getOffset(); - // The first bytes of HTTP, SSL v2, and TCP are different so quickly + // The first bytes of HTTP, SSL v2, and TLS are different so quickly // determine which one of the three is possible and, respectively, // which two of the three are impossible. int b0 = 0xFF & buf[off]; @@ -199,7 +199,7 @@ public class HttpDemuxFilter } } } - // Only one of HTTP, SSL v2, and TCP was deemed possible by + // Only one of HTTP, SSL v2, and TLS was deemed possible by // looking at the first byte. If p didn't look like HTTP here, // then it will not look like SSL v2 or TLS. return accept; @@ -230,7 +230,7 @@ public class HttpDemuxFilter accept = true; } } - // Only one of HTTP, SSL v2, and TCP was deemed possible by + // Only one of HTTP, SSL v2, and TLS was deemed possible by // looking at the first byte. If p didn't look like TLS here, // then it will not look like HTTP or SSL v2. return accept; @@ -268,7 +268,7 @@ public class HttpDemuxFilter accept = !equals; } } - // Only one of HTTP, SSL v2, and TCP was deemed possible by + // Only one of HTTP, SSL v2, and TLS was deemed possible by // looking at the first byte. If p didn't look like SSL v2 here, // then it will not look like HTTP or TLS. return accept; From 7a78b72d5bffaf7fde6d867437ae0e1ed8de0fbb Mon Sep 17 00:00:00 2001 From: Boris Grozev Date: Thu, 23 Mar 2017 15:56:49 -0500 Subject: [PATCH 2/2] ref: Removes MuxServerSocketChannel#assertIsNotNull Uses the equivalent Objects#requireNonNull instead. --- .../ice4j/socket/jdk8/MuxServerSocket.java | 6 +++-- .../socket/jdk8/MuxServerSocketChannel.java | 25 ++----------------- .../ice4j/socket/jdk8/MuxingServerSocket.java | 6 +++-- .../jdk8/MuxingServerSocketChannel.java | 6 ++--- 4 files changed, 13 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/ice4j/socket/jdk8/MuxServerSocket.java b/src/main/java/org/ice4j/socket/jdk8/MuxServerSocket.java index 0be988b..80508a8 100644 --- a/src/main/java/org/ice4j/socket/jdk8/MuxServerSocket.java +++ b/src/main/java/org/ice4j/socket/jdk8/MuxServerSocket.java @@ -19,6 +19,8 @@ package org.ice4j.socket.jdk8; import java.io.*; import java.net.*; +import java.util.*; + import org.ice4j.socket.*; /** @@ -48,7 +50,7 @@ class MuxServerSocket throws IOException { super( - MuxServerSocketChannel.assertIsNotNull(delegate, "delegate"), - MuxServerSocketChannel.assertIsNotNull(channel, "channel")); + Objects.requireNonNull(delegate, "delegate"), + Objects.requireNonNull(channel, "channel")); } } diff --git a/src/main/java/org/ice4j/socket/jdk8/MuxServerSocketChannel.java b/src/main/java/org/ice4j/socket/jdk8/MuxServerSocketChannel.java index 57c9c9a..8c66cb4 100644 --- a/src/main/java/org/ice4j/socket/jdk8/MuxServerSocketChannel.java +++ b/src/main/java/org/ice4j/socket/jdk8/MuxServerSocketChannel.java @@ -32,27 +32,6 @@ import org.ice4j.socket.*; public class MuxServerSocketChannel extends DelegatingServerSocketChannel { - /** - * Asserts that t is not null by throwing a - * NullPointerException if it is. - * - * @param t the Object to assert that it is not null - * @param message the (detail) message of the NullPointerException - * to be thrown if t is null - * @param the type of t - * @return t - * @throws NullPointerException if t is null. The (detail) - * message of the NullPointerException is message - */ - public static T assertIsNotNull(T t, String message) - throws NullPointerException - { - if (t == null) - throw new NullPointerException(message); - else - return t; - } - /** * Opens and binds a new {@code MuxServerSocketChannel} instance. If there * are other (existing) {@code MuxServerSocketChannel} open and bound on the @@ -128,9 +107,9 @@ public class MuxServerSocketChannel MuxingServerSocketChannel delegate, DatagramPacketFilter filter) { - super(assertIsNotNull(delegate, "delegate")); + super(Objects.requireNonNull(delegate, "delegate")); - this.filter = assertIsNotNull(filter, "filter"); + this.filter = Objects.requireNonNull(filter, "filter"); } /** diff --git a/src/main/java/org/ice4j/socket/jdk8/MuxingServerSocket.java b/src/main/java/org/ice4j/socket/jdk8/MuxingServerSocket.java index a2d9e93..667a3ec 100644 --- a/src/main/java/org/ice4j/socket/jdk8/MuxingServerSocket.java +++ b/src/main/java/org/ice4j/socket/jdk8/MuxingServerSocket.java @@ -19,6 +19,8 @@ package org.ice4j.socket.jdk8; import java.io.*; import java.net.*; +import java.util.*; + import org.ice4j.socket.*; /** @@ -48,7 +50,7 @@ class MuxingServerSocket throws IOException { super( - MuxServerSocketChannel.assertIsNotNull(delegate, "delegate"), - MuxServerSocketChannel.assertIsNotNull(channel, "channel")); + Objects.requireNonNull(delegate, "delegate"), + Objects.requireNonNull(channel, "channel")); } } diff --git a/src/main/java/org/ice4j/socket/jdk8/MuxingServerSocketChannel.java b/src/main/java/org/ice4j/socket/jdk8/MuxingServerSocketChannel.java index ba9ea44..c71f3d8 100644 --- a/src/main/java/org/ice4j/socket/jdk8/MuxingServerSocketChannel.java +++ b/src/main/java/org/ice4j/socket/jdk8/MuxingServerSocketChannel.java @@ -281,7 +281,7 @@ class MuxingServerSocketChannel // as possible though because it does not make sense to bind a // ServerSocketChannel and initialize a new MuxingServerSocketChannel // instance otherwise. - MuxServerSocketChannel.assertIsNotNull(filter, "filter"); + Objects.requireNonNull(filter, "filter"); MuxingServerSocketChannel muxingChannel; @@ -641,7 +641,7 @@ class MuxingServerSocketChannel public MuxingServerSocketChannel(ServerSocketChannel delegate) throws IOException { - super(MuxServerSocketChannel.assertIsNotNull(delegate, "delegate")); + super(Objects.requireNonNull(delegate, "delegate")); // If at least one MuxServerSocketChannel is configured as non-blocking, // then MuxingServerSocketChannel (i.e. delegate) has to be configured @@ -732,7 +732,7 @@ class MuxingServerSocketChannel // MuxServerSocketChannels) have no priorities. It cannot be a catch all // because a SocketChannel (i.e. Socket) may be accepted by a single // MuxServerSocketChannel only. - MuxServerSocketChannel.assertIsNotNull(filter, "filter"); + Objects.requireNonNull(filter, "filter"); MuxServerSocketChannel channel;