Simplified protocol context API design.

rapidoid · Jul 9, 2015 · bedd3e7 · bedd3e7
1 parent 9ac433c
commit bedd3e7
Show file tree

Hide file tree

Showing 23 changed files with 157 additions and 502 deletions.
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/Channel.java b/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/Channel.java
@@ -25,6 +25,6 @@
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
-public interface Channel extends CtxFull<Channel> {
+public interface Channel extends ProtocolContext<Channel> {
 
 }
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/CtxConnection.java b/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/CtxConnection.java
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/CtxFull.java b/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/CtxFull.java
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/CtxIO.java b/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/CtxIO.java
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/CtxProtocol.java b/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/CtxProtocol.java
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/CtxRead.java b/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/CtxRead.java
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/CtxState.java b/rapidoid-net/src/main/java/org/rapidoid/net/abstracts/CtxState.java
diff --git a/.../org/rapidoid/net/abstracts/CtxWrite.java → ...pidoid/net/abstracts/ProtocolContext.java b/.../org/rapidoid/net/abstracts/CtxWrite.java → ...pidoid/net/abstracts/ProtocolContext.java
@@ -1,5 +1,15 @@
 package org.rapidoid.net.abstracts;
 
+import java.io.File;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+
+import org.rapidoid.annotation.Authors;
+import org.rapidoid.annotation.Since;
+import org.rapidoid.buffer.Buf;
+import org.rapidoid.net.impl.ConnState;
+import org.rapidoid.net.impl.RapidoidHelper;
+
 /*
  * #%L
  * rapidoid-net
@@ -20,15 +30,37 @@
  * #L%
  */
 
-import java.io.File;
-import java.nio.ByteBuffer;
-
-import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Since;
-
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
-public interface CtxWrite<T> {
+public interface ProtocolContext<T> {
+
+	/* CONNECTION */
+
+	String address();
+
+	InetSocketAddress getAddress();
+
+	long connId();
+
+	boolean isAsync();
+
+	T close();
+
+	T closeIf(boolean condition);
+
+	boolean isClosing();
+
+	boolean isClosed();
+
+	void waitUntilClosing();
+
+	void log(String msg);
+
+	/* PROTOCOL */
+
+	boolean isInitial();
+
+	/* WRITE */
 
 	T write(String s);
 
@@ -46,9 +78,31 @@ public interface CtxWrite<T> {
 
 	T send();
 
+	/* ASYNC */
+
 	// due to async() web handling option, it ain't over till the fat lady sings "done"
 	T async();
 
 	T done();
 
+	/* READ */
+
+	String readln();
+
+	String readN(int count);
+
+	/* IO */
+
+	Buf input();
+
+	Buf output();
+
+	RapidoidHelper helper();
+
+	/* EXTRAS */
+
+	ConnState state();
+
+	<P> P persistor();
+
 }
diff --git a/rapidoid-net/src/main/java/org/rapidoid/net/impl/DefaultExchange.java b/rapidoid-net/src/main/java/org/rapidoid/net/impl/DefaultExchange.java
@@ -36,14 +36,14 @@
 import org.rapidoid.data.MultiData;
 import org.rapidoid.data.Range;
 import org.rapidoid.net.abstracts.Channel;
-import org.rapidoid.net.abstracts.CtxFull;
+import org.rapidoid.net.abstracts.ProtocolContext;
 import org.rapidoid.util.Constants;
 import org.rapidoid.util.Resetable;
 import org.rapidoid.util.U;
 
 @Authors("Nikolche Mihajlovski")
 @Since("2.0.0")
-public abstract class DefaultExchange<T> implements CtxFull<T>, BufProvider, Resetable, Constants {
+public abstract class DefaultExchange<T> implements ProtocolContext<T>, BufProvider, Resetable, Constants {
 
 	protected Channel conn;
 

diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/TCPClientBuilder.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/TCPClientBuilder.java
@@ -51,7 +51,7 @@ public interface TCPClientBuilder extends Builder<TCPClient> {
 
 	TCPClientBuilder protocol(Protocol protocol);
 
-	TCPClientBuilder exchange(Class<? extends DefaultExchange<?, ?>> exchangeClass);
+	TCPClientBuilder exchange(Class<? extends DefaultExchange<?>> exchangeClass);
 
 	TCPClientBuilder helper(Class<? extends RapidoidHelper> helperClass);
 

diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/TCPServerBuilder.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/TCPServerBuilder.java
@@ -45,7 +45,7 @@ public interface TCPServerBuilder extends Builder<TCPServer> {
 
 	TCPServerBuilder protocol(Protocol protocol);
 
-	TCPServerBuilder exchange(Class<? extends DefaultExchange<?, ?>> exchangeClass);
+	TCPServerBuilder exchange(Class<? extends DefaultExchange<?>> exchangeClass);
 
 	TCPServerBuilder helper(Class<? extends RapidoidHelper> helperClass);
 

diff --git a/rapidoid-x-net/src/main/java/org/rapidoidx/net/abstracts/Channel.java b/rapidoid-x-net/src/main/java/org/rapidoidx/net/abstracts/Channel.java
@@ -26,6 +26,6 @@
 
 @Authors("Nikolche Mihajlovski")
 @Since("3.0.0")
-public interface Channel extends CtxFull<Channel, Channel> {
+public interface Channel extends ProtocolContext<Channel> {
 
 }