src/org/redkale/net/AsyncConnection.java

@@ -5,7 +5,7 @@
  */
 package org.redkale.net;
 
-import java.io.IOException;
+import java.io.*;
 import java.net.*;
 import java.nio.*;
 import java.nio.channels.*;
@@ -23,7 +23,7 @@ import org.redkale.util.*;
  *
  * @author zhangjx
  */
-public abstract class AsyncConnection implements ReadableByteChannel, WritableByteChannel, AutoCloseable {
+public abstract class AsyncConnection implements AutoCloseable {
 
     protected SSLContext sslContext;
 
@@ -88,7 +88,6 @@ public abstract class AsyncConnection implements ReadableByteChannel, WritableBy
         return eventing.decrementAndGet();
     }
 
-    @Override
     public abstract boolean isOpen();
 
     public abstract boolean isTCP();
@@ -113,13 +112,11 @@ public abstract class AsyncConnection implements ReadableByteChannel, WritableBy
 
     public abstract void setWriteTimeoutSeconds(int writeTimeoutSeconds);
 
-    @Override
-    public abstract int read(ByteBuffer dst) throws IOException;
+    public abstract InputStream newInputStream();
 
     public abstract void read(CompletionHandler<Integer, ByteBuffer> handler);
 
-    @Override
-    public abstract int write(ByteBuffer src) throws IOException;
+    public abstract OutputStream newOutputStream();
 
     public abstract <A> void write(ByteBuffer src, A attachment, CompletionHandler<Integer, ? super A> handler);
 

src/org/redkale/net/TcpAioAsyncConnection.java

@@ -5,7 +5,7 @@
  */
 package org.redkale.net;
 
-import java.io.IOException;
+import java.io.*;
 import java.net.*;
 import java.nio.ByteBuffer;
 import java.nio.channels.*;
@@ -25,7 +25,6 @@ import javax.net.ssl.SSLContext;
 public class TcpAioAsyncConnection extends AsyncConnection {
 
     //private final Semaphore semaphore = new Semaphore(1);
-
     private int readTimeoutSeconds;
 
     private int writeTimeoutSeconds;
@@ -132,7 +131,6 @@ public class TcpAioAsyncConnection extends AsyncConnection {
 //            semaphore.release();
 //        }
 //    }
-
     @Override
     public <A> void write(ByteBuffer src, A attachment, CompletionHandler<Integer, ? super A> handler) {
         write(true, src, attachment, handler);
@@ -232,21 +230,13 @@ public class TcpAioAsyncConnection extends AsyncConnection {
     }
 
     @Override
-    public final int read(ByteBuffer dst) throws IOException {
-        try {
-            return channel.read(dst).get();
-        } catch (InterruptedException | ExecutionException e) {
-            throw new IOException(e);
-        }
+    public final InputStream newInputStream() {
+        return Channels.newInputStream(this.channel);
     }
 
     @Override
-    public final int write(ByteBuffer src) throws IOException {
-        try {
-            return channel.write(src).get();
-        } catch (InterruptedException | ExecutionException e) {
-            throw new IOException(e);
-        }
+    public final OutputStream newOutputStream() {
+        return Channels.newOutputStream(this.channel);
     }
 
     @Override
@@ -318,13 +308,13 @@ public class TcpAioAsyncConnection extends AsyncConnection {
                     return;
                 }
 //                try {
-                    writeHandler.completed(writeCount, attachment);
+                writeHandler.completed(writeCount, attachment);
 //                } finally {
 //                    nextWrite(null, attachment);
 //                }
             } else {
 //                try {
-                    writeHandler.completed(result.intValue(), attachment);
+                writeHandler.completed(result.intValue(), attachment);
 //                } finally {
 //                    nextWrite(null, attachment);
 //                }
@@ -334,7 +324,7 @@ public class TcpAioAsyncConnection extends AsyncConnection {
         @Override
         public void failed(Throwable exc, A attachment) {
 //            try {
-                writeHandler.failed(exc, attachment);
+            writeHandler.failed(exc, attachment);
 //            } finally {
 //                nextWrite(exc, attachment);
 //            }
@@ -365,7 +355,7 @@ public class TcpAioAsyncConnection extends AsyncConnection {
                 return;
             }
 //            try {
-                writeHandler.completed(result, attachment);
+            writeHandler.completed(result, attachment);
 //            } finally {
 //                nextWrite(null, attachment);
 //            }
@@ -375,7 +365,7 @@ public class TcpAioAsyncConnection extends AsyncConnection {
         @Override
         public void failed(Throwable exc, A attachment) {
 //            try {
-                writeHandler.failed(exc, attachment);
+            writeHandler.failed(exc, attachment);
 //            } finally {
 //                nextWrite(exc, attachment);
 //            }

src/org/redkale/net/UdpBioAsyncConnection.java

@@ -5,7 +5,7 @@
  */
 package org.redkale.net;
 
-import java.io.IOException;
+import java.io.*;
 import java.net.*;
 import java.nio.ByteBuffer;
 import java.nio.channels.*;
@@ -142,10 +142,13 @@ public class UdpBioAsyncConnection extends AsyncConnection {
     }
 
     @Override
-    public int read(ByteBuffer dst) throws IOException {
-        int rs = channel.read(dst);
-        this.readtime = System.currentTimeMillis();
-        return rs;
+    public final InputStream newInputStream() {
+        return Channels.newInputStream(this.channel);
+    }
+
+    @Override
+    public final OutputStream newOutputStream() {
+        return Channels.newOutputStream(this.channel);
     }
 
     @Override
@@ -159,13 +162,6 @@ public class UdpBioAsyncConnection extends AsyncConnection {
         }
     }
 
-    @Override
-    public int write(ByteBuffer src) throws IOException {
-        int rs = channel.send(src, remoteAddress);
-        this.writetime = System.currentTimeMillis();
-        return rs;
-    }
-
     @Override
     public final void close() throws IOException {
         super.close();

src/org/redkale/net/http/HttpRequest.java

@@ -10,7 +10,6 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
 import java.net.*;
 import java.nio.ByteBuffer;
-import java.nio.channels.Channels;
 import java.nio.charset.*;
 import java.util.*;
 import java.util.logging.Level;
@@ -582,7 +581,7 @@ public class HttpRequest extends Request<HttpContext> {
     @ConvertDisabled
     public final MultiContext getMultiContext() {
         return new MultiContext(context.getCharset(), this.getContentType(), this.params,
-            new BufferedInputStream(Channels.newInputStream(this.channel), Math.max(array.size(), 8192)) {
+            new BufferedInputStream(this.channel.newInputStream(), Math.max(array.size(), 8192)) {
             {
                 array.copyTo(this.buf);
                 this.count = array.size();