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 2017/10/26 21:55:36 UTC
mina git commit: Many javadoc fixes for DIRMINA-1052
Repository: mina
Updated Branches:
refs/heads/2.0 c2582ddd0 -> f1efd2ae8
Many javadoc fixes for DIRMINA-1052
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/f1efd2ae
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/f1efd2ae
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/f1efd2ae
Branch: refs/heads/2.0
Commit: f1efd2ae86c0d1ee43a30b1e22f44178fa9ff3d4
Parents: c2582dd
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Oct 26 23:51:15 2017 +0200
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Oct 26 23:51:59 2017 +0200
----------------------------------------------------------------------
.../org/apache/mina/core/RuntimeIoException.java | 2 ++
.../apache/mina/core/buffer/IoBufferWrapper.java | 3 ++-
.../core/filterchain/DefaultIoFilterChain.java | 1 +
.../filterchain/DefaultIoFilterChainBuilder.java | 1 +
.../apache/mina/core/filterchain/IoFilter.java | 2 ++
.../mina/core/filterchain/IoFilterChain.java | 1 +
.../core/filterchain/IoFilterChainBuilder.java | 2 ++
.../mina/core/future/CompositeIoFuture.java | 2 ++
.../apache/mina/core/future/IoFutureListener.java | 2 ++
.../org/apache/mina/core/future/ReadFuture.java | 2 ++
.../core/polling/AbstractPollingIoAcceptor.java | 6 ++++++
.../core/polling/AbstractPollingIoConnector.java | 7 +++++++
.../mina/core/service/AbstractIoAcceptor.java | 5 ++++-
.../mina/core/service/AbstractIoConnector.java | 1 +
.../org/apache/mina/core/service/IoConnector.java | 1 +
.../org/apache/mina/core/service/IoHandler.java | 2 ++
.../org/apache/mina/core/service/IoService.java | 2 ++
.../mina/core/service/SimpleIoProcessorPool.java | 1 +
.../mina/core/service/TransportMetadata.java | 1 +
.../DefaultIoSessionDataStructureFactory.java | 1 +
.../apache/mina/core/session/DummySession.java | 1 +
.../mina/core/session/IdleStatusChecker.java | 1 +
.../org/apache/mina/core/session/IoSession.java | 3 +++
.../apache/mina/core/session/IoSessionConfig.java | 2 ++
.../session/IoSessionDataStructureFactory.java | 3 +++
.../mina/core/session/IoSessionRecycler.java | 2 ++
.../org/apache/mina/core/write/WriteRequest.java | 2 ++
.../mina/core/write/WriteTimeoutException.java | 2 ++
.../codec/demux/DemuxingProtocolCodecFactory.java | 4 ++++
.../codec/demux/DemuxingProtocolEncoder.java | 4 ++++
.../mina/filter/executor/WriteRequestFilter.java | 2 +-
.../mina/filter/logging/MdcInjectionFilter.java | 2 +-
.../apache/mina/handler/chain/IoHandlerChain.java | 18 +++++++++---------
.../socket/nio/NioDatagramConnector.java | 1 -
.../mina/transport/socket/nio/NioSession.java | 1 +
.../transport/socket/nio/NioSocketAcceptor.java | 4 +++-
.../transport/socket/nio/NioSocketConnector.java | 3 +++
.../java/org/apache/mina/statemachine/State.java | 1 +
.../apache/mina/statemachine/StateControl.java | 3 +++
.../mina/statemachine/StateMachineFactory.java | 2 ++
.../annotation/IoFilterTransition.java | 2 ++
.../annotation/IoFilterTransitions.java | 3 +++
.../annotation/IoHandlerTransition.java | 2 ++
.../annotation/IoHandlerTransitions.java | 3 +++
.../mina/statemachine/annotation/Transition.java | 1 +
.../annotation/TransitionAnnotation.java | 6 +++++-
.../mina/statemachine/context/StateContext.java | 1 +
.../event/EventArgumentsInterceptor.java | 2 ++
.../mina/statemachine/event/EventFactory.java | 1 +
.../mina/statemachine/event/IoFilterEvents.java | 3 +++
.../mina/statemachine/event/IoHandlerEvents.java | 3 +++
.../transition/AbstractTransition.java | 1 +
.../transition/MethodSelfTransition.java | 1 +
.../statemachine/transition/MethodTransition.java | 2 ++
.../mina/statemachine/transition/Transition.java | 1 +
55 files changed, 122 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/RuntimeIoException.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/RuntimeIoException.java b/mina-core/src/main/java/org/apache/mina/core/RuntimeIoException.java
index 1850190..88a4b3d 100644
--- a/mina-core/src/main/java/org/apache/mina/core/RuntimeIoException.java
+++ b/mina-core/src/main/java/org/apache/mina/core/RuntimeIoException.java
@@ -19,6 +19,8 @@
*/
package org.apache.mina.core;
+import java.io.IOException;
+
/**
* A unchecked version of {@link IOException}.
* <p>
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/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 b793816..4ef1b88 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
@@ -19,6 +19,7 @@
*/
package org.apache.mina.core.buffer;
+import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.ByteBuffer;
@@ -38,7 +39,7 @@ import java.util.Set;
/**
* A {@link IoBuffer} that wraps a buffer and proxies any operations to it.
* <p>
- * You can think this class like a {@link FilterOutputStream}. All operations
+ * You can think this class like a {@link FileOutputStream}. All operations
* are proxied by default so that you can extend this class and override existing
* operations selectively. You can introduce new operations, too.
*
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java b/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
index d09bdb4..ee17646 100644
--- a/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
+++ b/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChain.java
@@ -27,6 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.filterchain.IoFilter.NextFilter;
import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.future.IoFuture;
import org.apache.mina.core.service.AbstractIoService;
import org.apache.mina.core.session.AbstractIoSession;
import org.apache.mina.core.session.AttributeKey;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java b/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java
index 94c6a6f..bbf3f9e 100644
--- a/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java
+++ b/mina-core/src/main/java/org/apache/mina/core/filterchain/DefaultIoFilterChainBuilder.java
@@ -31,6 +31,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.mina.core.filterchain.IoFilter.NextFilter;
import org.apache.mina.core.filterchain.IoFilterChain.Entry;
+import org.apache.mina.core.session.IoSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java
index 70df3ef..4283240 100644
--- a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java
+++ b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilter.java
@@ -19,9 +19,11 @@
*/
package org.apache.mina.core.filterchain;
+import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.write.WriteRequest;
+import org.apache.mina.filter.util.ReferenceCountingFilter;
/**
* A filter which intercepts {@link IoHandler} events like Servlet
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java
index 2048b52..10079fc 100644
--- a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java
+++ b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChain.java
@@ -22,6 +22,7 @@ package org.apache.mina.core.filterchain;
import java.util.List;
import org.apache.mina.core.filterchain.IoFilter.NextFilter;
+import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.write.WriteRequest;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChainBuilder.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChainBuilder.java b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChainBuilder.java
index f195ab7..50b3b2c 100644
--- a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChainBuilder.java
+++ b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterChainBuilder.java
@@ -19,6 +19,8 @@
*/
package org.apache.mina.core.filterchain;
+import org.apache.mina.core.session.IoSession;
+
/**
* An interface that builds {@link IoFilterChain} in predefined way
* when {@link IoSession} is created. You can extract common filter chain
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/future/CompositeIoFuture.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/future/CompositeIoFuture.java b/mina-core/src/main/java/org/apache/mina/core/future/CompositeIoFuture.java
index 91af74b..1903f7e 100644
--- a/mina-core/src/main/java/org/apache/mina/core/future/CompositeIoFuture.java
+++ b/mina-core/src/main/java/org/apache/mina/core/future/CompositeIoFuture.java
@@ -21,6 +21,8 @@ package org.apache.mina.core.future;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.mina.core.IoUtil;
+
/**
* An {@link IoFuture} of {@link IoFuture}s. It is useful when you want to
* get notified when all {@link IoFuture}s are complete. It is not recommended
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/future/IoFutureListener.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/future/IoFutureListener.java b/mina-core/src/main/java/org/apache/mina/core/future/IoFutureListener.java
index e8451a1..33d7d53 100644
--- a/mina-core/src/main/java/org/apache/mina/core/future/IoFutureListener.java
+++ b/mina-core/src/main/java/org/apache/mina/core/future/IoFutureListener.java
@@ -21,6 +21,8 @@ package org.apache.mina.core.future;
import java.util.EventListener;
+import org.apache.mina.core.session.IoSession;
+
/**
* Something interested in being notified when the completion
* of an asynchronous I/O operation : {@link IoFuture}.
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/future/ReadFuture.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/future/ReadFuture.java b/mina-core/src/main/java/org/apache/mina/core/future/ReadFuture.java
index ed11d4d..62221a0 100644
--- a/mina-core/src/main/java/org/apache/mina/core/future/ReadFuture.java
+++ b/mina-core/src/main/java/org/apache/mina/core/future/ReadFuture.java
@@ -19,6 +19,8 @@
*/
package org.apache.mina.core.future;
+import org.apache.mina.core.session.IoSession;
+
/**
* An {@link IoFuture} for {@link IoSession#read() asynchronous read requests}.
*
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
index f552e6d..bf1bbf0 100644
--- a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
+++ b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoAcceptor.java
@@ -33,17 +33,23 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.core.service.AbstractIoAcceptor;
+import org.apache.mina.core.service.AbstractIoService;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.service.IoProcessor;
import org.apache.mina.core.service.SimpleIoProcessorPool;
import org.apache.mina.core.session.AbstractIoSession;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.session.IoSessionConfig;
import org.apache.mina.transport.socket.SocketSessionConfig;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.util.ExceptionMonitor;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
index 6a5079e..32a3956 100644
--- a/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
+++ b/mina-core/src/main/java/org/apache/mina/core/polling/AbstractPollingIoConnector.java
@@ -26,17 +26,24 @@ import java.util.Iterator;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.future.DefaultConnectFuture;
import org.apache.mina.core.service.AbstractIoConnector;
+import org.apache.mina.core.service.AbstractIoService;
+import org.apache.mina.core.service.IoConnector;
+import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.service.IoProcessor;
import org.apache.mina.core.service.SimpleIoProcessorPool;
import org.apache.mina.core.session.AbstractIoSession;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.session.IoSessionConfig;
import org.apache.mina.core.session.IoSessionInitializer;
+import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.apache.mina.util.ExceptionMonitor;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java b/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java
index 8a54405..30ef5fd 100644
--- a/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java
+++ b/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoAcceptor.java
@@ -28,8 +28,11 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
import org.apache.mina.core.RuntimeIoException;
+import org.apache.mina.core.future.IoFuture;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.session.IoSessionConfig;
/**
@@ -460,7 +463,7 @@ public final void bind(Iterable<? extends SocketAddress> localAddresses) throws
}
/**
- * A {@Link IoFuture}
+ * A {@link IoFuture}
*/
public static class AcceptorOperationFuture extends ServiceOperationFuture {
private final List<SocketAddress> localAddresses;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java b/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java
index ee3ebba..1ae1a30 100644
--- a/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java
+++ b/mina-core/src/main/java/org/apache/mina/core/service/AbstractIoConnector.java
@@ -21,6 +21,7 @@ package org.apache.mina.core.service;
import java.net.SocketAddress;
import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.future.IoFuture;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/service/IoConnector.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/service/IoConnector.java b/mina-core/src/main/java/org/apache/mina/core/service/IoConnector.java
index c4f1f0c..c6a2fdc 100644
--- a/mina-core/src/main/java/org/apache/mina/core/service/IoConnector.java
+++ b/mina-core/src/main/java/org/apache/mina/core/service/IoConnector.java
@@ -22,6 +22,7 @@ package org.apache.mina.core.service;
import java.net.SocketAddress;
import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.session.IoSessionInitializer;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/service/IoHandler.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/service/IoHandler.java b/mina-core/src/main/java/org/apache/mina/core/service/IoHandler.java
index 23e0dd9..e7db2fe 100644
--- a/mina-core/src/main/java/org/apache/mina/core/service/IoHandler.java
+++ b/mina-core/src/main/java/org/apache/mina/core/service/IoHandler.java
@@ -19,6 +19,8 @@
*/
package org.apache.mina.core.service;
+import java.io.IOException;
+
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/service/IoService.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/service/IoService.java b/mina-core/src/main/java/org/apache/mina/core/service/IoService.java
index 9ac81d5..31be6f7 100644
--- a/mina-core/src/main/java/org/apache/mina/core/service/IoService.java
+++ b/mina-core/src/main/java/org/apache/mina/core/service/IoService.java
@@ -22,7 +22,9 @@ package org.apache.mina.core.service;
import java.util.Map;
import java.util.Set;
+import org.apache.mina.core.IoUtil;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
+import org.apache.mina.core.filterchain.IoFilterChain;
import org.apache.mina.core.filterchain.IoFilterChainBuilder;
import org.apache.mina.core.future.WriteFuture;
import org.apache.mina.core.session.IoSession;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java b/mina-core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java
index ff86b06..8ebc538 100644
--- a/mina-core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java
+++ b/mina-core/src/main/java/org/apache/mina/core/service/SimpleIoProcessorPool.java
@@ -30,6 +30,7 @@ import java.util.concurrent.ThreadPoolExecutor;
import org.apache.mina.core.RuntimeIoException;
import org.apache.mina.core.session.AbstractIoSession;
import org.apache.mina.core.session.AttributeKey;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.write.WriteRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/service/TransportMetadata.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/service/TransportMetadata.java b/mina-core/src/main/java/org/apache/mina/core/service/TransportMetadata.java
index 9e1e480..58e958c 100644
--- a/mina-core/src/main/java/org/apache/mina/core/service/TransportMetadata.java
+++ b/mina-core/src/main/java/org/apache/mina/core/service/TransportMetadata.java
@@ -22,6 +22,7 @@ package org.apache.mina.core.service;
import java.net.SocketAddress;
import java.util.Set;
+import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.session.IoSessionConfig;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/session/DefaultIoSessionDataStructureFactory.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/session/DefaultIoSessionDataStructureFactory.java b/mina-core/src/main/java/org/apache/mina/core/session/DefaultIoSessionDataStructureFactory.java
index 895aa62..5c0b1c7 100644
--- a/mina-core/src/main/java/org/apache/mina/core/session/DefaultIoSessionDataStructureFactory.java
+++ b/mina-core/src/main/java/org/apache/mina/core/session/DefaultIoSessionDataStructureFactory.java
@@ -19,6 +19,7 @@
*/
package org.apache.mina.core.session;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Queue;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/session/DummySession.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/session/DummySession.java b/mina-core/src/main/java/org/apache/mina/core/session/DummySession.java
index a358881..c28e187 100644
--- a/mina-core/src/main/java/org/apache/mina/core/session/DummySession.java
+++ b/mina-core/src/main/java/org/apache/mina/core/session/DummySession.java
@@ -27,6 +27,7 @@ import java.util.concurrent.Executor;
import org.apache.mina.core.file.FileRegion;
import org.apache.mina.core.filterchain.DefaultIoFilterChain;
+import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.core.filterchain.IoFilterChain;
import org.apache.mina.core.service.AbstractIoAcceptor;
import org.apache.mina.core.service.DefaultTransportMetadata;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/session/IdleStatusChecker.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/session/IdleStatusChecker.java b/mina-core/src/main/java/org/apache/mina/core/session/IdleStatusChecker.java
index b5044bd..b921530 100644
--- a/mina-core/src/main/java/org/apache/mina/core/session/IdleStatusChecker.java
+++ b/mina-core/src/main/java/org/apache/mina/core/session/IdleStatusChecker.java
@@ -25,6 +25,7 @@ import java.util.Set;
import org.apache.mina.core.future.CloseFuture;
import org.apache.mina.core.future.IoFuture;
import org.apache.mina.core.future.IoFutureListener;
+import org.apache.mina.core.service.IoService;
import org.apache.mina.util.ConcurrentHashSet;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/session/IoSession.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/session/IoSession.java b/mina-core/src/main/java/org/apache/mina/core/session/IoSession.java
index c85544b..9ed094c 100644
--- a/mina-core/src/main/java/org/apache/mina/core/session/IoSession.java
+++ b/mina-core/src/main/java/org/apache/mina/core/session/IoSession.java
@@ -22,10 +22,13 @@ package org.apache.mina.core.session;
import java.net.SocketAddress;
import java.util.Set;
+import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.core.filterchain.IoFilterChain;
import org.apache.mina.core.future.CloseFuture;
import org.apache.mina.core.future.ReadFuture;
import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.service.IoAcceptor;
+import org.apache.mina.core.service.IoConnector;
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.service.IoService;
import org.apache.mina.core.service.TransportMetadata;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/session/IoSessionConfig.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/session/IoSessionConfig.java b/mina-core/src/main/java/org/apache/mina/core/session/IoSessionConfig.java
index 5608464..cc951b9 100644
--- a/mina-core/src/main/java/org/apache/mina/core/session/IoSessionConfig.java
+++ b/mina-core/src/main/java/org/apache/mina/core/session/IoSessionConfig.java
@@ -19,6 +19,8 @@
*/
package org.apache.mina.core.session;
+import java.util.concurrent.BlockingQueue;
+
/**
* The configuration of {@link IoSession}.
*
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/session/IoSessionDataStructureFactory.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/session/IoSessionDataStructureFactory.java b/mina-core/src/main/java/org/apache/mina/core/session/IoSessionDataStructureFactory.java
index e50eb6c..79c477f 100644
--- a/mina-core/src/main/java/org/apache/mina/core/session/IoSessionDataStructureFactory.java
+++ b/mina-core/src/main/java/org/apache/mina/core/session/IoSessionDataStructureFactory.java
@@ -19,6 +19,9 @@
*/
package org.apache.mina.core.session;
+import java.util.Comparator;
+
+import org.apache.mina.core.write.WriteRequest;
import org.apache.mina.core.write.WriteRequestQueue;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/session/IoSessionRecycler.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/session/IoSessionRecycler.java b/mina-core/src/main/java/org/apache/mina/core/session/IoSessionRecycler.java
index 546330e..f7c3b21 100644
--- a/mina-core/src/main/java/org/apache/mina/core/session/IoSessionRecycler.java
+++ b/mina-core/src/main/java/org/apache/mina/core/session/IoSessionRecycler.java
@@ -21,6 +21,8 @@ package org.apache.mina.core.session;
import java.net.SocketAddress;
+import org.apache.mina.core.service.IoService;
+
/**
* A connectionless transport can recycle existing sessions by assigning an
* {@link IoSessionRecycler} to an {@link IoService}.
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/write/WriteRequest.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/write/WriteRequest.java b/mina-core/src/main/java/org/apache/mina/core/write/WriteRequest.java
index c1b8ac7..9ee5c55 100644
--- a/mina-core/src/main/java/org/apache/mina/core/write/WriteRequest.java
+++ b/mina-core/src/main/java/org/apache/mina/core/write/WriteRequest.java
@@ -21,7 +21,9 @@ package org.apache.mina.core.write;
import java.net.SocketAddress;
+import org.apache.mina.core.filterchain.IoFilter;
import org.apache.mina.core.future.WriteFuture;
+import org.apache.mina.core.session.IoSession;
/**
* Represents write request fired by {@link IoSession#write(Object)}.
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/core/write/WriteTimeoutException.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/core/write/WriteTimeoutException.java b/mina-core/src/main/java/org/apache/mina/core/write/WriteTimeoutException.java
index 90ee1d0..0d592b6 100644
--- a/mina-core/src/main/java/org/apache/mina/core/write/WriteTimeoutException.java
+++ b/mina-core/src/main/java/org/apache/mina/core/write/WriteTimeoutException.java
@@ -21,6 +21,8 @@ package org.apache.mina.core.write;
import java.util.Collection;
+import org.apache.mina.core.session.IoSessionConfig;
+
/**
* An exception which is thrown when write buffer is not flushed for
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java b/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
index 7e72487..d4b0535 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolCodecFactory.java
@@ -69,6 +69,7 @@ public class DemuxingProtocolCodecFactory implements ProtocolCodecFactory {
/**
* Adds a new message encoder for a given message type
*
+ * @param <T> The message type
* @param messageType The message type
* @param encoder The associated encoder instance
*/
@@ -79,6 +80,7 @@ public class DemuxingProtocolCodecFactory implements ProtocolCodecFactory {
/**
* Adds a new message encoder for a given message type
*
+ * @param <T> The message type
* @param messageType The message type
* @param factory The associated encoder factory
*/
@@ -101,6 +103,7 @@ public class DemuxingProtocolCodecFactory implements ProtocolCodecFactory {
/**
* Adds a new message encoder for a list of message types
*
+ * @param <T> The message type
* @param messageTypes The messages types
* @param encoder The associated encoder instance
*/
@@ -113,6 +116,7 @@ public class DemuxingProtocolCodecFactory implements ProtocolCodecFactory {
/**
* Adds a new message encoder for a list of message types
*
+ * @param <T> The message type
* @param messageTypes The messages types
* @param factory The associated encoder factory
*/
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java b/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java
index a99f4d7..4e0ca3d 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/codec/demux/DemuxingProtocolEncoder.java
@@ -87,6 +87,7 @@ public class DemuxingProtocolEncoder implements ProtocolEncoder {
/**
* Add a new message encoder instance for a given message type
*
+ * @param <T> The message type
* @param messageType The message type
* @param encoder The encoder instance
*/
@@ -98,6 +99,7 @@ public class DemuxingProtocolEncoder implements ProtocolEncoder {
/**
* Add a new message encoder factory for a given message type
*
+ * @param <T> The message type
* @param messageType The message type
* @param factory The encoder factory
*/
@@ -136,6 +138,7 @@ public class DemuxingProtocolEncoder implements ProtocolEncoder {
/**
* Add a new message instance class for a list of message types
*
+ * @param <T> The message type
* @param messageTypes The message types
* @param encoder The encoder instance
*/
@@ -148,6 +151,7 @@ public class DemuxingProtocolEncoder implements ProtocolEncoder {
/**
* Add a new message encoder factory for a list of message types
*
+ * @param <T> The message type
* @param messageTypes The message types
* @param factory The encoder factory
*/
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/filter/executor/WriteRequestFilter.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/filter/executor/WriteRequestFilter.java b/mina-core/src/main/java/org/apache/mina/filter/executor/WriteRequestFilter.java
index baf93d6..2cf3ced 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/executor/WriteRequestFilter.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/executor/WriteRequestFilter.java
@@ -92,7 +92,7 @@ public class WriteRequestFilter extends IoFilterAdapter {
}
/**
- * @inheritedDoc
+ * {@inheritDoc}
*/
@Override
public void filterWrite(NextFilter nextFilter, IoSession session, WriteRequest writeRequest) throws Exception {
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java b/mina-core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
index a5141bf..45f7afc 100644
--- a/mina-core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
+++ b/mina-core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
@@ -236,7 +236,7 @@ public class MdcInjectionFilter extends CommonEventFilter {
/**
* Get the property associated with a given key
*
- * @param session The {@IoSession}
+ * @param session The {@link IoSession}
* @param key The key we are looking at
* @return The associated property
*/
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java b/mina-core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java
index 8b60d7d..ca54758 100644
--- a/mina-core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java
+++ b/mina-core/src/main/java/org/apache/mina/handler/chain/IoHandlerChain.java
@@ -297,20 +297,20 @@ public class IoHandlerChain implements IoHandlerCommand {
}
/**
- * Checks if the chain of {@IoHandlerCommand} contains a {@IoHandlerCommand} by its name
+ * Checks if the chain of {@link IoHandlerCommand} contains a {@link IoHandlerCommand} by its name
*
- * @param name The {@IoHandlerCommand} name
- * @return <tt>TRUE</tt> if the {@IoHandlerCommand} is found in the chain
+ * @param name The {@link IoHandlerCommand} name
+ * @return <tt>TRUE</tt> if the {@link IoHandlerCommand} is found in the chain
*/
public boolean contains(String name) {
return getEntry(name) != null;
}
/**
- * Checks if the chain of {@IoHandlerCommand} contains a specific {@IoHandlerCommand}
+ * Checks if the chain of {@link IoHandlerCommand} contains a specific {@link IoHandlerCommand}
*
- * @param command The {@IoHandlerCommand} we are looking for
- * @return <tt>TRUE</tt> if the {@IoHandlerCommand} is found in the chain
+ * @param command The {@link IoHandlerCommand} we are looking for
+ * @return <tt>TRUE</tt> if the {@link IoHandlerCommand} is found in the chain
*/
public boolean contains(IoHandlerCommand command) {
Entry e = head.nextEntry;
@@ -324,10 +324,10 @@ public class IoHandlerChain implements IoHandlerCommand {
}
/**
- * Checks if the chain of {@IoHandlerCommand} contains a specific {@IoHandlerCommand}
+ * Checks if the chain of {@link IoHandlerCommand} contains a specific {@link IoHandlerCommand}
*
- * @param commandType The type of {@IoHandlerCommand} we are looking for
- * @return <tt>TRUE</tt> if the {@IoHandlerCommand} is found in the chain
+ * @param commandType The type of {@link IoHandlerCommand} we are looking for
+ * @return <tt>TRUE</tt> if the {@link IoHandlerCommand} is found in the chain
*/
public boolean contains(Class<? extends IoHandlerCommand> commandType) {
Entry e = head.nextEntry;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java
index dcbf471..73f45c7 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramConnector.java
@@ -132,7 +132,6 @@ DatagramConnector {
}
/**
- @Override
* {@inheritDoc}
*/
@Override
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/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 4d20100..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
@@ -28,6 +28,7 @@ import org.apache.mina.core.filterchain.IoFilterChain;
import org.apache.mina.core.service.IoProcessor;
import org.apache.mina.core.service.IoService;
import org.apache.mina.core.session.AbstractIoSession;
+import org.apache.mina.core.session.IoSession;
/**
* An {@link IoSession} which is managed by the NIO transport.
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
----------------------------------------------------------------------
diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
index 6e661a8..947a2a8 100644
--- a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
+++ b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketAcceptor.java
@@ -33,7 +33,10 @@ import java.util.Iterator;
import java.util.concurrent.Executor;
import org.apache.mina.core.polling.AbstractPollingIoAcceptor;
+import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.service.IoService;
+import org.apache.mina.core.service.SimpleIoProcessorPool;
import org.apache.mina.core.service.TransportMetadata;
import org.apache.mina.transport.socket.DefaultSocketSessionConfig;
import org.apache.mina.transport.socket.SocketAcceptor;
@@ -270,7 +273,6 @@ implements SocketAcceptor {
*
* @return The number of keys having their ready-operation set updated
* @throws IOException If an I/O error occurs
- * @throws ClosedSelectorException If this selector is closed
*/
@Override
protected int select() throws Exception {
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/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 293e642..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
@@ -30,7 +30,10 @@ import java.util.Iterator;
import java.util.concurrent.Executor;
import org.apache.mina.core.polling.AbstractPollingIoConnector;
+import org.apache.mina.core.service.IoConnector;
import org.apache.mina.core.service.IoProcessor;
+import org.apache.mina.core.service.IoService;
+import org.apache.mina.core.service.SimpleIoProcessorPool;
import org.apache.mina.core.service.TransportMetadata;
import org.apache.mina.transport.socket.DefaultSocketSessionConfig;
import org.apache.mina.transport.socket.SocketConnector;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/State.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/State.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/State.java
index 3844f5b..0068b7a 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/State.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/State.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.mina.statemachine.event.Event;
import org.apache.mina.statemachine.transition.SelfTransition;
import org.apache.mina.statemachine.transition.Transition;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateControl.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateControl.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateControl.java
index 6e0a1a3..ea61eb1 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateControl.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateControl.java
@@ -19,6 +19,9 @@
*/
package org.apache.mina.statemachine;
+import org.apache.mina.statemachine.event.Event;
+import org.apache.mina.statemachine.transition.Transition;
+
/**
* Allows for programmatic control of a state machines execution.
* <p>
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateMachineFactory.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateMachineFactory.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateMachineFactory.java
index 611ffbf..0ee85c9 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateMachineFactory.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/StateMachineFactory.java
@@ -36,9 +36,11 @@ import org.apache.mina.statemachine.annotation.OnEntry;
import org.apache.mina.statemachine.annotation.OnExit;
import org.apache.mina.statemachine.annotation.Transition;
import org.apache.mina.statemachine.annotation.TransitionAnnotation;
+import org.apache.mina.statemachine.annotation.Transitions;
import org.apache.mina.statemachine.event.Event;
import org.apache.mina.statemachine.transition.MethodSelfTransition;
import org.apache.mina.statemachine.transition.MethodTransition;
+import org.apache.mina.statemachine.transition.SelfTransition;
/**
* Creates {@link StateMachine}s by reading {@link org.apache.mina.statemachine.annotation.State},
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransition.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransition.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransition.java
index d2907d5..a9eb85d 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransition.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransition.java
@@ -24,6 +24,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.statemachine.StateMachine;
import org.apache.mina.statemachine.event.IoFilterEvents;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransitions.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransitions.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransitions.java
index bba8e82..17e4439 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransitions.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoFilterTransitions.java
@@ -24,6 +24,9 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.statemachine.StateMachine;
+
/**
* Annotation used to annotate a method with several {@link IoFilterTransition}s.
* This should be used when creating {@link StateMachine}s for MINA's
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransition.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransition.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransition.java
index c1ffd21..e502bf0 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransition.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransition.java
@@ -24,6 +24,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.statemachine.StateMachine;
import org.apache.mina.statemachine.event.IoHandlerEvents;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransitions.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransitions.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransitions.java
index bed4f51..b2c0806 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransitions.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/IoHandlerTransitions.java
@@ -24,6 +24,9 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.statemachine.StateMachine;
+
/**
* Annotation used to annotate a method with several {@link IoHandlerTransition}s.
* This should be used when creating {@link StateMachine}s for MINA's
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/Transition.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/Transition.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/Transition.java
index f23d76d..8ccd6f3 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/Transition.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/Transition.java
@@ -24,6 +24,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.mina.statemachine.StateMachine;
import org.apache.mina.statemachine.event.Event;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/TransitionAnnotation.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/TransitionAnnotation.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/TransitionAnnotation.java
index 07fdb60..9d4ca0e 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/TransitionAnnotation.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/annotation/TransitionAnnotation.java
@@ -35,6 +35,10 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.ANNOTATION_TYPE)
public @interface TransitionAnnotation {
- /** The specific annotation class */
+ /**
+ * The specific annotation class
+ *
+ * @return The annotated class
+ **/
Class<? extends Annotation> value();
}
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/context/StateContext.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/context/StateContext.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/context/StateContext.java
index 483c5bd..49fa0dd 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/context/StateContext.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/context/StateContext.java
@@ -20,6 +20,7 @@
package org.apache.mina.statemachine.context;
import org.apache.mina.statemachine.State;
+import org.apache.mina.statemachine.StateMachine;
/**
* {@link StateContext} objects are used to store the current {@link State} and
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/EventArgumentsInterceptor.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/EventArgumentsInterceptor.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/EventArgumentsInterceptor.java
index 2b8ea9a..3aeb261 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/EventArgumentsInterceptor.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/EventArgumentsInterceptor.java
@@ -19,6 +19,8 @@
*/
package org.apache.mina.statemachine.event;
+import org.apache.mina.statemachine.StateMachine;
+
/**
* Intercepts the {@link Event} arguments before the {@link Event} is passed
* to the {@link StateMachine} and allows for the arguments to be modified.
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/EventFactory.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/EventFactory.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/EventFactory.java
index 30994b5..4557c3b 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/EventFactory.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/EventFactory.java
@@ -21,6 +21,7 @@ package org.apache.mina.statemachine.event;
import java.lang.reflect.Method;
+import org.apache.mina.statemachine.StateMachineProxyBuilder;
import org.apache.mina.statemachine.context.StateContext;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/IoFilterEvents.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/IoFilterEvents.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/IoFilterEvents.java
index 65faa52..8a41117 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/IoFilterEvents.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/IoFilterEvents.java
@@ -19,6 +19,9 @@
*/
package org.apache.mina.statemachine.event;
+import org.apache.mina.core.filterchain.IoFilter;
+import org.apache.mina.statemachine.annotation.IoFilterTransition;
+
/**
* Defines all possible MINA {@link IoFilter} events for use in {@link IoFilterTransition}
* annotations.
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/IoHandlerEvents.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/IoHandlerEvents.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/IoHandlerEvents.java
index 54ec50f..fa2d1af 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/IoHandlerEvents.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/event/IoHandlerEvents.java
@@ -19,6 +19,9 @@
*/
package org.apache.mina.statemachine.event;
+import org.apache.mina.core.service.IoHandler;
+import org.apache.mina.statemachine.annotation.IoHandlerTransition;
+
/**
* Defines all possible MINA {@link IoHandler} events for use in {@link IoHandlerTransition}
* annotations.
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/AbstractTransition.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/AbstractTransition.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/AbstractTransition.java
index 677560d..df1ae69 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/AbstractTransition.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/AbstractTransition.java
@@ -20,6 +20,7 @@
package org.apache.mina.statemachine.transition;
import org.apache.mina.statemachine.State;
+import org.apache.mina.statemachine.StateMachine;
import org.apache.mina.statemachine.event.Event;
/**
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodSelfTransition.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodSelfTransition.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodSelfTransition.java
index a761c59..cd7b77e 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodSelfTransition.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodSelfTransition.java
@@ -24,6 +24,7 @@ import java.lang.reflect.Method;
import java.util.Arrays;
import org.apache.mina.statemachine.State;
+import org.apache.mina.statemachine.StateMachine;
import org.apache.mina.statemachine.context.StateContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodTransition.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodTransition.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodTransition.java
index 064c57f..ae0597c 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodTransition.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/MethodTransition.java
@@ -24,6 +24,8 @@ import java.lang.reflect.Method;
import java.util.Arrays;
import org.apache.mina.statemachine.State;
+import org.apache.mina.statemachine.StateMachine;
+import org.apache.mina.statemachine.StateMachineFactory;
import org.apache.mina.statemachine.context.StateContext;
import org.apache.mina.statemachine.event.Event;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/mina/blob/f1efd2ae/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/Transition.java
----------------------------------------------------------------------
diff --git a/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/Transition.java b/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/Transition.java
index 3108714..c7f1abf 100644
--- a/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/Transition.java
+++ b/mina-statemachine/src/main/java/org/apache/mina/statemachine/transition/Transition.java
@@ -20,6 +20,7 @@
package org.apache.mina.statemachine.transition;
import org.apache.mina.statemachine.State;
+import org.apache.mina.statemachine.StateMachine;
import org.apache.mina.statemachine.event.Event;
/**