You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2016/12/07 18:51:22 UTC
[3/4] mina git commit: Fixed some Soarlint warnings
Fixed some Soarlint warnings
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/c87701fb
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/c87701fb
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/c87701fb
Branch: refs/heads/2.0
Commit: c87701fb188cef67fa500a17780a107f6c0a456e
Parents: 37239fd
Author: Emmanuel L�charny <el...@symas.com>
Authored: Wed Dec 7 11:43:43 2016 +0100
Committer: Emmanuel L�charny <el...@symas.com>
Committed: Wed Dec 7 11:43:43 2016 +0100
----------------------------------------------------------------------
.../socket/AbstractDatagramSessionConfig.java | 2 ++
.../mina/transport/socket/DatagramAcceptor.java | 3 +++
.../transport/socket/DatagramConnector.java | 2 ++
.../socket/DefaultDatagramSessionConfig.java | 26 +++++++++++++++++++-
.../mina/transport/socket/SocketAcceptor.java | 3 +++
.../mina/transport/socket/SocketConnector.java | 2 ++
.../mina/transport/socket/nio/NioSession.java | 6 +++++
.../socket/nio/NioSocketConnector.java | 6 +++++
.../transport/socket/nio/NioSocketSession.java | 1 +
9 files changed, 50 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/c87701fb/mina-core/src/main/java/org/apache/mina/transport/socket/AbstractDatagramSessionConfig.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/AbstractDatagramSessionConfig.java b/mina-core/src/main/java/org/apache/mina/transport/socket/AbstractDatagramSessionConfig.java
index 67daf74..0ef1b9f 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/AbstractDatagramSessionConfig.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/AbstractDatagramSessionConfig.java
@@ -136,6 +136,7 @@ public abstract class AbstractDatagramSessionConfig extends AbstractIoSessionCon
/**
* {@inheritDoc}
*/
+ @Override
public boolean isCloseOnPortUnreachable() {
return closeOnPortUnreachable;
}
@@ -143,6 +144,7 @@ public abstract class AbstractDatagramSessionConfig extends AbstractIoSessionCon
/**
* {@inheritDoc}
*/
+ @Override
public void setCloseOnPortUnreachable(boolean closeOnPortUnreachable) {
this.closeOnPortUnreachable = closeOnPortUnreachable;
}
http://git-wip-us.apache.org/repos/asf/mina/blob/c87701fb/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java b/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java
index fba0319..bc0c687 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramAcceptor.java
@@ -38,12 +38,14 @@ public interface DatagramAcceptor extends IoAcceptor {
* necessarily the firstly bound address.
* This method overrides the {@link IoAcceptor#getLocalAddress()} method.
*/
+ @Override
InetSocketAddress getLocalAddress();
/**
* @return a {@link Set} of the local InetSocketAddress which are bound currently.
* This method overrides the {@link IoAcceptor#getDefaultLocalAddress()} method.
*/
+ @Override
InetSocketAddress getDefaultLocalAddress();
/**
@@ -72,5 +74,6 @@ public interface DatagramAcceptor extends IoAcceptor {
* @return the default Datagram configuration of the new {@link IoSession}s
* created by this service.
*/
+ @Override
DatagramSessionConfig getSessionConfig();
}
http://git-wip-us.apache.org/repos/asf/mina/blob/c87701fb/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java b/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java
index 02e5249..15ee056 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/DatagramConnector.java
@@ -34,12 +34,14 @@ public interface DatagramConnector extends IoConnector {
* is specified in {@link #connect()} method.
* This method overrides the {@link IoConnector#getDefaultRemoteAddress()} method.
*/
+ @Override
InetSocketAddress getDefaultRemoteAddress();
/**
* @return the default configuration of the new FatagramSessions created by
* this connect service.
*/
+ @Override
DatagramSessionConfig getSessionConfig();
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/c87701fb/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java b/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java
index 843e893..198d479 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java
@@ -59,6 +59,7 @@ public class DefaultDatagramSessionConfig extends AbstractDatagramSessionConfig
/**
* @see DatagramSocket#getBroadcast()
*/
+ @Override
public boolean isBroadcast() {
return broadcast;
}
@@ -66,6 +67,7 @@ public class DefaultDatagramSessionConfig extends AbstractDatagramSessionConfig
/**
* @see DatagramSocket#setBroadcast(boolean)
*/
+ @Override
public void setBroadcast(boolean broadcast) {
this.broadcast = broadcast;
}
@@ -73,6 +75,7 @@ public class DefaultDatagramSessionConfig extends AbstractDatagramSessionConfig
/**
* @see DatagramSocket#getReuseAddress()
*/
+ @Override
public boolean isReuseAddress() {
return reuseAddress;
}
@@ -80,6 +83,7 @@ public class DefaultDatagramSessionConfig extends AbstractDatagramSessionConfig
/**
* @see DatagramSocket#setReuseAddress(boolean)
*/
+ @Override
public void setReuseAddress(boolean reuseAddress) {
this.reuseAddress = reuseAddress;
}
@@ -87,6 +91,7 @@ public class DefaultDatagramSessionConfig extends AbstractDatagramSessionConfig
/**
* @see DatagramSocket#getReceiveBufferSize()
*/
+ @Override
public int getReceiveBufferSize() {
return receiveBufferSize;
}
@@ -94,6 +99,7 @@ public class DefaultDatagramSessionConfig extends AbstractDatagramSessionConfig
/**
* @see DatagramSocket#setReceiveBufferSize(int)
*/
+ @Override
public void setReceiveBufferSize(int receiveBufferSize) {
this.receiveBufferSize = receiveBufferSize;
}
@@ -101,6 +107,7 @@ public class DefaultDatagramSessionConfig extends AbstractDatagramSessionConfig
/**
* @see DatagramSocket#getSendBufferSize()
*/
+ @Override
public int getSendBufferSize() {
return sendBufferSize;
}
@@ -108,6 +115,7 @@ public class DefaultDatagramSessionConfig extends AbstractDatagramSessionConfig
/**
* @see DatagramSocket#setSendBufferSize(int)
*/
+ @Override
public void setSendBufferSize(int sendBufferSize) {
this.sendBufferSize = sendBufferSize;
}
@@ -115,6 +123,7 @@ public class DefaultDatagramSessionConfig extends AbstractDatagramSessionConfig
/**
* @see DatagramSocket#getTrafficClass()
*/
+ @Override
public int getTrafficClass() {
return trafficClass;
}
@@ -122,33 +131,48 @@ public class DefaultDatagramSessionConfig extends AbstractDatagramSessionConfig
/**
* @see DatagramSocket#setTrafficClass(int)
*/
+ @Override
public void setTrafficClass(int trafficClass) {
this.trafficClass = trafficClass;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected boolean isBroadcastChanged() {
return broadcast != DEFAULT_BROADCAST;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected boolean isReceiveBufferSizeChanged() {
return receiveBufferSize != DEFAULT_RECEIVE_BUFFER_SIZE;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected boolean isReuseAddressChanged() {
return reuseAddress != DEFAULT_REUSE_ADDRESS;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected boolean isSendBufferSizeChanged() {
return sendBufferSize != DEFAULT_SEND_BUFFER_SIZE;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected boolean isTrafficClassChanged() {
return trafficClass != DEFAULT_TRAFFIC_CLASS;
}
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mina/blob/c87701fb/mina-core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java b/mina-core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java
index 86d1f47..b21f79c 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/SocketAcceptor.java
@@ -38,12 +38,14 @@ public interface SocketAcceptor extends IoAcceptor {
* necessarily the firstly bound address.
* This method overrides the {@link IoAcceptor#getLocalAddress()} method.
*/
+ @Override
InetSocketAddress getLocalAddress();
/**
* @return a {@link Set} of the local InetSocketAddress which are bound currently.
* This method overrides the {@link IoAcceptor#getDefaultLocalAddress()} method.
*/
+ @Override
InetSocketAddress getDefaultLocalAddress();
/**
@@ -87,5 +89,6 @@ public interface SocketAcceptor extends IoAcceptor {
* @return the default configuration of the new SocketSessions created by
* this acceptor service.
*/
+ @Override
SocketSessionConfig getSessionConfig();
}
http://git-wip-us.apache.org/repos/asf/mina/blob/c87701fb/mina-core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java b/mina-core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java
index f91b188..0254c55 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/SocketConnector.java
@@ -34,12 +34,14 @@ public interface SocketConnector extends IoConnector {
* is specified in {@link #connect()} method.
* This method overrides the {@link IoConnector#getDefaultRemoteAddress()} method.
*/
+ @Override
InetSocketAddress getDefaultRemoteAddress();
/**
* @return the default configuration of the new SocketSessions created by
* this connect service.
*/
+ @Override
SocketSessionConfig getSessionConfig();
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/c87701fb/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java
index bc80d9c..97245cf 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java
@@ -70,6 +70,10 @@ public abstract class NioSession extends AbstractIoSession {
*/
abstract ByteChannel getChannel();
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public IoFilterChain getFilterChain() {
return filterChain;
}
@@ -93,6 +97,7 @@ public abstract class NioSession extends AbstractIoSession {
/**
* {@inheritDoc}
*/
+ @Override
public IoProcessor<NioSession> getProcessor() {
return processor;
}
@@ -100,6 +105,7 @@ public abstract class NioSession extends AbstractIoSession {
/**
* {@inheritDoc}
*/
+ @Override
public final boolean isActive() {
return key.isValid();
}
http://git-wip-us.apache.org/repos/asf/mina/blob/c87701fb/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
index bd1cf00..63313d7 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketConnector.java
@@ -142,6 +142,7 @@ SocketConnector {
/**
* {@inheritDoc}
*/
+ @Override
public TransportMetadata getTransportMetadata() {
return NioSocketSession.METADATA;
}
@@ -149,6 +150,7 @@ SocketConnector {
/**
* {@inheritDoc}
*/
+ @Override
public SocketSessionConfig getSessionConfig() {
return (SocketSessionConfig) sessionConfig;
}
@@ -164,6 +166,7 @@ SocketConnector {
/**
* {@inheritDoc}
*/
+ @Override
public void setDefaultRemoteAddress(InetSocketAddress defaultRemoteAddress) {
super.setDefaultRemoteAddress(defaultRemoteAddress);
}
@@ -316,6 +319,7 @@ SocketConnector {
/**
* {@inheritDoc}
*/
+ @Override
public boolean hasNext() {
return i.hasNext();
}
@@ -323,6 +327,7 @@ SocketConnector {
/**
* {@inheritDoc}
*/
+ @Override
public SocketChannel next() {
SelectionKey key = i.next();
return (SocketChannel) key.channel();
@@ -331,6 +336,7 @@ SocketConnector {
/**
* {@inheritDoc}
*/
+ @Override
public void remove() {
i.remove();
}
http://git-wip-us.apache.org/repos/asf/mina/blob/c87701fb/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java
index 8948c55..8bae465 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java
@@ -352,6 +352,7 @@ class NioSocketSession extends NioSession {
/**
* {@inheritDoc}
*/
+ @Override
public final boolean isSecured() {
// If the session does not have a SslFilter, we can return false
IoFilterChain chain = getFilterChain();