diff --git a/src/com/barchart/udt/nio/SelectorProviderUDT.java b/src/com/barchart/udt/nio/SelectorProviderUDT.java index 8cfddda2..85c68593 100644 --- a/src/com/barchart/udt/nio/SelectorProviderUDT.java +++ b/src/com/barchart/udt/nio/SelectorProviderUDT.java @@ -26,14 +26,12 @@ public class SelectorProviderUDT extends SelectorProvider { /** * system-wide provider instance, for {@link TypeUDT#DATAGRAM} UDT sockets */ - public static final SelectorProviderUDT DATAGRAM = // - new SelectorProviderUDT(TypeUDT.DATAGRAM); + public static final SelectorProviderUDT DATAGRAM = new SelectorProviderUDT(TypeUDT.DATAGRAM); /** * system-wide provider instance, for {@link TypeUDT#STREAM} UDT sockets */ - public static final SelectorProviderUDT STREAM = // - new SelectorProviderUDT(TypeUDT.STREAM); + public static final SelectorProviderUDT STREAM = new SelectorProviderUDT(TypeUDT.STREAM); public static SelectorProviderUDT from(final TypeUDT type) { switch (type) { diff --git a/src/com/barchart/udt/nio/ServerSocketChannelUDT.java b/src/com/barchart/udt/nio/ServerSocketChannelUDT.java index f66bda2a..3cad6df4 100644 --- a/src/com/barchart/udt/nio/ServerSocketChannelUDT.java +++ b/src/com/barchart/udt/nio/ServerSocketChannelUDT.java @@ -7,14 +7,15 @@ */ package com.barchart.udt.nio; -import com.barchart.udt.SocketUDT; -import com.barchart.udt.TypeUDT; -import com.barchart.udt.anno.ThreadSafe; +import java.io.IOException; +import java.nio.channels.ServerSocketChannel; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.nio.channels.ServerSocketChannel; +import com.barchart.udt.SocketUDT; +import com.barchart.udt.TypeUDT; +import com.barchart.udt.anno.ThreadSafe; /** * {@link ServerSocketChannel}-like wrapper for {@link SocketUDT} can be either @@ -39,28 +40,21 @@ import java.nio.channels.ServerSocketChannel; */ public class ServerSocketChannelUDT extends ServerSocketChannel implements ChannelUDT { - protected static final Logger log = LoggerFactory - .getLogger(ServerSocketChannelUDT.class); + protected static final Logger log = LoggerFactory.getLogger(ServerSocketChannelUDT.class); @ThreadSafe("this") protected NioServerSocketUDT socketAdapter; protected final SocketUDT socketUDT; - protected ServerSocketChannelUDT( // - final SelectorProviderUDT provider, // - final SocketUDT socketUDT // - ) { - + protected ServerSocketChannelUDT(final SelectorProviderUDT provider, final SocketUDT socketUDT) { super(provider); this.socketUDT = socketUDT; - } @Override public SocketChannelUDT accept() throws IOException { try { - begin(); final SocketUDT clientUDT = socketUDT.accept(); @@ -89,8 +83,7 @@ public class ServerSocketChannelUDT extends ServerSocketChannel implements Chann } @Override - protected void implConfigureBlocking(final boolean block) - throws IOException { + protected void implConfigureBlocking(final boolean block) throws IOException { socketUDT.setBlocking(block); } diff --git a/src/com/barchart/udt/nio/SocketChannelUDT.java b/src/com/barchart/udt/nio/SocketChannelUDT.java index 6fa4d6bf..ba8d3942 100644 --- a/src/com/barchart/udt/nio/SocketChannelUDT.java +++ b/src/com/barchart/udt/nio/SocketChannelUDT.java @@ -7,13 +7,6 @@ */ package com.barchart.udt.nio; -import com.barchart.udt.ExceptionUDT; -import com.barchart.udt.SocketUDT; -import com.barchart.udt.TypeUDT; -import com.barchart.udt.anno.ThreadSafe; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -24,6 +17,14 @@ import java.nio.channels.IllegalBlockingModeException; import java.nio.channels.SocketChannel; import java.nio.channels.UnresolvedAddressException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.barchart.udt.ExceptionUDT; +import com.barchart.udt.SocketUDT; +import com.barchart.udt.TypeUDT; +import com.barchart.udt.anno.ThreadSafe; + /** * {@link SocketChannel}-like wrapper for {@link SocketUDT}, can be either * stream or message oriented, depending on {@link TypeUDT} @@ -54,8 +55,7 @@ import java.nio.channels.UnresolvedAddressException; */ public class SocketChannelUDT extends SocketChannel implements ChannelUDT { - protected static final Logger log = LoggerFactory - .getLogger(SocketChannelUDT.class); + protected static final Logger log = LoggerFactory.getLogger(SocketChannelUDT.class); protected final Object connectLock = new Object(); @@ -76,22 +76,13 @@ public class SocketChannelUDT extends SocketChannel implements ChannelUDT { private InetSocketAddress remoteSocket; - protected SocketChannelUDT( // - final SelectorProviderUDT provider, // - final SocketUDT socketUDT // - ) throws ExceptionUDT { - + protected SocketChannelUDT(final SelectorProviderUDT provider, final SocketUDT socketUDT) throws ExceptionUDT { super(provider); this.socketUDT = socketUDT; this.socketUDT.setBlocking(true); } - protected SocketChannelUDT( // - final SelectorProviderUDT provider, // - final SocketUDT socketUDT, // - final boolean isConnected // - ) throws ExceptionUDT { - + protected SocketChannelUDT(final SelectorProviderUDT provider, final SocketUDT socketUDT, final boolean isConnected) throws ExceptionUDT { this(provider, socketUDT); if (isConnected) { @@ -106,7 +97,6 @@ public class SocketChannelUDT extends SocketChannel implements ChannelUDT { @Override public boolean connect(final SocketAddress remote) throws IOException { - if (!isOpen()) { throw new ClosedChannelException(); } @@ -205,7 +195,6 @@ public class SocketChannelUDT extends SocketChannel implements ChannelUDT { @Override public boolean finishConnect() throws IOException { - if (!isOpen()) { throw new ClosedChannelException(); } @@ -237,7 +226,6 @@ public class SocketChannelUDT extends SocketChannel implements ChannelUDT { throw new IOException(); } - } @Override @@ -277,7 +265,6 @@ public class SocketChannelUDT extends SocketChannel implements ChannelUDT { return (SelectorProviderUDT) super.provider(); } - // /** * See {@link SocketChannel#read(ByteBuffer)} contract; @@ -353,7 +340,6 @@ public class SocketChannelUDT extends SocketChannel implements ChannelUDT { log.error("should not happen: socket={}", socket); return 0; } - } @Override @@ -473,15 +459,12 @@ public class SocketChannelUDT extends SocketChannel implements ChannelUDT { log.error("should not happen; socket={}", socket); return 0; } - } @Override - public long write(final ByteBuffer[] bufferArray, final int offset, - final int length) throws IOException { + public long write(final ByteBuffer[] bufferArray, final int offset, final int length) throws IOException { try { - long total = 0; for (int index = offset; index < offset + length; index++) { @@ -505,7 +488,6 @@ public class SocketChannelUDT extends SocketChannel implements ChannelUDT { } catch (final Throwable e) { throw new IOException("failed to write buffer array", e); } - } @Override @@ -514,8 +496,7 @@ public class SocketChannelUDT extends SocketChannel implements ChannelUDT { } /** java 7 */ - public SocketChannelUDT bind(final SocketAddress localAddress) - throws IOException { + public SocketChannelUDT bind(final SocketAddress localAddress) throws IOException { socketUDT.bind((InetSocketAddress) localAddress);