You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2009/06/01 21:16:50 UTC
svn commit: r780791 -
/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/
Author: veithen
Date: Mon Jun 1 19:16:49 2009
New Revision: 780791
URL: http://svn.apache.org/viewvc?rev=780791&view=rev
Log:
Allow classes to implement both HttpRequestHandler and HttpResponseHandler.
Added:
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestResponseHandler.java (with props)
Removed:
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HeaderHandler.java
Modified:
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestHandler.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpResponseHandler.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpFilter.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestFilter.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestHandler.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseFilter.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseHandler.java
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestHandler.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestHandler.java?rev=780791&r1=780790&r2=780791&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestHandler.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestHandler.java Mon Jun 1 19:16:49 2009
@@ -24,7 +24,7 @@
return requestLine;
}
- public void handleHeaders(Headers headers) {
+ public void processRequestHeaders(Headers headers) {
}
public void requestCompleted() {
Added: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestResponseHandler.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestResponseHandler.java?rev=780791&view=auto
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestResponseHandler.java (added)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestResponseHandler.java Mon Jun 1 19:16:49 2009
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ws.commons.tcpmon.core.filter.http;
+
+/**
+ * Abstract implementation of {@link HttpRequestHandler} and {@link HttpResponseHandler}
+ * with default behavior.
+ */
+public abstract class AbstractHttpRequestResponseHandler implements HttpRequestHandler {
+ public String processRequestLine(String requestLine) {
+ return requestLine;
+ }
+
+ public void processRequestHeaders(Headers headers) {
+ }
+
+ public void requestCompleted() {
+ }
+
+ public String processResponseLine(String responseLine) {
+ return responseLine;
+ }
+
+ public void processResponseHeaders(Headers headers) {
+ }
+
+ public void responseCompleted() {
+ }
+}
Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpRequestResponseHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpResponseHandler.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpResponseHandler.java?rev=780791&r1=780790&r2=780791&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpResponseHandler.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/AbstractHttpResponseHandler.java Mon Jun 1 19:16:49 2009
@@ -19,12 +19,12 @@
/**
* Abstract implementation of {@link HttpResponseHandler} with default behavior.
*/
-public class AbstractHttpResponseHandler implements HttpResponseHandler {
+public abstract class AbstractHttpResponseHandler implements HttpResponseHandler {
public String processResponseLine(String responseLine) {
return responseLine;
}
- public void handleHeaders(Headers headers) {
+ public void processResponseHeaders(Headers headers) {
}
public void responseCompleted() {
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpFilter.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpFilter.java?rev=780791&r1=780790&r2=780791&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpFilter.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpFilter.java Mon Jun 1 19:16:49 2009
@@ -17,8 +17,6 @@
package org.apache.ws.commons.tcpmon.core.filter.http;
import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
import org.apache.ws.commons.tcpmon.core.filter.HeaderParser;
import org.apache.ws.commons.tcpmon.core.filter.ReadOnlyFilterWrapper;
@@ -37,7 +35,6 @@
private static final int STATE_COMPLETE = 3;
private final boolean decodeTransferEncoding;
- protected final List handlers = new LinkedList();
private int state = STATE_FIRST_LINE;
private final Headers headers = new Headers();
private ContentFilterFactory contentFilterFactory;
@@ -97,6 +94,7 @@
}
protected abstract String processFirstLine(String firstList);
+ protected abstract void processHeaders(Headers headers);
protected abstract void completed();
private void processHeaders(HeaderParser headerParser, Stream stream) {
@@ -125,9 +123,7 @@
}
}
- for (Iterator it = handlers.iterator(); it.hasNext(); ) {
- ((HeaderHandler)it.next()).handleHeaders(headers);
- }
+ processHeaders(headers);
if (discardHeaders && contentFilterChain != null) {
headerParser.discard();
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestFilter.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestFilter.java?rev=780791&r1=780790&r2=780791&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestFilter.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestFilter.java Mon Jun 1 19:16:49 2009
@@ -17,12 +17,16 @@
package org.apache.ws.commons.tcpmon.core.filter.http;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
/**
* Filter that parses HTTP requests and invokes a set of {@link HTTPRequestHandler}
* implementations.
*/
public class HttpRequestFilter extends HttpFilter {
+ private final List/*<HttpRequestHandler>*/ handlers = new LinkedList();
+
public HttpRequestFilter(boolean decodeTransferEncoding) {
super(decodeTransferEncoding);
}
@@ -38,6 +42,12 @@
return firstLine;
}
+ protected void processHeaders(Headers headers) {
+ for (Iterator it = handlers.iterator(); it.hasNext(); ) {
+ ((HttpRequestHandler)it.next()).processRequestHeaders(headers);
+ }
+ }
+
protected void completed() {
for (Iterator it = handlers.iterator(); it.hasNext(); ) {
((HttpRequestHandler)it.next()).requestCompleted();
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestHandler.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestHandler.java?rev=780791&r1=780790&r2=780791&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestHandler.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpRequestHandler.java Mon Jun 1 19:16:49 2009
@@ -16,11 +16,11 @@
package org.apache.ws.commons.tcpmon.core.filter.http;
-
/**
* Interface implemented by handlers invoked by {@link HttpRequestFilter}.
*/
-public interface HttpRequestHandler extends HeaderHandler {
+public interface HttpRequestHandler {
String processRequestLine(String requestLine);
+ void processRequestHeaders(Headers headers);
void requestCompleted();
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseFilter.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseFilter.java?rev=780791&r1=780790&r2=780791&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseFilter.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseFilter.java Mon Jun 1 19:16:49 2009
@@ -17,12 +17,16 @@
package org.apache.ws.commons.tcpmon.core.filter.http;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
/**
* Filter that parses HTTP responses and invokes a set of {@link HTTPResponseHandler}
* implementations.
*/
public class HttpResponseFilter extends HttpFilter {
+ private final List/*<HttpResponseHandler>*/ handlers = new LinkedList();
+
public HttpResponseFilter(boolean decodeTransferEncoding) {
super(decodeTransferEncoding);
}
@@ -38,6 +42,12 @@
return firstLine;
}
+ protected void processHeaders(Headers headers) {
+ for (Iterator it = handlers.iterator(); it.hasNext(); ) {
+ ((HttpResponseHandler)it.next()).processResponseHeaders(headers);
+ }
+ }
+
protected void completed() {
for (Iterator it = handlers.iterator(); it.hasNext(); ) {
((HttpResponseHandler)it.next()).responseCompleted();
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseHandler.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseHandler.java?rev=780791&r1=780790&r2=780791&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseHandler.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/filter/http/HttpResponseHandler.java Mon Jun 1 19:16:49 2009
@@ -16,11 +16,11 @@
package org.apache.ws.commons.tcpmon.core.filter.http;
-
/**
* Interface implemented by handlers invoked by {@link HttpResponseFilter}.
*/
-public interface HttpResponseHandler extends HeaderHandler {
+public interface HttpResponseHandler {
String processResponseLine(String responseLine);
+ void processResponseHeaders(Headers headers);
void responseCompleted();
}