Author: jvermillard
Date: Fri Aug 26 12:17:24 2011
New Revision: 1162077
URL: http://svn.apache.org/viewvc?rev=1162077&view=rev
Log:
IoFilterController as new name for IoFilterChain since the chain is now an
fixed array
Added:
mina/trunk/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterController.java
(contents, props changed)
- copied, changed from r1162074,
mina/trunk/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterProcessor.java
mina/trunk/core/src/main/java/org/apache/mina/filterchain/IoFilterController.java
(contents, props changed)
- copied, changed from r1162074,
mina/trunk/core/src/main/java/org/apache/mina/filterchain/IoFilterProcessor.java
Removed:
mina/trunk/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterProcessor.java
mina/trunk/core/src/main/java/org/apache/mina/filterchain/IoFilterProcessor.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java
mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java?rev=1162077&r1=1162076&r2=1162077&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/api/IoSession.java Fri Aug 26
12:17:24 2011
@@ -23,7 +23,7 @@ import java.net.SocketAddress;
import java.util.Queue;
import java.util.Set;
-import org.apache.mina.filterchain.IoFilterProcessor;
+import org.apache.mina.filterchain.IoFilterController;
import org.apache.mina.service.SelectorProcessor;
import org.apache.mina.session.WriteRequest;
@@ -285,7 +285,7 @@ public interface IoSession {
public IoFuture<Void> writeWithFuture(Object message);
/**
- * Internal method for enqueue write request after {@link
IoFilterProcessor} processing
+ * Internal method for enqueue write request after {@link
IoFilterController} processing
* @param message
*/
public void enqueueWriteRequest(Object message);
@@ -300,5 +300,5 @@ public interface IoSession {
* Get the filter chain in charge of filtering events generated by this
session.
* @return the filter chain for this session
*/
- public IoFilterProcessor getFilterChain();
+ public IoFilterController getFilterChain();
}
\ No newline at end of file
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterController.java
(from r1162074,
mina/trunk/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterProcessor.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterController.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterController.java&p1=mina/trunk/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterProcessor.java&r1=1162074&r2=1162077&rev=1162077&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterProcessor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterController.java
Fri Aug 26 12:17:24 2011
@@ -25,10 +25,10 @@ import org.apache.mina.api.IoSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class DefaultIoFilterProcessor implements IoFilterProcessor,
ReadFilterChainController,
+public class DefaultIoFilterController implements IoFilterController,
ReadFilterChainController,
WriteFilterChainController {
- private static final Logger LOG =
LoggerFactory.getLogger(DefaultIoFilterProcessor.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(DefaultIoFilterController.class);
/**
* The list of {@link IoFilter} implementing this chain.
@@ -36,9 +36,9 @@ public class DefaultIoFilterProcessor im
private final IoFilter[] chain;
/**
- * The instance of {@link DefaultIoFilterProcessor} with the {@link
IoService} chain.
+ * The instance of {@link DefaultIoFilterController} with the {@link
IoService} chain.
*/
- public DefaultIoFilterProcessor(IoFilter[] chain) {
+ public DefaultIoFilterController(IoFilter[] chain) {
this.chain = chain;
}
Propchange:
mina/trunk/core/src/main/java/org/apache/mina/filterchain/DefaultIoFilterController.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filterchain/IoFilterController.java
(from r1162074,
mina/trunk/core/src/main/java/org/apache/mina/filterchain/IoFilterProcessor.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filterchain/IoFilterController.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filterchain/IoFilterController.java&p1=mina/trunk/core/src/main/java/org/apache/mina/filterchain/IoFilterProcessor.java&r1=1162074&r2=1162077&rev=1162077&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filterchain/IoFilterProcessor.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filterchain/IoFilterController.java
Fri Aug 26 12:17:24 2011
@@ -29,7 +29,7 @@ import org.apache.mina.api.IoSession;
*
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
-public interface IoFilterProcessor {
+public interface IoFilterController {
/**
* Call this method for processing a session created event using this
chain.
Propchange:
mina/trunk/core/src/main/java/org/apache/mina/filterchain/IoFilterController.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
mina/trunk/core/src/main/java/org/apache/mina/filterchain/IoFilterController.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java?rev=1162077&r1=1162076&r2=1162077&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/session/AbstractIoSession.java
Fri Aug 26 12:17:24 2011
@@ -29,8 +29,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.mina.api.IoFuture;
import org.apache.mina.api.IoService;
import org.apache.mina.api.IoSession;
-import org.apache.mina.filterchain.DefaultIoFilterProcessor;
-import org.apache.mina.filterchain.IoFilterProcessor;
+import org.apache.mina.filterchain.DefaultIoFilterController;
+import org.apache.mina.filterchain.IoFilterController;
import org.apache.mina.service.SelectorProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -85,7 +85,7 @@ public abstract class AbstractIoSession
/** the queue of pending writes for the session, to be dequeued by the
{@link SelectorProcessor} */
private Queue<WriteRequest> writeQueue = new DefaultWriteQueue();
- private IoFilterProcessor filterProcessor;
+ private IoFilterController filterProcessor;
/**
* Create an {@link org.apache.mina.api.IoSession} with a unique
identifier (
@@ -100,7 +100,7 @@ public abstract class AbstractIoSession
creationTime = System.currentTimeMillis();
this.service = service;
this.writeProcessor = writeProcessor;
- this.filterProcessor = new
DefaultIoFilterProcessor(service.getFilters());
+ this.filterProcessor = new
DefaultIoFilterController(service.getFilters());
LOG.debug("Created new session with id : {}", id);
synchronized (stateMonitor) {
@@ -257,7 +257,7 @@ public abstract class AbstractIoSession
}
@Override
- public IoFilterProcessor getFilterChain() {
+ public IoFilterController getFilterChain() {
return filterProcessor;
}
}
\ No newline at end of file
