Repository: mina Updated Branches: refs/heads/2.0 2a1553f92 -> 60cb619b6
Fixed some sonar issues, bumped up some dependencies/maven plugins Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/60cb619b Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/60cb619b Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/60cb619b Branch: refs/heads/2.0 Commit: 60cb619b6f0a940e7a6b18c060158270c227255b Parents: 2a1553f Author: Emmanuel Lécharny <[email protected]> Authored: Sat Mar 17 09:24:04 2018 +0100 Committer: Emmanuel Lécharny <[email protected]> Committed: Sat Mar 17 09:24:04 2018 +0100 ---------------------------------------------------------------------- .../mina/core/buffer/AbstractIoBuffer.java | 52 +++++++++++--------- .../org/apache/mina/core/buffer/IoBuffer.java | 16 +++--- .../mina/core/buffer/IoBufferWrapper.java | 17 +++---- .../mina/core/file/FilenameFileRegion.java | 2 +- .../org/apache/mina/filter/ssl/SslHandler.java | 17 ++----- .../apache/mina/core/buffer/IoBufferTest.java | 5 +- .../AbstractIoServiceDIRMINA1076Test.java | 5 +- .../core/service/AbstractIoServiceTest.java | 6 +-- ...slTestHandshakeExceptionDIRMINA1077Test.java | 3 +- .../codec/textline/TextLineDecoderTest.java | 19 +++---- .../codec/textline/TextLineEncoderTest.java | 4 +- .../timeserver/MinaTimeServer.java | 4 +- .../org/apache/mina/example/reverser/Main.java | 5 +- .../example/echoserver/ssl/SslFilterTest.java | 6 +-- .../proxy/telnet/ProxyTelnetTestClient.java | 4 +- .../org/apache/mina/http/HttpClientEncoder.java | 4 +- .../org/apache/mina/http/HttpServerEncoder.java | 4 +- pom.xml | 4 +- 18 files changed, 88 insertions(+), 89 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-core/src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java b/mina-core/src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java index db434cf..aa46c83 100644 --- a/mina-core/src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java +++ b/mina-core/src/main/java/org/apache/mina/core/buffer/AbstractIoBuffer.java @@ -42,6 +42,7 @@ import java.nio.charset.CharacterCodingException; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; import java.nio.charset.CoderResult; +import java.nio.charset.StandardCharsets; import java.util.EnumSet; import java.util.Set; @@ -875,9 +876,7 @@ public abstract class AbstractIoBuffer extends IoBuffer { */ @Override public final IoBuffer putUnsignedInt(int value) { - autoExpand(4); - buf().putInt(value); - return this; + return putInt(value); } /** @@ -885,9 +884,7 @@ public abstract class AbstractIoBuffer extends IoBuffer { */ @Override public final IoBuffer putUnsignedInt(int index, int value) { - autoExpand(index, 4); - buf().putInt(index, value); - return this; + return putInt(index, value); } /** @@ -935,9 +932,7 @@ public abstract class AbstractIoBuffer extends IoBuffer { */ @Override public final IoBuffer putUnsignedShort(short value) { - autoExpand(2); - buf().putShort(value); - return this; + return putShort(value); } /** @@ -945,9 +940,7 @@ public abstract class AbstractIoBuffer extends IoBuffer { */ @Override public final IoBuffer putUnsignedShort(int index, short value) { - autoExpand(index, 2); - buf().putShort(index, value); - return this; + return putShort(index, value); } /** @@ -1605,7 +1598,10 @@ public abstract class AbstractIoBuffer extends IoBuffer { return ""; } - boolean utf16 = decoder.charset().name().startsWith("UTF-16"); + boolean utf16 = + decoder.charset().equals(StandardCharsets.UTF_16) || + decoder.charset().equals(StandardCharsets.UTF_16BE) || + decoder.charset().equals(StandardCharsets.UTF_16LE); int oldPos = position(); int oldLimit = limit(); @@ -1713,7 +1709,9 @@ public abstract class AbstractIoBuffer extends IoBuffer { return ""; } - boolean utf16 = decoder.charset().name().startsWith("UTF-16"); + boolean utf16 = decoder.charset().equals(StandardCharsets.UTF_16) || + decoder.charset().equals(StandardCharsets.UTF_16BE) || + decoder.charset().equals(StandardCharsets.UTF_16LE); if (utf16 && (fieldSize & 1) != 0) { throw new IllegalArgumentException("fieldSize is not even."); @@ -1861,7 +1859,10 @@ public abstract class AbstractIoBuffer extends IoBuffer { autoExpand(fieldSize); - boolean utf16 = encoder.charset().name().startsWith("UTF-16"); + boolean utf16 = encoder.charset().equals(StandardCharsets.UTF_16) || + encoder.charset().equals(StandardCharsets.UTF_16BE) || + encoder.charset().equals(StandardCharsets.UTF_16LE); + if (utf16 && (fieldSize & 1) != 0) { throw new IllegalArgumentException("fieldSize is not even."); @@ -1960,7 +1961,10 @@ public abstract class AbstractIoBuffer extends IoBuffer { return ""; } - boolean utf16 = decoder.charset().name().startsWith("UTF-16"); + boolean utf16 = decoder.charset().equals(StandardCharsets.UTF_16) || + decoder.charset().equals(StandardCharsets.UTF_16BE) || + decoder.charset().equals(StandardCharsets.UTF_16LE); + if (utf16 && (fieldSize & 1) != 0) { throw new BufferDataException("fieldSize is not even for a UTF-16 string."); @@ -2564,7 +2568,7 @@ public abstract class AbstractIoBuffer extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSet(Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSet(Class<E> enumClass) { return toEnumSet(enumClass, get() & BYTE_MASK); } @@ -2572,7 +2576,7 @@ public abstract class AbstractIoBuffer extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSet(int index, Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSet(int index, Class<E> enumClass) { return toEnumSet(enumClass, get(index) & BYTE_MASK); } @@ -2580,7 +2584,7 @@ public abstract class AbstractIoBuffer extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSetShort(Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSetShort(Class<E> enumClass) { return toEnumSet(enumClass, getShort() & SHORT_MASK); } @@ -2588,7 +2592,7 @@ public abstract class AbstractIoBuffer extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSetShort(int index, Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSetShort(int index, Class<E> enumClass) { return toEnumSet(enumClass, getShort(index) & SHORT_MASK); } @@ -2596,7 +2600,7 @@ public abstract class AbstractIoBuffer extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSetInt(Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSetInt(Class<E> enumClass) { return toEnumSet(enumClass, getInt() & INT_MASK); } @@ -2604,7 +2608,7 @@ public abstract class AbstractIoBuffer extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSetInt(int index, Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSetInt(int index, Class<E> enumClass) { return toEnumSet(enumClass, getInt(index) & INT_MASK); } @@ -2612,7 +2616,7 @@ public abstract class AbstractIoBuffer extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSetLong(Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSetLong(Class<E> enumClass) { return toEnumSet(enumClass, getLong()); } @@ -2620,7 +2624,7 @@ public abstract class AbstractIoBuffer extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSetLong(int index, Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSetLong(int index, Class<E> enumClass) { return toEnumSet(enumClass, getLong(index)); } http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java b/mina-core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java index 913102f..882ca9c 100644 --- a/mina-core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java +++ b/mina-core/src/main/java/org/apache/mina/core/buffer/IoBuffer.java @@ -1926,7 +1926,7 @@ public abstract class IoBuffer implements Comparable<IoBuffer> { * @param enumClass the enum class used to create the EnumSet * @return the EnumSet representation of the bit vector */ - public abstract <E extends Enum<E>> EnumSet<E> getEnumSet(Class<E> enumClass); + public abstract <E extends Enum<E>> Set<E> getEnumSet(Class<E> enumClass); /** * Reads a byte sized bit vector and converts it to an {@link EnumSet}. @@ -1937,7 +1937,7 @@ public abstract class IoBuffer implements Comparable<IoBuffer> { * @param enumClass the enum class used to create the EnumSet * @return the EnumSet representation of the bit vector */ - public abstract <E extends Enum<E>> EnumSet<E> getEnumSet(int index, Class<E> enumClass); + public abstract <E extends Enum<E>> Set<E> getEnumSet(int index, Class<E> enumClass); /** * Reads a short sized bit vector and converts it to an {@link EnumSet}. @@ -1947,7 +1947,7 @@ public abstract class IoBuffer implements Comparable<IoBuffer> { * @param enumClass the enum class used to create the EnumSet * @return the EnumSet representation of the bit vector */ - public abstract <E extends Enum<E>> EnumSet<E> getEnumSetShort(Class<E> enumClass); + public abstract <E extends Enum<E>> Set<E> getEnumSetShort(Class<E> enumClass); /** * Reads a short sized bit vector and converts it to an {@link EnumSet}. @@ -1958,7 +1958,7 @@ public abstract class IoBuffer implements Comparable<IoBuffer> { * @param enumClass the enum class used to create the EnumSet * @return the EnumSet representation of the bit vector */ - public abstract <E extends Enum<E>> EnumSet<E> getEnumSetShort(int index, Class<E> enumClass); + public abstract <E extends Enum<E>> Set<E> getEnumSetShort(int index, Class<E> enumClass); /** * Reads an int sized bit vector and converts it to an {@link EnumSet}. @@ -1968,7 +1968,7 @@ public abstract class IoBuffer implements Comparable<IoBuffer> { * @param enumClass the enum class used to create the EnumSet * @return the EnumSet representation of the bit vector */ - public abstract <E extends Enum<E>> EnumSet<E> getEnumSetInt(Class<E> enumClass); + public abstract <E extends Enum<E>> Set<E> getEnumSetInt(Class<E> enumClass); /** * Reads an int sized bit vector and converts it to an {@link EnumSet}. @@ -1979,7 +1979,7 @@ public abstract class IoBuffer implements Comparable<IoBuffer> { * @param enumClass the enum class used to create the EnumSet * @return the EnumSet representation of the bit vector */ - public abstract <E extends Enum<E>> EnumSet<E> getEnumSetInt(int index, Class<E> enumClass); + public abstract <E extends Enum<E>> Set<E> getEnumSetInt(int index, Class<E> enumClass); /** * Reads a long sized bit vector and converts it to an {@link EnumSet}. @@ -1989,7 +1989,7 @@ public abstract class IoBuffer implements Comparable<IoBuffer> { * @param enumClass the enum class used to create the EnumSet * @return the EnumSet representation of the bit vector */ - public abstract <E extends Enum<E>> EnumSet<E> getEnumSetLong(Class<E> enumClass); + public abstract <E extends Enum<E>> Set<E> getEnumSetLong(Class<E> enumClass); /** * Reads a long sized bit vector and converts it to an {@link EnumSet}. @@ -2000,7 +2000,7 @@ public abstract class IoBuffer implements Comparable<IoBuffer> { * @param enumClass the enum class used to create the EnumSet * @return the EnumSet representation of the bit vector */ - public abstract <E extends Enum<E>> EnumSet<E> getEnumSetLong(int index, Class<E> enumClass); + public abstract <E extends Enum<E>> Set<E> getEnumSetLong(int index, Class<E> enumClass); /** * Writes the specified {@link Set} to the buffer as a byte sized bit http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-core/src/main/java/org/apache/mina/core/buffer/IoBufferWrapper.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/core/buffer/IoBufferWrapper.java b/mina-core/src/main/java/org/apache/mina/core/buffer/IoBufferWrapper.java index 4ef1b88..7616af1 100644 --- a/mina-core/src/main/java/org/apache/mina/core/buffer/IoBufferWrapper.java +++ b/mina-core/src/main/java/org/apache/mina/core/buffer/IoBufferWrapper.java @@ -33,7 +33,6 @@ import java.nio.ShortBuffer; import java.nio.charset.CharacterCodingException; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; -import java.util.EnumSet; import java.util.Set; /** @@ -1348,7 +1347,7 @@ public class IoBufferWrapper extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSet(Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSet(Class<E> enumClass) { return buf.getEnumSet(enumClass); } @@ -1356,7 +1355,7 @@ public class IoBufferWrapper extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSet(int index, Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSet(int index, Class<E> enumClass) { return buf.getEnumSet(index, enumClass); } @@ -1364,7 +1363,7 @@ public class IoBufferWrapper extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSetShort(Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSetShort(Class<E> enumClass) { return buf.getEnumSetShort(enumClass); } @@ -1372,7 +1371,7 @@ public class IoBufferWrapper extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSetShort(int index, Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSetShort(int index, Class<E> enumClass) { return buf.getEnumSetShort(index, enumClass); } @@ -1380,7 +1379,7 @@ public class IoBufferWrapper extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSetInt(Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSetInt(Class<E> enumClass) { return buf.getEnumSetInt(enumClass); } @@ -1388,7 +1387,7 @@ public class IoBufferWrapper extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSetInt(int index, Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSetInt(int index, Class<E> enumClass) { return buf.getEnumSetInt(index, enumClass); } @@ -1396,7 +1395,7 @@ public class IoBufferWrapper extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSetLong(Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSetLong(Class<E> enumClass) { return buf.getEnumSetLong(enumClass); } @@ -1404,7 +1403,7 @@ public class IoBufferWrapper extends IoBuffer { * {@inheritDoc} */ @Override - public <E extends Enum<E>> EnumSet<E> getEnumSetLong(int index, Class<E> enumClass) { + public <E extends Enum<E>> Set<E> getEnumSetLong(int index, Class<E> enumClass) { return buf.getEnumSetLong(index, enumClass); } http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java b/mina-core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java index b197a99..1c0b6ac 100644 --- a/mina-core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java +++ b/mina-core/src/main/java/org/apache/mina/core/file/FilenameFileRegion.java @@ -41,7 +41,7 @@ public class FilenameFileRegion extends DefaultFileRegion { * @param channel The channel over the file * @throws IOException If we got an IO error */ - public FilenameFileRegion(File file, FileChannel channel) throws IOException { + public FilenameFileRegion(File file, FileChannel channel) { this(file, channel, 0, file.length()); } http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java index 509e678..a0d29b7 100644 --- a/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java +++ b/mina-core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java @@ -28,7 +28,6 @@ import java.util.concurrent.locks.ReentrantLock; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngineResult; -import javax.net.ssl.SSLEngineResult.HandshakeStatus; import javax.net.ssl.SSLEngineResult.Status; import javax.net.ssl.SSLException; import javax.net.ssl.SSLHandshakeException; @@ -120,7 +119,7 @@ class SslHandler { private ReentrantLock sslLock = new ReentrantLock(); /** A counter of schedules events */ - private final AtomicInteger scheduled_events = new AtomicInteger(0); + private final AtomicInteger scheduledEvents = new AtomicInteger(0); /** * Create a new SSL Handler, and initialize it. @@ -128,7 +127,7 @@ class SslHandler { * @param sslContext * @throws SSLException */ - /* no qualifier */SslHandler(SslFilter sslFilter, IoSession session) throws SSLException { + /* no qualifier */SslHandler(SslFilter sslFilter, IoSession session) { this.sslFilter = sslFilter; this.session = session; } @@ -306,7 +305,7 @@ class SslHandler { } /* no qualifier */void flushScheduledEvents() { - scheduled_events.incrementAndGet(); + scheduledEvents.incrementAndGet(); // Fire events only when the lock is available for this handler. if (sslLock.tryLock()) { @@ -325,7 +324,7 @@ class SslHandler { NextFilter nextFilter = event.getNextFilter(); nextFilter.messageReceived(session, event.getParameter()); } - } while (scheduled_events.decrementAndGet() > 0); + } while (scheduledEvents.decrementAndGet() > 0); } finally { sslLock.unlock(); } @@ -342,11 +341,7 @@ class SslHandler { */ /* no qualifier */void messageReceived(NextFilter nextFilter, ByteBuffer buf) throws SSLException { if (LOGGER.isDebugEnabled()) { - if (!isOutboundDone()) { - LOGGER.debug("{} Processing the received message", sslFilter.getSessionInfo(session)); - } else { - LOGGER.debug("{} Processing the received message", sslFilter.getSessionInfo(session)); - } + LOGGER.debug("{} Processing the received message", sslFilter.getSessionInfo(session)); } // append buf to inNetBuffer @@ -749,9 +744,7 @@ class SslHandler { } SSLEngineResult res; - Status status; - HandshakeStatus handshakeStatus; do { // Decode the incoming data http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferTest.java ---------------------------------------------------------------------- diff --git a/mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferTest.java b/mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferTest.java index 4a926f5..6b18240 100644 --- a/mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferTest.java +++ b/mina-core/src/test/java/org/apache/mina/core/buffer/IoBufferTest.java @@ -34,6 +34,7 @@ import java.nio.charset.CharacterCodingException; import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetEncoder; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Date; import java.util.EnumSet; @@ -580,7 +581,7 @@ public class IoBufferTest { IoBuffer buf = IoBuffer.allocate(16); CharsetDecoder decoder; - Charset charset = Charset.forName("UTF-8"); + Charset charset = StandardCharsets.UTF_8; buf.clear(); buf.putString("hello", charset.newEncoder()); buf.put((byte) 0); @@ -901,7 +902,7 @@ public class IoBufferTest { IoBuffer buffer = IoBuffer.allocate(1); buffer.setAutoExpand(true); - Charset charset = Charset.forName("UTF-8"); + Charset charset = StandardCharsets.UTF_8; CharsetEncoder encoder = charset.newEncoder(); http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceDIRMINA1076Test.java ---------------------------------------------------------------------- diff --git a/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceDIRMINA1076Test.java b/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceDIRMINA1076Test.java index 794ba94..4f766fa 100644 --- a/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceDIRMINA1076Test.java +++ b/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceDIRMINA1076Test.java @@ -37,6 +37,7 @@ import org.junit.Test; import java.io.IOException; import java.net.InetSocketAddress; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.concurrent.CountDownLatch; /** @@ -62,7 +63,7 @@ public class AbstractIoServiceDIRMINA1076Test { final IoAcceptor acceptor = new NioSocketAcceptor(); acceptor.getFilterChain() .addLast( "codec", - new ProtocolCodecFilter( new TextLineCodecFactory( Charset.forName( "UTF-8" ) ) ) ); + new ProtocolCodecFilter( new TextLineCodecFactory( StandardCharsets.UTF_8 ) ) ); acceptor.setHandler( new ServerHandler() ); @@ -83,7 +84,7 @@ public class AbstractIoServiceDIRMINA1076Test { connector.setHandler( new ClientHandler() ); connector.getFilterChain() .addLast( "codec", - new ProtocolCodecFilter( new TextLineCodecFactory( Charset.forName( "UTF-8" ) ) ) ); + new ProtocolCodecFilter( new TextLineCodecFactory( StandardCharsets.UTF_8 ) ) ); // Start communication. ConnectFuture cf = connector.connect( new InetSocketAddress( "localhost", nextAvailable ) ); http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceTest.java ---------------------------------------------------------------------- diff --git a/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceTest.java b/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceTest.java index 2d70f8e..0181837 100644 --- a/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceTest.java +++ b/mina-core/src/test/java/org/apache/mina/core/service/AbstractIoServiceTest.java @@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.net.InetSocketAddress; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -59,7 +59,7 @@ public class AbstractIoServiceTest { acceptor.getFilterChain().addLast("logger", new LoggingFilter()); acceptor.getFilterChain().addLast("codec", - new ProtocolCodecFilter(new TextLineCodecFactory(Charset.forName("UTF-8")))); + new ProtocolCodecFilter(new TextLineCodecFactory(StandardCharsets.UTF_8))); acceptor.setHandler(new ServerHandler()); @@ -76,7 +76,7 @@ public class AbstractIoServiceTest { connector.setHandler(new ClientHandler()); connector.getFilterChain().addLast("logger", new LoggingFilter()); connector.getFilterChain().addLast("codec", - new ProtocolCodecFilter(new TextLineCodecFactory(Charset.forName("UTF-8")))); + new ProtocolCodecFilter(new TextLineCodecFactory(StandardCharsets.UTF_8))); // Start communication. ConnectFuture cf = connector.connect(new InetSocketAddress("localhost", 9123)); http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-core/src/test/java/org/apache/mina/core/service/SslTestHandshakeExceptionDIRMINA1077Test.java ---------------------------------------------------------------------- diff --git a/mina-core/src/test/java/org/apache/mina/core/service/SslTestHandshakeExceptionDIRMINA1077Test.java b/mina-core/src/test/java/org/apache/mina/core/service/SslTestHandshakeExceptionDIRMINA1077Test.java index 5c0b98b..a44c9c7 100644 --- a/mina-core/src/test/java/org/apache/mina/core/service/SslTestHandshakeExceptionDIRMINA1077Test.java +++ b/mina-core/src/test/java/org/apache/mina/core/service/SslTestHandshakeExceptionDIRMINA1077Test.java @@ -18,7 +18,7 @@ * */ -package org.apache.mina.filter.ssl; +package org.apache.mina.core.service; import static org.junit.Assert.fail; @@ -29,6 +29,7 @@ import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; import org.apache.mina.filter.codec.textline.TextLineCodecFactory; +import org.apache.mina.filter.ssl.SslFilter; import org.apache.mina.transport.socket.nio.NioSocketAcceptor; import org.apache.mina.transport.socket.nio.NioSocketConnector; import org.apache.mina.util.AvailablePortFinder; http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java ---------------------------------------------------------------------- diff --git a/mina-core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java b/mina-core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java index 5de6a20..e37fb42 100644 --- a/mina-core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java +++ b/mina-core/src/test/java/org/apache/mina/filter/codec/textline/TextLineDecoderTest.java @@ -25,6 +25,7 @@ import static org.junit.Assert.fail; import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; +import java.nio.charset.StandardCharsets; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.filter.codec.ProtocolCodecSession; @@ -40,9 +41,9 @@ import org.junit.Test; public class TextLineDecoderTest { @Test public void testNormalDecode() throws Exception { - TextLineDecoder decoder = new TextLineDecoder(Charset.forName("UTF-8"), LineDelimiter.WINDOWS); + TextLineDecoder decoder = new TextLineDecoder(StandardCharsets.UTF_8, LineDelimiter.WINDOWS); - CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder(); + CharsetEncoder encoder = StandardCharsets.UTF_8.newEncoder(); ProtocolCodecSession session = new ProtocolCodecSession(); ProtocolDecoderOutput out = session.getDecoderOutput(); IoBuffer in = IoBuffer.allocate(16); @@ -85,7 +86,7 @@ public class TextLineDecoderTest { assertEquals("ABC\r", session.getDecoderOutputQueue().poll()); // Test splitted long delimiter - decoder = new TextLineDecoder(Charset.forName("UTF-8"), new LineDelimiter("\n\n\n")); + decoder = new TextLineDecoder(StandardCharsets.UTF_8, new LineDelimiter("\n\n\n")); in.clear(); in.putString("PQR\n", encoder); in.flip(); @@ -104,7 +105,7 @@ public class TextLineDecoderTest { assertEquals("PQR", session.getDecoderOutputQueue().poll()); // Test splitted long delimiter which produces two output - decoder = new TextLineDecoder(Charset.forName("UTF-8"), new LineDelimiter("\n\n\n")); + decoder = new TextLineDecoder(StandardCharsets.UTF_8, new LineDelimiter("\n\n\n")); in.clear(); in.putString("PQR\n", encoder); in.flip(); @@ -124,7 +125,7 @@ public class TextLineDecoderTest { assertEquals("STU", session.getDecoderOutputQueue().poll()); // Test splitted long delimiter mixed with partial non-delimiter. - decoder = new TextLineDecoder(Charset.forName("UTF-8"), new LineDelimiter("\n\n\n")); + decoder = new TextLineDecoder(StandardCharsets.UTF_8, new LineDelimiter("\n\n\n")); in.clear(); in.putString("PQR\n", encoder); in.flip(); @@ -145,9 +146,9 @@ public class TextLineDecoderTest { } public void testAutoDecode() throws Exception { - TextLineDecoder decoder = new TextLineDecoder(Charset.forName("UTF-8"), LineDelimiter.AUTO); + TextLineDecoder decoder = new TextLineDecoder(StandardCharsets.UTF_8, LineDelimiter.AUTO); - CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder(); + CharsetEncoder encoder = StandardCharsets.UTF_8.newEncoder(); ProtocolCodecSession session = new ProtocolCodecSession(); ProtocolDecoderOutput out = session.getDecoderOutput(); IoBuffer in = IoBuffer.allocate(16); @@ -257,10 +258,10 @@ public class TextLineDecoderTest { } public void testOverflow() throws Exception { - TextLineDecoder decoder = new TextLineDecoder(Charset.forName("UTF-8"), LineDelimiter.AUTO); + TextLineDecoder decoder = new TextLineDecoder(StandardCharsets.UTF_8, LineDelimiter.AUTO); decoder.setMaxLineLength(3); - CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder(); + CharsetEncoder encoder = StandardCharsets.UTF_8.newEncoder(); ProtocolCodecSession session = new ProtocolCodecSession(); ProtocolDecoderOutput out = session.getDecoderOutput(); IoBuffer in = IoBuffer.allocate(16); http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java ---------------------------------------------------------------------- diff --git a/mina-core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java b/mina-core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java index fdd74f7..e9c06ef 100644 --- a/mina-core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java +++ b/mina-core/src/test/java/org/apache/mina/filter/codec/textline/TextLineEncoderTest.java @@ -21,7 +21,7 @@ package org.apache.mina.filter.codec.textline; import static org.junit.Assert.assertEquals; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.filter.codec.ProtocolCodecSession; @@ -36,7 +36,7 @@ import org.junit.Test; public class TextLineEncoderTest { @Test public void testEncode() throws Exception { - TextLineEncoder encoder = new TextLineEncoder(Charset.forName("UTF-8"), LineDelimiter.WINDOWS); + TextLineEncoder encoder = new TextLineEncoder(StandardCharsets.UTF_8, LineDelimiter.WINDOWS); ProtocolCodecSession session = new ProtocolCodecSession(); ProtocolEncoderOutput out = session.getEncoderOutput(); http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/MinaTimeServer.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/MinaTimeServer.java b/mina-example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/MinaTimeServer.java index 88158bb..9ade80d 100644 --- a/mina-example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/MinaTimeServer.java +++ b/mina-example/src/main/java/org/apache/mina/example/gettingstarted/timeserver/MinaTimeServer.java @@ -21,7 +21,7 @@ package org.apache.mina.example.gettingstarted.timeserver; import java.io.IOException; import java.net.InetSocketAddress; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import org.apache.mina.core.service.IoAcceptor; import org.apache.mina.core.session.IdleStatus; @@ -56,7 +56,7 @@ public class MinaTimeServer { // Add two filters : a logger and a codec acceptor.getFilterChain().addLast( "logger", new LoggingFilter() ); - acceptor.getFilterChain().addLast( "codec", new ProtocolCodecFilter( new TextLineCodecFactory( Charset.forName( "UTF-8" )))); + acceptor.getFilterChain().addLast( "codec", new ProtocolCodecFilter( new TextLineCodecFactory( StandardCharsets.UTF_8))); // Attach the business logic to the server acceptor.setHandler( new TimeServerHandler() ); http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-example/src/main/java/org/apache/mina/example/reverser/Main.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/reverser/Main.java b/mina-example/src/main/java/org/apache/mina/example/reverser/Main.java index e77f616..c4548e2 100644 --- a/mina-example/src/main/java/org/apache/mina/example/reverser/Main.java +++ b/mina-example/src/main/java/org/apache/mina/example/reverser/Main.java @@ -20,7 +20,7 @@ package org.apache.mina.example.reverser; import java.net.InetSocketAddress; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import org.apache.mina.filter.codec.ProtocolCodecFilter; import org.apache.mina.filter.codec.textline.TextLineCodecFactory; @@ -43,8 +43,7 @@ public class Main { acceptor.getFilterChain().addLast("logger", new LoggingFilter()); acceptor.getFilterChain().addLast( "codec", - new ProtocolCodecFilter(new TextLineCodecFactory(Charset - .forName("UTF-8")))); + new ProtocolCodecFilter(new TextLineCodecFactory(StandardCharsets.UTF_8))); // Bind acceptor.setHandler(new ReverseProtocolHandler()); http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java ---------------------------------------------------------------------- diff --git a/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java b/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java index 067fc9e..e330290 100644 --- a/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java +++ b/mina-example/src/test/java/org/apache/mina/example/echoserver/ssl/SslFilterTest.java @@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue; import java.net.InetSocketAddress; import java.net.Socket; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.security.cert.CertificateException; import java.util.ArrayList; import java.util.List; @@ -87,8 +88,7 @@ public class SslFilterTest { } acceptor.getFilterChain().addLast( "codec", - new ProtocolCodecFilter(new TextLineCodecFactory(Charset - .forName("UTF-8")))); + new ProtocolCodecFilter(new TextLineCodecFactory(StandardCharsets.UTF_8))); EchoHandler handler = new EchoHandler(); acceptor.setHandler(handler); @@ -134,7 +134,7 @@ public class SslFilterTest { } private int writeMessage(Socket socket, String message) throws Exception { - byte request[] = message.getBytes("UTF-8"); + byte request[] = message.getBytes(StandardCharsets.UTF_8); socket.getOutputStream().write(request); return request.length; } http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-example/src/test/java/org/apache/mina/example/proxy/telnet/ProxyTelnetTestClient.java ---------------------------------------------------------------------- diff --git a/mina-example/src/test/java/org/apache/mina/example/proxy/telnet/ProxyTelnetTestClient.java b/mina-example/src/test/java/org/apache/mina/example/proxy/telnet/ProxyTelnetTestClient.java index 01c1282..e803958 100644 --- a/mina-example/src/test/java/org/apache/mina/example/proxy/telnet/ProxyTelnetTestClient.java +++ b/mina-example/src/test/java/org/apache/mina/example/proxy/telnet/ProxyTelnetTestClient.java @@ -21,6 +21,7 @@ package org.apache.mina.example.proxy.telnet; import java.net.InetSocketAddress; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import org.apache.mina.core.RuntimeIoException; @@ -100,8 +101,7 @@ public class ProxyTelnetTestClient { LineDelimiter delim = new LineDelimiter("\r\n"); targetConnector.getFilterChain().addLast( "codec", - new ProtocolCodecFilter(new TextLineCodecFactory(Charset - .forName("UTF-8"), delim, delim))); + new ProtocolCodecFilter(new TextLineCodecFactory(StandardCharsets.UTF_8, delim, delim))); connector.setHandler(new TelnetSessionHandler()); http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-http/src/main/java/org/apache/mina/http/HttpClientEncoder.java ---------------------------------------------------------------------- diff --git a/mina-http/src/main/java/org/apache/mina/http/HttpClientEncoder.java b/mina-http/src/main/java/org/apache/mina/http/HttpClientEncoder.java index 40b1981..71f7e65 100644 --- a/mina-http/src/main/java/org/apache/mina/http/HttpClientEncoder.java +++ b/mina-http/src/main/java/org/apache/mina/http/HttpClientEncoder.java @@ -20,8 +20,8 @@ package org.apache.mina.http; import java.nio.ByteBuffer; -import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; +import java.nio.charset.StandardCharsets; import java.util.Map; import org.apache.mina.core.buffer.IoBuffer; @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; */ public class HttpClientEncoder implements ProtocolEncoder { private static final Logger LOG = LoggerFactory.getLogger(HttpClientCodec.class); - private static final CharsetEncoder ENCODER = Charset.forName("UTF-8").newEncoder(); + private static final CharsetEncoder ENCODER = StandardCharsets.UTF_8.newEncoder(); /** * {@inheritDoc} http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/mina-http/src/main/java/org/apache/mina/http/HttpServerEncoder.java ---------------------------------------------------------------------- diff --git a/mina-http/src/main/java/org/apache/mina/http/HttpServerEncoder.java b/mina-http/src/main/java/org/apache/mina/http/HttpServerEncoder.java index 186fea0..b612b75 100644 --- a/mina-http/src/main/java/org/apache/mina/http/HttpServerEncoder.java +++ b/mina-http/src/main/java/org/apache/mina/http/HttpServerEncoder.java @@ -20,8 +20,8 @@ package org.apache.mina.http; import java.nio.ByteBuffer; -import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; +import java.nio.charset.StandardCharsets; import java.util.Map; import org.apache.mina.core.buffer.IoBuffer; @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; */ public class HttpServerEncoder implements ProtocolEncoder { private static final Logger LOG = LoggerFactory.getLogger(HttpServerCodec.class); - private static final CharsetEncoder ENCODER = Charset.forName("UTF-8").newEncoder(); + private static final CharsetEncoder ENCODER = StandardCharsets.UTF_8.newEncoder(); /** * {@inheritDoc} http://git-wip-us.apache.org/repos/asf/mina/blob/60cb619b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6a4edc8..29e9e2e 100644 --- a/pom.xml +++ b/pom.xml @@ -24,12 +24,12 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>18</version> + <version>19</version> <relativePath /> </parent> <prerequisites> - <maven>3.0.3</maven> + <maven>3.0.5</maven> </prerequisites> <organization>
