Formatted the code to fit our coding rules Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/438938d1 Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/438938d1 Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/438938d1
Branch: refs/heads/trunk Commit: 438938d1eafa789acafceddc23fb090c8a69eee7 Parents: c90b13f Author: Emmanuel Lécharny <[email protected]> Authored: Fri May 17 11:50:57 2013 +0200 Committer: Emmanuel Lécharny <[email protected]> Committed: Fri May 17 11:50:57 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/mina/coap/CoapMessage.java | 32 +- .../main/java/org/apache/mina/coap/CoapOption.java | 13 +- .../org/apache/mina/coap/codec/TestMessages.java | 11 +- .../mina/codec/textline/TextLineEncoder.java | 3 +- .../ints/RawInt32BigEndianEncodingTest.java | 51 +- .../codec/delimited/ints/VarIntEncodingTest.java | 1 - .../delimited/serialization/JavaNativeTest.java | 2 +- .../codec/textline/UnixTextLineEncoderTest.java | 2 +- .../codec/textline/WindowsTextLineEncoderTest.java | 2 +- .../filterchain/ReadFilterChainController.java | 1 - .../apache/mina/service/executor/IdleEvent.java | 1 + .../apache/mina/service/executor/ReceiveEvent.java | 1 + .../apache/mina/service/executor/SentEvent.java | 1 + .../org/apache/mina/util/ByteBufferDumper.java | 4 +- .../transport/tcp/NioTcpClientReleaseTest.java | 7 +- .../apache/mina/examples/coap/CoapGetServer.java | 4 +- .../mina/examples/echoserver/NioEchoServer.java | 105 +- .../apache/mina/http/api/DefaultHttpResponse.java | 66 +- .../delimited/serialization/ProtobufTest.java | 2 +- .../mina/generated/protoc/AddressBookProtos.java | 5062 ++++++++------- .../org/apache/mina/generated/protoc/Calc.java | 2243 ++++---- 21 files changed, 3843 insertions(+), 3771 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/coap/src/main/java/org/apache/mina/coap/CoapMessage.java ---------------------------------------------------------------------- diff --git a/coap/src/main/java/org/apache/mina/coap/CoapMessage.java b/coap/src/main/java/org/apache/mina/coap/CoapMessage.java index 179244f..5a1500d 100644 --- a/coap/src/main/java/org/apache/mina/coap/CoapMessage.java +++ b/coap/src/main/java/org/apache/mina/coap/CoapMessage.java @@ -32,11 +32,17 @@ public class CoapMessage { private static final byte[] EMPTY_BYTE_ARRAY = new byte[] {}; private final int version; + private final MessageType type; + private final int code; + private final int id; + private final byte[] token; + private final byte[] payload; + private final CoapOption[] options; /** @@ -110,7 +116,7 @@ public class CoapMessage { .append(code).append(", id=").append(id).append(", token=").append(Arrays.toString(token)) .append(", payload=").append(Arrays.toString(payload)).append(", options=") .append(Arrays.toString(options)).append("]"); - + return builder.toString(); } @@ -128,7 +134,7 @@ public class CoapMessage { result = prime * result + Arrays.hashCode(token); result = prime * result + ((type == null) ? 0 : type.hashCode()); result = prime * result + version; - + return result; } @@ -140,45 +146,45 @@ public class CoapMessage { if (this == obj) { return true; } - + if (obj == null) { return false; } - + if (getClass() != obj.getClass()) { return false; } - + CoapMessage other = (CoapMessage) obj; - + if (code != other.code) { return false; } - + if (id != other.id) { return false; } - + if (!Arrays.equals(options, other.options)) { return false; } - + if (!Arrays.equals(payload, other.payload)) { return false; } - + if (!Arrays.equals(token, other.token)) { return false; } - + if (type != other.type) { return false; } - + if (version != other.version) { return false; } - + return true; } http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/coap/src/main/java/org/apache/mina/coap/CoapOption.java ---------------------------------------------------------------------- diff --git a/coap/src/main/java/org/apache/mina/coap/CoapOption.java b/coap/src/main/java/org/apache/mina/coap/CoapOption.java index 1bfadde..53e8650 100644 --- a/coap/src/main/java/org/apache/mina/coap/CoapOption.java +++ b/coap/src/main/java/org/apache/mina/coap/CoapOption.java @@ -29,6 +29,7 @@ import java.util.Arrays; public class CoapOption { private final CoapOptionType type; + private final byte[] data; /** @@ -81,25 +82,25 @@ public class CoapOption { if (this == obj) { return true; } - + if (obj == null) { return false; } - + if (getClass() != obj.getClass()) { return false; } - + CoapOption other = (CoapOption) obj; - + if (!Arrays.equals(data, other.data)) { return false; } - + if (type != other.type) { return false; } - + return true; } } http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/coap/src/test/java/org/apache/mina/coap/codec/TestMessages.java ---------------------------------------------------------------------- diff --git a/coap/src/test/java/org/apache/mina/coap/codec/TestMessages.java b/coap/src/test/java/org/apache/mina/coap/codec/TestMessages.java index c3418eb..a5e1ce1 100644 --- a/coap/src/test/java/org/apache/mina/coap/codec/TestMessages.java +++ b/coap/src/test/java/org/apache/mina/coap/codec/TestMessages.java @@ -33,6 +33,7 @@ public interface TestMessages { public static final CoapMessage NO_CONTENT_NO_OPTION = new CoapMessage(1, MessageType.ACK, 1, 1234, null, null, null); + public static final String NO_CONTENT_NO_OPTION_HEX = "600104D2"; public static final CoapMessage SOME_CONTENT_NO_OPTION = new CoapMessage(1, MessageType.CONFIRMABLE, 1, 1234, @@ -41,17 +42,17 @@ public interface TestMessages { public static final String SOME_CONTENT_NO_OPTION_HEX = "450104D2746F6B656EFF736F6D6520726174686572206C61726765207061796C6F6164"; public static final CoapMessage PAYLOAD_AND_ONE_OPTION = new CoapMessage(1, MessageType.NON_CONFIRMABLE, 1, 1234, - "toto".getBytes(), new CoapOption[] { new CoapOption(CoapOptionType.URI_PATH, - "coap://blabla".getBytes()) }, new byte[] {}); + "toto".getBytes(), + new CoapOption[] { new CoapOption(CoapOptionType.URI_PATH, "coap://blabla".getBytes()) }, new byte[] {}); public static final String PAYLOAD_AND_ONE_OPTION_HEX = "540104D2746F746FBD00636F61703A2F2F626C61626C61"; public static final CoapMessage PAYLOAD_AND_MULTIPLE_OPTION = new CoapMessage(1, MessageType.NON_CONFIRMABLE, 1, 1234, "toto".getBytes(), new CoapOption[] { // new CoapOption(CoapOptionType.URI_PATH, "coap://blabla".getBytes()), // - new CoapOption(CoapOptionType.LOCATION_QUERY, "somewhere".getBytes()), // - new CoapOption(CoapOptionType.PROXY_URI, "http://proxyuri".getBytes()), // - new CoapOption(CoapOptionType.MAX_AGE, "bleh".getBytes()) }, new byte[] {}); + new CoapOption(CoapOptionType.LOCATION_QUERY, "somewhere".getBytes()), // + new CoapOption(CoapOptionType.PROXY_URI, "http://proxyuri".getBytes()), // + new CoapOption(CoapOptionType.MAX_AGE, "bleh".getBytes()) }, new byte[] {}); public static final String PAYLOAD_AND_MULTIPLE_OPTION_HEX = "540104D2746F746FBD00636F61703A2F2F626C61626C6134626C656869736F6D657768657265DD0202687474703A2F2F70726F7879757269";// "540104D2746F746FBD00636F61703A2F2F626C61626C6134626C656869736F6D657768657265DD02687474703A2F2F70726F7879757269"; } http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/codec/src/main/java/org/apache/mina/codec/textline/TextLineEncoder.java ---------------------------------------------------------------------- diff --git a/codec/src/main/java/org/apache/mina/codec/textline/TextLineEncoder.java b/codec/src/main/java/org/apache/mina/codec/textline/TextLineEncoder.java index 893c87a..35972ed 100644 --- a/codec/src/main/java/org/apache/mina/codec/textline/TextLineEncoder.java +++ b/codec/src/main/java/org/apache/mina/codec/textline/TextLineEncoder.java @@ -28,7 +28,6 @@ import java.nio.charset.CharsetEncoder; import org.apache.mina.codec.ProtocolEncoder; import org.apache.mina.codec.StatelessProtocolEncoder; - /** * A {@link ProtocolEncoder} which encodes a string into a text line * which ends with the delimiter. @@ -134,7 +133,7 @@ public class TextLineEncoder implements StatelessProtocolEncoder<String, ByteBuf public ByteBuffer encode(String message, Void context) { try { String value = (message == null ? "" : message); - + if (value.length() > maxLineLength) { throw new IllegalArgumentException("Line length: " + message.length()); } http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/codec/src/test/java/org/apache/mina/codec/delimited/ints/RawInt32BigEndianEncodingTest.java ---------------------------------------------------------------------- diff --git a/codec/src/test/java/org/apache/mina/codec/delimited/ints/RawInt32BigEndianEncodingTest.java b/codec/src/test/java/org/apache/mina/codec/delimited/ints/RawInt32BigEndianEncodingTest.java index a97b669..1f64ee1 100644 --- a/codec/src/test/java/org/apache/mina/codec/delimited/ints/RawInt32BigEndianEncodingTest.java +++ b/codec/src/test/java/org/apache/mina/codec/delimited/ints/RawInt32BigEndianEncodingTest.java @@ -35,30 +35,29 @@ import org.apache.mina.codec.delimited.ByteBufferEncoder; */ public class RawInt32BigEndianEncodingTest extends IntEncodingTest { - @Override - public ByteBufferDecoder<Integer> newDecoderInstance() { - return new RawInt32.Decoder(RawInt32.Endianness.BIG); - } - - @Override - public ByteBufferEncoder<Integer> newEncoderInstance() { - return new RawInt32.Encoder(RawInt32.Endianness.BIG); - } - - @Override - public Map<Integer, ByteBuffer> getEncodingSamples() { - Map<Integer, ByteBuffer> map = new HashMap<Integer, ByteBuffer>(); - - map.put(0, ByteBuffer.wrap(new byte[] { 0, 0, 0, 0 })); - map.put(1 << 24 | 2 << 16 | 3 << 8 | 4, - ByteBuffer.wrap(new byte[] { 1, 2, 3, 4 })); - return map; - } - - @Override - public Iterable<ByteBuffer> getIllegalBuffers() { - List<ByteBuffer> list = new LinkedList<ByteBuffer>(); - list.add(ByteBuffer.wrap(new byte[] { (byte) 0x80, 0, 0, 0 })); - return list; - } + @Override + public ByteBufferDecoder<Integer> newDecoderInstance() { + return new RawInt32.Decoder(RawInt32.Endianness.BIG); + } + + @Override + public ByteBufferEncoder<Integer> newEncoderInstance() { + return new RawInt32.Encoder(RawInt32.Endianness.BIG); + } + + @Override + public Map<Integer, ByteBuffer> getEncodingSamples() { + Map<Integer, ByteBuffer> map = new HashMap<Integer, ByteBuffer>(); + + map.put(0, ByteBuffer.wrap(new byte[] { 0, 0, 0, 0 })); + map.put(1 << 24 | 2 << 16 | 3 << 8 | 4, ByteBuffer.wrap(new byte[] { 1, 2, 3, 4 })); + return map; + } + + @Override + public Iterable<ByteBuffer> getIllegalBuffers() { + List<ByteBuffer> list = new LinkedList<ByteBuffer>(); + list.add(ByteBuffer.wrap(new byte[] { (byte) 0x80, 0, 0, 0 })); + return list; + } } http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/codec/src/test/java/org/apache/mina/codec/delimited/ints/VarIntEncodingTest.java ---------------------------------------------------------------------- diff --git a/codec/src/test/java/org/apache/mina/codec/delimited/ints/VarIntEncodingTest.java b/codec/src/test/java/org/apache/mina/codec/delimited/ints/VarIntEncodingTest.java index 7b54927..694773a 100644 --- a/codec/src/test/java/org/apache/mina/codec/delimited/ints/VarIntEncodingTest.java +++ b/codec/src/test/java/org/apache/mina/codec/delimited/ints/VarIntEncodingTest.java @@ -28,7 +28,6 @@ import java.util.Map; import org.apache.mina.codec.delimited.ByteBufferDecoder; import org.apache.mina.codec.delimited.ByteBufferEncoder; - /** * A {@link VarInt.Encoder} and {@link VarInt.Decoder} test. * http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/codec/src/test/java/org/apache/mina/codec/delimited/serialization/JavaNativeTest.java ---------------------------------------------------------------------- diff --git a/codec/src/test/java/org/apache/mina/codec/delimited/serialization/JavaNativeTest.java b/codec/src/test/java/org/apache/mina/codec/delimited/serialization/JavaNativeTest.java index 05bf9f9..0e7257c 100644 --- a/codec/src/test/java/org/apache/mina/codec/delimited/serialization/JavaNativeTest.java +++ b/codec/src/test/java/org/apache/mina/codec/delimited/serialization/JavaNativeTest.java @@ -88,7 +88,7 @@ public class JavaNativeTest extends GenericSerializerTest<JavaNativeTest.TestBea private final double c; } - + @Override public List<TestBean> getObjects() { List<TestBean> list = new LinkedList<TestBean>(); http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/codec/src/test/java/org/apache/mina/codec/textline/UnixTextLineEncoderTest.java ---------------------------------------------------------------------- diff --git a/codec/src/test/java/org/apache/mina/codec/textline/UnixTextLineEncoderTest.java b/codec/src/test/java/org/apache/mina/codec/textline/UnixTextLineEncoderTest.java index a072ec0..a7979c2 100644 --- a/codec/src/test/java/org/apache/mina/codec/textline/UnixTextLineEncoderTest.java +++ b/codec/src/test/java/org/apache/mina/codec/textline/UnixTextLineEncoderTest.java @@ -41,7 +41,7 @@ public class UnixTextLineEncoderTest { assertNotNull(result); assertEquals(1, result.remaining()); } - + @Test public void testThatNonEmptyBufferReturnsDataAndDelimiter() { TextLineEncoder encoder = new TextLineEncoder(LineDelimiter.UNIX); http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/codec/src/test/java/org/apache/mina/codec/textline/WindowsTextLineEncoderTest.java ---------------------------------------------------------------------- diff --git a/codec/src/test/java/org/apache/mina/codec/textline/WindowsTextLineEncoderTest.java b/codec/src/test/java/org/apache/mina/codec/textline/WindowsTextLineEncoderTest.java index 248fa88..878e25f 100644 --- a/codec/src/test/java/org/apache/mina/codec/textline/WindowsTextLineEncoderTest.java +++ b/codec/src/test/java/org/apache/mina/codec/textline/WindowsTextLineEncoderTest.java @@ -41,7 +41,7 @@ public class WindowsTextLineEncoderTest { assertNotNull(result); assertEquals(2, result.remaining()); } - + @Test public void testThatNonEmptyBufferReturnsDataAndDelimiter() { TextLineEncoder encoder = new TextLineEncoder(LineDelimiter.WINDOWS); http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/core/src/main/java/org/apache/mina/filterchain/ReadFilterChainController.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/mina/filterchain/ReadFilterChainController.java b/core/src/main/java/org/apache/mina/filterchain/ReadFilterChainController.java index 580aa7c..82b0147 100644 --- a/core/src/main/java/org/apache/mina/filterchain/ReadFilterChainController.java +++ b/core/src/main/java/org/apache/mina/filterchain/ReadFilterChainController.java @@ -19,7 +19,6 @@ */ package org.apache.mina.filterchain; - /** * Chain controller used by a filter for calling the next filter in read order. * http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/core/src/main/java/org/apache/mina/service/executor/IdleEvent.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/mina/service/executor/IdleEvent.java b/core/src/main/java/org/apache/mina/service/executor/IdleEvent.java index 0b0df18..5976ec3 100644 --- a/core/src/main/java/org/apache/mina/service/executor/IdleEvent.java +++ b/core/src/main/java/org/apache/mina/service/executor/IdleEvent.java @@ -30,6 +30,7 @@ import org.apache.mina.api.IoSession; public class IdleEvent implements Event { private final IoSession session; + private final IdleStatus status; public IdleEvent(final IoSession session, final IdleStatus status) { http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/core/src/main/java/org/apache/mina/service/executor/ReceiveEvent.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/mina/service/executor/ReceiveEvent.java b/core/src/main/java/org/apache/mina/service/executor/ReceiveEvent.java index d5ab28d..46d46ec 100644 --- a/core/src/main/java/org/apache/mina/service/executor/ReceiveEvent.java +++ b/core/src/main/java/org/apache/mina/service/executor/ReceiveEvent.java @@ -28,6 +28,7 @@ import org.apache.mina.api.IoSession; */ public class ReceiveEvent implements Event { private final IoSession session; + private final Object message; public ReceiveEvent(final IoSession session, final Object message) { http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/core/src/main/java/org/apache/mina/service/executor/SentEvent.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/mina/service/executor/SentEvent.java b/core/src/main/java/org/apache/mina/service/executor/SentEvent.java index 88fd94b..8fb5c4f 100644 --- a/core/src/main/java/org/apache/mina/service/executor/SentEvent.java +++ b/core/src/main/java/org/apache/mina/service/executor/SentEvent.java @@ -28,6 +28,7 @@ import org.apache.mina.api.IoSession; */ public class SentEvent implements Event { private final IoSession session; + private final Object message; public SentEvent(final IoSession session, final Object message) { http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/core/src/main/java/org/apache/mina/util/ByteBufferDumper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/mina/util/ByteBufferDumper.java b/core/src/main/java/org/apache/mina/util/ByteBufferDumper.java index 6f3579c..359e08e 100644 --- a/core/src/main/java/org/apache/mina/util/ByteBufferDumper.java +++ b/core/src/main/java/org/apache/mina/util/ByteBufferDumper.java @@ -28,7 +28,7 @@ import java.nio.ByteBuffer; public class ByteBufferDumper { /** Hex chars */ private static final byte[] HEX_CHAR = new byte[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', - 'C', 'D', 'E', 'F' }; + 'C', 'D', 'E', 'F' }; /** * Dump the content of the given ByteBuffer, up to a number of bytes. If the toAscii flag is set to @@ -77,7 +77,7 @@ public class ByteBufferDumper { byteValue = data[i] & 0xFF; out.append(new String(new byte[] { '0', 'x', HEX_CHAR[(byteValue & 0x00F0) >> 4], - HEX_CHAR[byteValue & 0x000F] })); + HEX_CHAR[byteValue & 0x000F] })); } out.append("']"); http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/core/src/test/java/org/apache/mina/transport/tcp/NioTcpClientReleaseTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/mina/transport/tcp/NioTcpClientReleaseTest.java b/core/src/test/java/org/apache/mina/transport/tcp/NioTcpClientReleaseTest.java index c28952e..ec8361e 100644 --- a/core/src/test/java/org/apache/mina/transport/tcp/NioTcpClientReleaseTest.java +++ b/core/src/test/java/org/apache/mina/transport/tcp/NioTcpClientReleaseTest.java @@ -55,8 +55,9 @@ public class NioTcpClientReleaseTest { * different IoFilters. */ @Test - public void checkSessionsAreClosedWhenClientIsDisconnected() throws IOException, InterruptedException, ExecutionException { - + public void checkSessionsAreClosedWhenClientIsDisconnected() throws IOException, InterruptedException, + ExecutionException { + NioTcpServer server = new NioTcpServer(); server.setIoHandler(new Handler()); server.bind(0); @@ -64,7 +65,7 @@ public class NioTcpClientReleaseTest { NioTcpClient client = new NioTcpClient(); client.setIoHandler(new AbstractIoHandler() { }); - for(int i=0; i < CLIENT_COUNT;++i) { + for (int i = 0; i < CLIENT_COUNT; ++i) { client.connect(new InetSocketAddress(server.getServerSocketChannel().socket().getLocalPort())).get(); } client.disconnect(); http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/examples/src/main/java/org/apache/mina/examples/coap/CoapGetServer.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/mina/examples/coap/CoapGetServer.java b/examples/src/main/java/org/apache/mina/examples/coap/CoapGetServer.java index 4a87b99..2cd94df 100644 --- a/examples/src/main/java/org/apache/mina/examples/coap/CoapGetServer.java +++ b/examples/src/main/java/org/apache/mina/examples/coap/CoapGetServer.java @@ -90,8 +90,8 @@ public class CoapGetServer { // let's confirm it CoapMessage response = new CoapMessage(1, MessageType.ACK, CoapCode.CONTENT.getCode(), msg.getId(), - msg.getToken(), new CoapOption[] { new CoapOption( - CoapOptionType.CONTENT_FORMAT, new byte[] { 0 }) }, "hello coap !".getBytes()); + msg.getToken(), new CoapOption[] { new CoapOption(CoapOptionType.CONTENT_FORMAT, + new byte[] { 0 }) }, "hello coap !".getBytes()); session.write(response); } } http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/examples/src/main/java/org/apache/mina/examples/echoserver/NioEchoServer.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/mina/examples/echoserver/NioEchoServer.java b/examples/src/main/java/org/apache/mina/examples/echoserver/NioEchoServer.java index 545983f..18d46eb 100644 --- a/examples/src/main/java/org/apache/mina/examples/echoserver/NioEchoServer.java +++ b/examples/src/main/java/org/apache/mina/examples/echoserver/NioEchoServer.java @@ -20,7 +20,6 @@ package org.apache.mina.examples.echoserver; - import java.io.IOException; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -38,110 +37,86 @@ import org.apache.mina.transport.nio.tcp.NioTcpServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * A basic Server test * * @author <a href="http://mina.apache.org";>Apache MINA Project</a> * */ -public class NioEchoServer -{ - - static final private Logger LOG = LoggerFactory.getLogger( NioEchoServer.class ); +public class NioEchoServer { + static final private Logger LOG = LoggerFactory.getLogger(NioEchoServer.class); - public static void main( final String[] args ) - { - LOG.info( "starting echo server" ); + public static void main(final String[] args) { + LOG.info("starting echo server"); final NioTcpServer acceptor = new NioTcpServer(); // create the fitler chain for this service - acceptor.setFilters( new LoggingFilter( "LoggingFilter1" ), new IoFilter() - { + acceptor.setFilters(new LoggingFilter("LoggingFilter1"), new IoFilter() { @Override - public void sessionOpened( final IoSession session ) - { - LOG.info( "session {} open", session ); + public void sessionOpened(final IoSession session) { + LOG.info("session {} open", session); } - @Override - public void sessionIdle( final IoSession session, final IdleStatus status ) - { - LOG.info( "session {} idle", session ); + public void sessionIdle(final IoSession session, final IdleStatus status) { + LOG.info("session {} idle", session); } - @Override - public void sessionClosed( final IoSession session ) - { - LOG.info( "session {} open", session ); + public void sessionClosed(final IoSession session) { + LOG.info("session {} open", session); } - @Override - public void messageWriting( final IoSession session, WriteRequest message, - final WriteFilterChainController controller ) - { + public void messageWriting(final IoSession session, WriteRequest message, + final WriteFilterChainController controller) { // we just push the message in the chain - controller.callWriteNextFilter( message ); + controller.callWriteNextFilter(message); } - @Override - public void messageReceived( final IoSession session, final Object message, - final ReadFilterChainController controller ) - { - - if ( message instanceof ByteBuffer ) - { - LOG.info( "echoing" ); - session.write( message ); + public void messageReceived(final IoSession session, final Object message, + final ReadFilterChainController controller) { + + if (message instanceof ByteBuffer) { + LOG.info("echoing"); + session.write(message); } } - @Override - public void messageSent( final IoSession session, final Object message ) - { - LOG.info( "message {} sent", message ); + public void messageSent(final IoSession session, final Object message) { + LOG.info("message {} sent", message); } - } ); + }); - acceptor.setIoHandler( new AbstractIoHandler() - { + acceptor.setIoHandler(new AbstractIoHandler() { @Override - public void sessionOpened( final IoSession session ) - { - LOG.info( "session opened {}", session ); + public void sessionOpened(final IoSession session) { + LOG.info("session opened {}", session); final String welcomeStr = "welcome\n"; - final ByteBuffer bf = ByteBuffer.allocate( welcomeStr.length() ); - bf.put( welcomeStr.getBytes() ); + final ByteBuffer bf = ByteBuffer.allocate(welcomeStr.length()); + bf.put(welcomeStr.getBytes()); bf.flip(); - session.write( bf ); + session.write(bf); } - } ); - try - { - final SocketAddress address = new InetSocketAddress( 9999 ); - acceptor.bind( address ); - LOG.debug( "Running the server for 25 sec" ); - Thread.sleep( 25000 ); - LOG.debug( "Unbinding the TCP port" ); + }); + try { + final SocketAddress address = new InetSocketAddress(9999); + acceptor.bind(address); + LOG.debug("Running the server for 25 sec"); + Thread.sleep(25000); + LOG.debug("Unbinding the TCP port"); acceptor.unbind(); - } - catch ( final IOException e ) - { - LOG.error( "I/O exception", e ); - } - catch ( final InterruptedException e ) - { - LOG.error( "Interrupted exception", e ); + } catch (final IOException e) { + LOG.error("I/O exception", e); + } catch (final InterruptedException e) { + LOG.error("Interrupted exception", e); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/http/src/main/java/org/apache/mina/http/api/DefaultHttpResponse.java ---------------------------------------------------------------------- diff --git a/http/src/main/java/org/apache/mina/http/api/DefaultHttpResponse.java b/http/src/main/java/org/apache/mina/http/api/DefaultHttpResponse.java index 7d957a4..b29de8c 100644 --- a/http/src/main/java/org/apache/mina/http/api/DefaultHttpResponse.java +++ b/http/src/main/java/org/apache/mina/http/api/DefaultHttpResponse.java @@ -19,17 +19,14 @@ */ package org.apache.mina.http.api; - import java.nio.ByteBuffer; import java.util.Map; - /** * * @author <a href="http://mina.apache.org";>Apache MINA Project</a> */ -public class DefaultHttpResponse implements HttpResponse -{ +public class DefaultHttpResponse implements HttpResponse { private final HttpVersion version; @@ -37,112 +34,91 @@ public class DefaultHttpResponse implements HttpResponse private final Map<String, String> headers; - - public DefaultHttpResponse( HttpVersion version, HttpStatus status, Map<String, String> headers ) - { + public DefaultHttpResponse(HttpVersion version, HttpStatus status, Map<String, String> headers) { this.version = version; this.status = status; this.headers = headers; } - /** * {@inheritDoc} */ @Override - public HttpVersion getProtocolVersion() - { + public HttpVersion getProtocolVersion() { return version; } - /** * {@inheritDoc} */ @Override - public String getContentType() - { - return headers.get( "content-type" ); + public String getContentType() { + return headers.get("content-type"); } - /** * {@inheritDoc} */ @Override - public boolean isKeepAlive() - { + public boolean isKeepAlive() { // TODO check header and version for keep alive return false; } - /** * {@inheritDoc} */ @Override - public String getHeader( String name ) - { - return headers.get( name ); + public String getHeader(String name) { + return headers.get(name); } - /** * {@inheritDoc} */ @Override - public boolean containsHeader( String name ) - { - return headers.containsKey( name ); + public boolean containsHeader(String name) { + return headers.containsKey(name); } - /** * {@inheritDoc} */ @Override - public Map<String, String> getHeaders() - { + public Map<String, String> getHeaders() { return headers; } - /** * {@inheritDoc} */ @Override - public HttpStatus getStatus() - { + public HttpStatus getStatus() { return status; } - /** * {@inheritDoc} */ @Override - public ByteBuffer encode( HttpPduEncodingVisitor visitor ) - { - return visitor.visit( this ); + public ByteBuffer encode(HttpPduEncodingVisitor visitor) { + return visitor.visit(this); } - /** * {@inheritDoc} */ @Override - public String toString() - { + public String toString() { StringBuilder sb = new StringBuilder(); - sb.append( "HTTP RESPONSE STATUS: " ).append( status ).append( '\n' ); - sb.append( "VERSION: " ).append( version ).append( '\n' ); + sb.append("HTTP RESPONSE STATUS: ").append(status).append('\n'); + sb.append("VERSION: ").append(version).append('\n'); - sb.append( "--- HEADER --- \n" ); + sb.append("--- HEADER --- \n"); - for ( String key : headers.keySet() ) - { - String value = headers.get( key ); - sb.append( key ).append( ':' ).append( value ).append( '\n' ); + for (String key : headers.keySet()) { + String value = headers.get(key); + sb.append(key).append(':').append(value).append('\n'); } return sb.toString(); http://git-wip-us.apache.org/repos/asf/mina/blob/438938d1/protobuf/src/test/java/org/apache/mina/codec/delimited/serialization/ProtobufTest.java ---------------------------------------------------------------------- diff --git a/protobuf/src/test/java/org/apache/mina/codec/delimited/serialization/ProtobufTest.java b/protobuf/src/test/java/org/apache/mina/codec/delimited/serialization/ProtobufTest.java index abc96ea..2806c57 100644 --- a/protobuf/src/test/java/org/apache/mina/codec/delimited/serialization/ProtobufTest.java +++ b/protobuf/src/test/java/org/apache/mina/codec/delimited/serialization/ProtobufTest.java @@ -46,7 +46,7 @@ public class ProtobufTest extends GenericSerializerTest<Person> { return list; } - + @Override public ByteBufferDecoder<Person> getDecoder() throws Exception { return ProtobufMessageDecoder.newInstance(Person.class);
