You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2006/09/26 22:20:06 UTC

svn commit: r450177 - in /jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl: DefaultHttpClientConnection.java DefaultHttpServerConnection.java SocketHttpClientConnection.java SocketHttpServerConnection.java

Author: olegk
Date: Tue Sep 26 13:20:05 2006
New Revision: 450177

URL: http://svn.apache.org/viewvc?view=rev&rev=450177
Log:
Factored out SocketHttpClientConnection and SocketHttpServerConnection that can be used as base classes for HTTP connections that bind to a network socket

Added:
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java
      - copied, changed from r449757, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpClientConnection.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java
      - copied, changed from r449757, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpServerConnection.java
Modified:
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpClientConnection.java
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpServerConnection.java

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpClientConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpClientConnection.java?view=diff&rev=450177&r1=450176&r2=450177
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpClientConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpClientConnection.java Tue Sep 26 13:20:05 2006
@@ -33,13 +33,6 @@
 import java.net.Socket;
 
 import org.apache.http.HttpHost;
-import org.apache.http.impl.entity.DefaultEntityDeserializer;
-import org.apache.http.impl.entity.DefaultEntitySerializer;
-import org.apache.http.impl.io.SocketHttpDataReceiver;
-import org.apache.http.impl.io.SocketHttpDataTransmitter;
-import org.apache.http.io.HttpDataReceiver;
-import org.apache.http.io.HttpDataTransmitter;
-import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
 
 /**
@@ -51,101 +44,17 @@
  * 
  * @since 4.0
  */
