Author: trustin
Date: Sat Sep 29 13:03:47 2007
New Revision: 580633
URL: http://svn.apache.org/viewvc?rev=580633&view=rev
Log:
* Removed NextFilter.filter() and IoFilterChain.fire() because IoEvent and
IoFilterEvent already provides fire() operation.
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoEvent.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoFilter.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterEvent.java
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChain.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChain.java?rev=580633&r1=580632&r2=580633&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChain.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChain.java
Sat Sep 29 13:03:47 2007
@@ -271,37 +271,6 @@
}
}
- public void fire(IoEventType eventType, Object parameter) {
- switch (eventType) {
- case MESSAGE_RECEIVED:
- fireMessageReceived(parameter);
- break;
- case MESSAGE_SENT:
- fireMessageSent((WriteRequest) parameter);
- break;
- case WRITE:
- fireFilterWrite((WriteRequest) parameter);
- break;
- case CLOSE:
- fireFilterClose();
- break;
- case EXCEPTION_CAUGHT:
- fireExceptionCaught((Throwable) parameter);
- break;
- case SESSION_IDLE:
- fireSessionIdle((IdleStatus) parameter);
- break;
- case SESSION_OPENED:
- fireSessionOpened();
- break;
- case SESSION_CLOSED:
- fireSessionClosed();
- break;
- default:
- throw new IllegalArgumentException("Unknown event type: " +
eventType);
- }
- }
-
public void fireSessionCreated() {
Entry head = this.head;
callNextSessionCreated(head, session);
@@ -780,38 +749,6 @@
public void filterClose(IoSession session) {
Entry nextEntry = EntryImpl.this.prevEntry;
callPreviousFilterClose(nextEntry, session);
- }
-
- public void filter(IoEvent event) {
- Object data = event.getParameter();
- switch (event.getType()) {
- case MESSAGE_RECEIVED:
- messageReceived(session, data);
- break;
- case MESSAGE_SENT:
- messageSent(session, (WriteRequest) data);
- break;
- case WRITE:
- filterWrite(session, (WriteRequest) data);
- break;
- case CLOSE:
- filterClose(session);
- break;
- case EXCEPTION_CAUGHT:
- exceptionCaught(session, (Throwable) data);
- break;
- case SESSION_IDLE:
- sessionIdle(session, (IdleStatus) data);
- break;
- case SESSION_OPENED:
- sessionOpened(session);
- break;
- case SESSION_CLOSED:
- sessionClosed(session);
- break;
- default:
- throw new IllegalArgumentException("Unknown event
type: " + event.getType());
- }
}
};
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoEvent.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoEvent.java?rev=580633&r1=580632&r2=580633&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoEvent.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoEvent.java Sat Sep
29 13:03:47 2007
@@ -59,7 +59,34 @@
}
public void fire() {
- getSession().getFilterChain().fire(getType(), getParameter());
+ switch (getType()) {
+ case MESSAGE_RECEIVED:
+ getSession().getFilterChain().fireMessageReceived(getParameter());
+ break;
+ case MESSAGE_SENT:
+ getSession().getFilterChain().fireMessageSent((WriteRequest)
getParameter());
+ break;
+ case WRITE:
+ getSession().getFilterChain().fireFilterWrite((WriteRequest)
getParameter());
+ break;
+ case CLOSE:
+ getSession().getFilterChain().fireFilterClose();
+ break;
+ case EXCEPTION_CAUGHT:
+ getSession().getFilterChain().fireExceptionCaught((Throwable)
getParameter());
+ break;
+ case SESSION_IDLE:
+ getSession().getFilterChain().fireSessionIdle((IdleStatus)
getParameter());
+ break;
+ case SESSION_OPENED:
+ getSession().getFilterChain().fireSessionOpened();
+ break;
+ case SESSION_CLOSED:
+ getSession().getFilterChain().fireSessionClosed();
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown event type: " +
getType());
+ }
}
@Override
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoFilter.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoFilter.java?rev=580633&r1=580632&r2=580633&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoFilter.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoFilter.java Sat Sep
29 13:03:47 2007
@@ -251,10 +251,5 @@
* Forwards <tt>filterClose</tt> event to next filter.
*/
void filterClose(IoSession session);
-
- /**
- * Forwards the specified [EMAIL PROTECTED] IoEvent} to next filter.
- */
- void filter(IoEvent event);
}
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterChain.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterChain.java?rev=580633&r1=580632&r2=580633&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterChain.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterChain.java Sat
Sep 29 13:03:47 2007
@@ -176,15 +176,6 @@
void clear() throws Exception;
/**
- * Fires an [EMAIL PROTECTED] IoEvent} of the specified [EMAIL PROTECTED]
IoEventType}. Most users don't
- * need to call this method at all. Please use this methos only when you
implement a
- * new transport or fire a virtual event.
- *
- * @param parameter the data object associated with the event
- */
- public void fire(IoEventType eventType, Object parameter);
-
- /**
* Fires a [EMAIL PROTECTED] IoHandler#sessionCreated(IoSession)} event.
Most users don't need to
* call this method at all. Please use this method only when you
implement a new transport
* or fire a virtual event.
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterEvent.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterEvent.java?rev=580633&r1=580632&r2=580633&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterEvent.java
(original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoFilterEvent.java Sat
Sep 29 13:03:47 2007
@@ -49,6 +49,33 @@
@Override
public void fire() {
- getNextFilter().filter(this);
+ switch (getType()) {
+ case MESSAGE_RECEIVED:
+ getNextFilter().messageReceived(getSession(), getParameter());
+ break;
+ case MESSAGE_SENT:
+ getNextFilter().messageSent(getSession(), (WriteRequest)
getParameter());
+ break;
+ case WRITE:
+ getNextFilter().filterWrite(getSession(), (WriteRequest)
getParameter());
+ break;
+ case CLOSE:
+ getNextFilter().filterClose(getSession());
+ break;
+ case EXCEPTION_CAUGHT:
+ getNextFilter().exceptionCaught(getSession(), (Throwable)
getParameter());
+ break;
+ case SESSION_IDLE:
+ getNextFilter().sessionIdle(getSession(), (IdleStatus)
getParameter());
+ break;
+ case SESSION_OPENED:
+ getNextFilter().sessionOpened(getSession());
+ break;
+ case SESSION_CLOSED:
+ getNextFilter().sessionClosed(getSession());
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown event type: " +
getType());
+ }
}
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java?rev=580633&r1=580632&r2=580633&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
Sat Sep 29 13:03:47 2007
@@ -70,7 +70,7 @@
/* propagate event down the filter chain */
event.fire();
} finally {
- callDepth.set ( callDepth.get() - 1);
+ callDepth.set (callDepth.get() - 1);
if (callDepth.get() == 0) {
/* remove context from the MDC */
for (Object key : context.keySet()) {
Modified:
mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java?rev=580633&r1=580632&r2=580633&view=diff
==============================================================================
---
mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java
(original)
+++
mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java
Sat Sep 29 13:03:47 2007
@@ -68,7 +68,7 @@
}
public void testSimpleChain() throws IOException, InterruptedException {
- System.out.println("proc: " +
Runtime.getRuntime().availableProcessors());
+ System.out.println("proc: " +
Runtime.getRuntime().availableProcessors());
DefaultIoFilterChainBuilder chain = new DefaultIoFilterChainBuilder();
chain.addFirst("mdc-injector", new MdcInjectionFilter());
chain.addLast("dummy", new DummyIoFilter());
