Author: trustin
Date: Thu Dec 6 21:06:18 2007
New Revision: 601996
URL: http://svn.apache.org/viewvc?rev=601996&view=rev
Log:
* Renamed ConsumeToDisconnectionDecodingState to
ConsumeToEndOfSessionDecodingState
* Renamed StateMachineProtocolDecoder into DecodingStateProtocolDecoder
** DecodingStateProtocolDecoder now works with DecodingState instead of
DecodingStateMachine, which is more flexible.
Added:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToEndOfSessionDecodingState.java
- copied, changed from r601994,
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDisconnectionDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateProtocolDecoder.java
- copied, changed from r601994,
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java
Removed:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDisconnectionDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java
Modified:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestDecoder.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecodingState.java
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToEndOfSessionDecodingState.java
(from r601994,
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDisconnectionDecodingState.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToEndOfSessionDecodingState.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToEndOfSessionDecodingState.java&p1=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDisconnectionDecodingState.java&r1=601994&r2=601996&rev=601996&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDisconnectionDecodingState.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToEndOfSessionDecodingState.java
Thu Dec 6 21:06:18 2007
@@ -32,12 +32,12 @@
* @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
-public abstract class ConsumeToDisconnectionDecodingState implements
DecodingState {
+public abstract class ConsumeToEndOfSessionDecodingState implements
DecodingState {
private IoBuffer buffer;
private final int maxLength;
- public ConsumeToDisconnectionDecodingState(int maxLength) {
+ public ConsumeToEndOfSessionDecodingState(int maxLength) {
this.maxLength = maxLength;
}
Copied:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateProtocolDecoder.java
(from r601994,
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java)
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateProtocolDecoder.java?p2=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateProtocolDecoder.java&p1=mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java&r1=601994&r2=601996&rev=601996&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateProtocolDecoder.java
Thu Dec 6 21:06:18 2007
@@ -29,31 +29,24 @@
* @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
-public class StateMachineProtocolDecoder implements ProtocolDecoder {
- private final DecodingStateMachine stateMachine;
+public class DecodingStateProtocolDecoder implements ProtocolDecoder {
+ private final DecodingState state;
- public StateMachineProtocolDecoder(DecodingStateMachine stateMachine) {
+ public DecodingStateProtocolDecoder(DecodingState stateMachine) {
if (stateMachine == null) {
throw new NullPointerException("stateMachine");
}
- this.stateMachine = stateMachine;
+ this.state = stateMachine;
}
- /**
- * Returns the [EMAIL PROTECTED] DecodingStateMachine} employed by this
decoder.
- */
- protected DecodingStateMachine getStateMachine() {
- return stateMachine;
- }
-
public void decode(IoSession session, IoBuffer in, ProtocolDecoderOutput
out)
throws Exception {
- stateMachine.decode(in, out);
+ state.decode(in, out);
}
public void finishDecode(IoSession session, ProtocolDecoderOutput out)
throws Exception {
- stateMachine.finishDecode(out);
+ state.finishDecode(out);
}
public void dispose(IoSession session) throws Exception {}
Modified:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestDecoder.java
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestDecoder.java?rev=601996&r1=601995&r2=601996&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestDecoder.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestDecoder.java
Thu Dec 6 21:06:18 2007
@@ -23,13 +23,13 @@
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.statemachine.DecodingState;
-import org.apache.mina.filter.codec.statemachine.StateMachineProtocolDecoder;
+import org.apache.mina.filter.codec.statemachine.DecodingStateProtocolDecoder;
/**
* @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
-public class HttpRequestDecoder extends StateMachineProtocolDecoder {
+public class HttpRequestDecoder extends DecodingStateProtocolDecoder {
public HttpRequestDecoder() {
super(new HttpRequestDecodingState() {
@Override
Modified:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java?rev=601996&r1=601995&r2=601996&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java
Thu Dec 6 21:06:18 2007
@@ -23,13 +23,13 @@
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.statemachine.DecodingState;
-import org.apache.mina.filter.codec.statemachine.StateMachineProtocolDecoder;
+import org.apache.mina.filter.codec.statemachine.DecodingStateProtocolDecoder;
/**
* @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
-public class HttpResponseDecoder extends StateMachineProtocolDecoder {
+public class HttpResponseDecoder extends DecodingStateProtocolDecoder {
public HttpResponseDecoder() {
super(new HttpResponseDecodingState() {
@Override
Modified:
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecodingState.java
URL:
http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecodingState.java?rev=601996&r1=601995&r2=601996&view=diff
==============================================================================
---
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecodingState.java
(original)
+++
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecodingState.java
Thu Dec 6 21:06:18 2007
@@ -25,7 +25,7 @@
import org.apache.mina.common.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-import
org.apache.mina.filter.codec.statemachine.ConsumeToDisconnectionDecodingState;
+import
org.apache.mina.filter.codec.statemachine.ConsumeToEndOfSessionDecodingState;
import org.apache.mina.filter.codec.statemachine.CrLfDecodingState;
import org.apache.mina.filter.codec.statemachine.DecodingState;
import org.apache.mina.filter.codec.statemachine.DecodingStateMachine;
@@ -218,7 +218,7 @@
"request with unspecified length.");
}
// FIXME hard-coded max length.
- nextState = new
ConsumeToDisconnectionDecodingState(1048576) {
+ nextState = new
ConsumeToEndOfSessionDecodingState(1048576) {
@Override
protected DecodingState finishDecode(IoBuffer readData,
ProtocolDecoderOutput out) throws Exception {