-public class DefaultHttpClientConnection extends AbstractHttpClientConnection {
+public class DefaultHttpClientConnection extends SocketHttpClientConnection {
 
-    private HttpHost targethost = null;
-
-    protected volatile boolean open;
-    protected Socket socket = null;
-    
     public DefaultHttpClientConnection() {
         super();
     }
     
-    protected void assertNotOpen() {
-        if (this.open) {
-            throw new IllegalStateException("Connection is already open");
-        }
-    }
-    
-    protected void assertOpen() {
-        if (!this.open) {
-            throw new IllegalStateException("Connection is not open");
-        }
-    }
-
     public void bind(
             final Socket socket, 
             final HttpHost targethost, 
             final HttpParams params) throws IOException {
-        if (socket == null) {
-            throw new IllegalArgumentException("Socket may not be null");
-        }
-        if (targethost == null) {
-            throw new IllegalArgumentException("Target host may not be null");
-        }
-        if (params == null) {
-            throw new IllegalArgumentException("HTTP parameters may not be null");
-        }
-        assertNotOpen();
-        
-        socket.setTcpNoDelay(HttpConnectionParams.getTcpNoDelay(params));
-        socket.setSoTimeout(HttpConnectionParams.getSoTimeout(params));
-        
-        int linger = HttpConnectionParams.getLinger(params);
-        if (linger >= 0) {
-            socket.setSoLinger(linger > 0, linger);
-        }
-
-        this.socket = socket;
-        this.targethost = targethost;
-        
-        int buffersize = HttpConnectionParams.getSocketBufferSize(params);
-        HttpDataTransmitter transmitter = new SocketHttpDataTransmitter(socket, buffersize);
-        HttpDataReceiver receiver = new SocketHttpDataReceiver(socket, buffersize);
-        transmitter.reset(params);
-        receiver.reset(params);
-        
-        setHttpDataReceiver(receiver);
-        setHttpDataTransmitter(transmitter);
-        setMaxHeaderCount(params.getIntParameter(HttpConnectionParams.MAX_HEADER_COUNT, -1));
-        setResponseFactory(new DefaultHttpResponseFactory());
-        setEntitySerializer(new DefaultEntitySerializer());
-        setEntityDeserializer(new DefaultEntityDeserializer());
-        this.open = true;
+        super.bind(socket, targethost, params);
     }
 
-    public HttpHost getTargetHost() {
-        return this.targethost;
-    }
-    
-    public boolean isOpen() {
-        return this.open;
-    }
-
-    public void shutdown() throws IOException {
-        this.open = false;
-        Socket tmpsocket = this.socket;
-        if (tmpsocket != null) {
-            tmpsocket.close();
-        }
-    }
-    
-    public void close() throws IOException {
-        if (!this.open) {
-            return;
-        }
-        this.open = false;
-        doFlush();
-        try {
-            this.socket.shutdownOutput();
-        } catch (IOException ignore) {
-        }
-        try {
-            this.socket.shutdownInput();
-        } catch (IOException ignore) {
-        }
-        this.socket.close();
-    }
-    
 }

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpServerConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpServerConnection.java?view=diff&rev=450177&r1=450176&r2=450177
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpServerConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpServerConnection.java Tue Sep 26 13:20:05 2006
@@ -32,18 +32,10 @@
 import java.io.IOException;
 import java.net.Socket;
 
-import org.apache.http.impl.entity.DefaultEntityDeserializer;
-import org.apache.http.impl.entity.DefaultEntitySerializer;
-import org.apache.http.impl.io.SocketHttpDataReceiver;
-import org.apache.http.impl.io.SocketHttpDataTransmitter;
-import org.apache.http.io.HttpDataReceiver;
-import org.apache.http.io.HttpDataTransmitter;
-import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
 
 /**
- * Default implementation of a server-side HTTP connection that be bound to a 
- * network Socket in order to receive and transmit data.
+ * Default implementation of a server-side HTTP connection.
  *
  * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
  *
@@ -51,88 +43,14 @@
  * 
  * @since 4.0
  */
-public class DefaultHttpServerConnection extends AbstractHttpServerConnection {
+public class DefaultHttpServerConnection extends SocketHttpServerConnection {
 
-    protected volatile boolean open;
-    protected Socket socket = null;
-    
     public DefaultHttpServerConnection() {
         super();
     }
-
-    protected void assertNotOpen() {
-        if (this.open) {
-            throw new IllegalStateException("Connection is already open");
-        }
-    }
     
-    protected void assertOpen() {
-        if (!this.open) {
-            throw new IllegalStateException("Connection is not open");
-        }
-    }
-
     public void bind(final Socket socket, final HttpParams params) throws IOException {
-        if (socket == null) {
-            throw new IllegalArgumentException("Socket may not be null");
-        }
-        if (params == null) {
-            throw new IllegalArgumentException("HTTP parameters may not be null");
-        }
-        assertNotOpen();
-
-        socket.setTcpNoDelay(HttpConnectionParams.getTcpNoDelay(params));
-        socket.setSoTimeout(HttpConnectionParams.getSoTimeout(params));
-        
-        int linger = HttpConnectionParams.getLinger(params);
-        if (linger >= 0) {
-            socket.setSoLinger(linger > 0, linger);
-        }
-
-        this.socket = socket;
-        
-        int buffersize = HttpConnectionParams.getSocketBufferSize(params);
-        HttpDataTransmitter transmitter = new SocketHttpDataTransmitter(socket, buffersize);
-        HttpDataReceiver receiver = new SocketHttpDataReceiver(socket, buffersize);
-        transmitter.reset(params);
-        receiver.reset(params);
-        
-        setHttpDataReceiver(receiver);
-        setHttpDataTransmitter(transmitter);
-        setMaxHeaderCount(params.getIntParameter(HttpConnectionParams.MAX_HEADER_COUNT, -1));
-        setRequestFactory(new DefaultHttpRequestFactory());
-        setEntitySerializer(new DefaultEntitySerializer());
-        setEntityDeserializer(new DefaultEntityDeserializer());
-        this.open = true;
-    }
-
-    public boolean isOpen() {
-        return this.open;
-    }
-
-    public void shutdown() throws IOException {
-        this.open = false;
-        Socket tmpsocket = this.socket;
-        if (tmpsocket != null) {
-            tmpsocket.close();
-        }
-    }
-    
-    public void close() throws IOException {
-        if (!this.open) {
-            return;
-        }
-        this.open = false;
-        doFlush();
-        try {
-            this.socket.shutdownOutput();
-        } catch (IOException ignore) {
-        }
-        try {
-            this.socket.shutdownInput();
-        } catch (IOException ignore) {
-        }
-        this.socket.close();
+        super.bind(socket, params);
     }
     
 }

Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java (from r449757, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpClientConnection.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java?view=diff&rev=450177&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpClientConnection.java&r1=449757&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java&r2=450177
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpClientConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java Tue Sep 26 13:20:05 2006
@@ -43,7 +43,8 @@
 import org.apache.http.params.HttpParams;
 
 /**
- * Default implementation of a client-side HTTP connection.
+ * Implementation of a client-side HTTP connection that can be bound to a 
+ * network Socket in order to receive and transmit data.
  *
  * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
  *
@@ -51,14 +52,14 @@
  * 
  * @since 4.0
  */
-public class DefaultHttpClientConnection extends AbstractHttpClientConnection {
+public class SocketHttpClientConnection extends AbstractHttpClientConnection {
 
     private HttpHost targethost = null;
 
     protected volatile boolean open;
     protected Socket socket = null;
     
-    public DefaultHttpClientConnection() {
+    public SocketHttpClientConnection() {
         super();
     }
     
@@ -74,7 +75,7 @@
         }
     }
 
-    public void bind(
+    protected void bind(
             final Socket socket, 
             final HttpHost targethost, 
             final HttpParams params) throws IOException {

Copied: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java (from r449757, jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpServerConnection.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java?view=diff&rev=450177&p1=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpServerConnection.java&r1=449757&p2=jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java&r2=450177
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/DefaultHttpServerConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java Tue Sep 26 13:20:05 2006
@@ -42,7 +42,7 @@
 import org.apache.http.params.HttpParams;
 
 /**
- * Default implementation of a server-side HTTP connection that be bound to a 
+ * Implementation of a server-side HTTP connection that can be bound to a 
  * network Socket in order to receive and transmit data.
  *
  * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
@@ -51,12 +51,12 @@
  * 
  * @since 4.0
  */
-public class DefaultHttpServerConnection extends AbstractHttpServerConnection {
+public class SocketHttpServerConnection extends AbstractHttpServerConnection {
 
     protected volatile boolean open;
     protected Socket socket = null;
     
-    public DefaultHttpServerConnection() {
+    public SocketHttpServerConnection() {
         super();
     }
 
@@ -72,7 +72,7 @@
         }
     }
 
-    public void bind(final Socket socket, final HttpParams params) throws IOException {
+    protected void bind(final Socket socket, final HttpParams params) throws IOException {
         if (socket == null) {
             throw new IllegalArgumentException("Socket may not be null");
         }