restructure packages (#132)

README.adoc

@@ -63,15 +63,16 @@ Dependencies for examples
 
 Server with shared handler for all connections. See ExampleRelpClient.java for client.
 
-[source, java]
+[source,java]
 ----
 package com.teragrep.rlp_03.readme;
 
-import com.teragrep.rlp_03.FrameContext;
-import com.teragrep.rlp_03.Server;
-import com.teragrep.rlp_03.ServerFactory;
-import com.teragrep.rlp_03.context.channel.PlainFactory;
-import com.teragrep.rlp_03.delegate.*;
+import com.teragrep.rlp_03.frame.delegate.DefaultFrameDelegate;
+import com.teragrep.rlp_03.frame.delegate.FrameContext;
+import com.teragrep.rlp_03.frame.delegate.FrameDelegate;
+import com.teragrep.rlp_03.server.Server;
+import com.teragrep.rlp_03.server.ServerFactory;
+import com.teragrep.rlp_03.channel.socket.PlainFactory;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;

src/main/java/com/teragrep/rlp_03/EventLoop.java

@@ -45,8 +45,10 @@
  */
 package com.teragrep.rlp_03;
 
-import com.teragrep.rlp_03.context.EstablishedContext;
-import com.teragrep.rlp_03.context.Context;
+import com.teragrep.rlp_03.channel.context.ConnectContext;
+import com.teragrep.rlp_03.channel.context.EstablishedContext;
+import com.teragrep.rlp_03.channel.context.Context;
+import com.teragrep.rlp_03.channel.context.ListenContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -95,10 +97,6 @@ private void registerPendingRegistrations() {
         }
     }
 
-    public Selector selector() {
-        return selector;
-    }
-
     public void poll() throws IOException {
         int readyKeys = selector.select();
 

src/main/java/com/teragrep/rlp_03/context/InterestOps.java → src/main/java/com/teragrep/rlp_03/channel/InterestOps.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context;
+package com.teragrep.rlp_03.channel;
 
 public interface InterestOps {
 

src/main/java/com/teragrep/rlp_03/context/InterestOpsImpl.java → src/main/java/com/teragrep/rlp_03/channel/InterestOpsImpl.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context;
+package com.teragrep.rlp_03.channel;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/teragrep/rlp_03/context/buffer/BufferContainer.java → src/main/java/com/teragrep/rlp_03/channel/buffer/BufferContainer.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context.buffer;
+package com.teragrep.rlp_03.channel.buffer;
 
 import java.nio.ByteBuffer;
 

src/main/java/com/teragrep/rlp_03/context/buffer/BufferContainerImpl.java → src/main/java/com/teragrep/rlp_03/channel/buffer/BufferContainerImpl.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context.buffer;
+package com.teragrep.rlp_03.channel.buffer;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/teragrep/rlp_03/context/buffer/BufferContainerStub.java → src/main/java/com/teragrep/rlp_03/channel/buffer/BufferContainerStub.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context.buffer;
+package com.teragrep.rlp_03.channel.buffer;
 
 import java.nio.ByteBuffer;
 

src/main/java/com/teragrep/rlp_03/context/buffer/BufferLease.java → src/main/java/com/teragrep/rlp_03/channel/buffer/BufferLease.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context.buffer;
+package com.teragrep.rlp_03.channel.buffer;
 
 import java.nio.ByteBuffer;
 

src/main/java/com/teragrep/rlp_03/context/buffer/BufferLeaseImpl.java → src/main/java/com/teragrep/rlp_03/channel/buffer/BufferLeaseImpl.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context.buffer;
+package com.teragrep.rlp_03.channel.buffer;
 
 import java.nio.ByteBuffer;
 import java.util.concurrent.Phaser;

src/main/java/com/teragrep/rlp_03/context/buffer/BufferLeasePool.java → src/main/java/com/teragrep/rlp_03/channel/buffer/BufferLeasePool.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context.buffer;
+package com.teragrep.rlp_03.channel.buffer;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/teragrep/rlp_03/context/buffer/BufferLeaseStub.java → src/main/java/com/teragrep/rlp_03/channel/buffer/BufferLeaseStub.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context.buffer;
+package com.teragrep.rlp_03.channel.buffer;
 
 import java.nio.ByteBuffer;
 

src/main/java/com/teragrep/rlp_03/ConnectContext.java → src/main/java/com/teragrep/rlp_03/channel/context/ConnectContext.java

@@ -43,11 +43,12 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03;
+package com.teragrep.rlp_03.channel.context;
 
-import com.teragrep.rlp_03.context.*;
-import com.teragrep.rlp_03.context.channel.SocketFactory;
-import com.teragrep.rlp_03.delegate.FrameDelegate;
+import com.teragrep.rlp_03.channel.InterestOps;
+import com.teragrep.rlp_03.channel.InterestOpsImpl;
+import com.teragrep.rlp_03.channel.socket.SocketFactory;
+import com.teragrep.rlp_03.frame.delegate.FrameDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/teragrep/rlp_03/ConnectContextFactory.java → src/main/java/com/teragrep/rlp_03/channel/context/ConnectContextFactory.java

@@ -43,11 +43,10 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03;
+package com.teragrep.rlp_03.channel.context;
 
-import com.teragrep.rlp_03.context.EstablishedContext;
-import com.teragrep.rlp_03.context.channel.SocketFactory;
-import com.teragrep.rlp_03.delegate.FrameDelegate;
+import com.teragrep.rlp_03.channel.socket.SocketFactory;
+import com.teragrep.rlp_03.frame.delegate.FrameDelegate;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

src/main/java/com/teragrep/rlp_03/context/Context.java → src/main/java/com/teragrep/rlp_03/channel/context/Context.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context;
+package com.teragrep.rlp_03.channel.context;
 
 import java.io.Closeable;
 import java.nio.channels.SelectionKey;

src/main/java/com/teragrep/rlp_03/context/EstablishedContext.java → src/main/java/com/teragrep/rlp_03/channel/context/EstablishedContext.java

@@ -43,9 +43,10 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context;
+package com.teragrep.rlp_03.channel.context;
 
-import com.teragrep.rlp_03.context.channel.Socket;
+import com.teragrep.rlp_03.channel.InterestOps;
+import com.teragrep.rlp_03.channel.socket.Socket;
 
 public interface EstablishedContext extends Context {
 

src/main/java/com/teragrep/rlp_03/context/EstablishedContextImpl.java → src/main/java/com/teragrep/rlp_03/channel/context/EstablishedContextImpl.java

@@ -43,11 +43,12 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context;
+package com.teragrep.rlp_03.channel.context;
 
-import com.teragrep.rlp_03.delegate.FrameDelegate;
-import com.teragrep.rlp_03.context.buffer.BufferLeasePool;
-import com.teragrep.rlp_03.context.channel.Socket;
+import com.teragrep.rlp_03.channel.*;
+import com.teragrep.rlp_03.frame.delegate.FrameDelegate;
+import com.teragrep.rlp_03.channel.buffer.BufferLeasePool;
+import com.teragrep.rlp_03.channel.socket.Socket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/teragrep/rlp_03/context/EstablishedContextStub.java → src/main/java/com/teragrep/rlp_03/channel/context/EstablishedContextStub.java

@@ -43,9 +43,10 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context;
+package com.teragrep.rlp_03.channel.context;
 
-import com.teragrep.rlp_03.context.channel.Socket;
+import com.teragrep.rlp_03.channel.InterestOps;
+import com.teragrep.rlp_03.channel.socket.Socket;
 
 import java.nio.channels.SelectionKey;
 import java.nio.channels.spi.AbstractSelectableChannel;

src/main/java/com/teragrep/rlp_03/ListenContext.java → src/main/java/com/teragrep/rlp_03/channel/context/ListenContext.java

@@ -43,12 +43,13 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03;
+package com.teragrep.rlp_03.channel.context;
 
-import com.teragrep.rlp_03.context.*;
-import com.teragrep.rlp_03.context.channel.Socket;
-import com.teragrep.rlp_03.context.channel.SocketFactory;
-import com.teragrep.rlp_03.delegate.FrameDelegate;
+import com.teragrep.rlp_03.channel.InterestOps;
+import com.teragrep.rlp_03.channel.InterestOpsImpl;
+import com.teragrep.rlp_03.channel.socket.Socket;
+import com.teragrep.rlp_03.channel.socket.SocketFactory;
+import com.teragrep.rlp_03.frame.delegate.FrameDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/teragrep/rlp_03/ListenContextFactory.java → src/main/java/com/teragrep/rlp_03/channel/context/ListenContextFactory.java

@@ -43,10 +43,10 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03;
+package com.teragrep.rlp_03.channel.context;
 
-import com.teragrep.rlp_03.context.channel.SocketFactory;
-import com.teragrep.rlp_03.delegate.FrameDelegate;
+import com.teragrep.rlp_03.channel.socket.SocketFactory;
+import com.teragrep.rlp_03.frame.delegate.FrameDelegate;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

src/main/java/com/teragrep/rlp_03/context/RelpRead.java → src/main/java/com/teragrep/rlp_03/channel/context/RelpRead.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context;
+package com.teragrep.rlp_03.channel.context;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 

src/main/java/com/teragrep/rlp_03/context/RelpReadImpl.java → src/main/java/com/teragrep/rlp_03/channel/context/RelpReadImpl.java

@@ -43,15 +43,15 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context;
+package com.teragrep.rlp_03.channel.context;
 
-import com.teragrep.rlp_03.FrameContext;
-import com.teragrep.rlp_03.delegate.FrameDelegate;
-import com.teragrep.rlp_03.context.buffer.BufferLease;
-import com.teragrep.rlp_03.context.buffer.BufferLeasePool;
-import com.teragrep.rlp_03.context.frame.RelpFrameAccess;
-import com.teragrep.rlp_03.context.frame.RelpFrameImpl;
-import com.teragrep.rlp_03.context.frame.RelpFrameLeaseful;
+import com.teragrep.rlp_03.frame.delegate.FrameContext;
+import com.teragrep.rlp_03.frame.delegate.FrameDelegate;
+import com.teragrep.rlp_03.channel.buffer.BufferLease;
+import com.teragrep.rlp_03.channel.buffer.BufferLeasePool;
+import com.teragrep.rlp_03.frame.RelpFrameAccess;
+import com.teragrep.rlp_03.frame.RelpFrameImpl;
+import com.teragrep.rlp_03.frame.RelpFrameLeaseful;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import tlschannel.NeedsReadException;
@@ -122,7 +122,7 @@ public void run() {
                     if (LOGGER.isDebugEnabled()) {
                         LOGGER.debug("resuming buffer <{}>, activeBuffers <{}>", activeBuffers.get(0), activeBuffers);
                     }
-                    complete = innerLoop(relpFrame, true);
+                    complete = innerLoop(relpFrame);
                 }
 
                 while (activeBuffers.isEmpty() && !complete) {
@@ -135,7 +135,7 @@ public void run() {
                         return; // TODO this is quite ugly return, single point of return is preferred!
                     }
 
-                    if (innerLoop(relpFrame, false)) {
+                    if (innerLoop(relpFrame)) {
                         break;
                     }
 
@@ -164,7 +164,7 @@ public void run() {
         }
     }
 
-    private boolean innerLoop(RelpFrameLeaseful relpFrame, boolean hasRef) {
+    private boolean innerLoop(RelpFrameLeaseful relpFrame) {
         boolean rv = false;
         while (!activeBuffers.isEmpty()) {
             // TODO redesign this, very coupled design here !

src/main/java/com/teragrep/rlp_03/context/RelpWrite.java → src/main/java/com/teragrep/rlp_03/channel/context/RelpWrite.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context;
+package com.teragrep.rlp_03.channel.context;
 
 import com.teragrep.rlp_01.RelpFrameTX;
 

src/main/java/com/teragrep/rlp_03/context/RelpWriteImpl.java → src/main/java/com/teragrep/rlp_03/channel/context/RelpWriteImpl.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context;
+package com.teragrep.rlp_03.channel.context;
 
 import com.teragrep.rlp_01.RelpCommand;
 import com.teragrep.rlp_01.RelpFrameTX;

src/main/java/com/teragrep/rlp_03/EncryptionInfo.java → src/main/java/com/teragrep/rlp_03/channel/info/EncryptionInfo.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03;
+package com.teragrep.rlp_03.channel.info;
 
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.security.cert.X509Certificate;

src/main/java/com/teragrep/rlp_03/EncryptionInfoStub.java → src/main/java/com/teragrep/rlp_03/channel/info/EncryptionInfoStub.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03;
+package com.teragrep.rlp_03.channel.info;
 
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.security.cert.X509Certificate;

src/main/java/com/teragrep/rlp_03/EncryptionInfoTLS.java → src/main/java/com/teragrep/rlp_03/channel/info/EncryptionInfoTLS.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03;
+package com.teragrep.rlp_03.channel.info;
 
 import tlschannel.TlsChannel;
 

src/main/java/com/teragrep/rlp_03/TransportInfo.java → src/main/java/com/teragrep/rlp_03/channel/info/TransportInfo.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03;
+package com.teragrep.rlp_03.channel.info;
 
 public interface TransportInfo {
 

src/main/java/com/teragrep/rlp_03/TransportInfoImpl.java → src/main/java/com/teragrep/rlp_03/channel/info/TransportInfoImpl.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03;
+package com.teragrep.rlp_03.channel.info;
 
 import java.nio.channels.SocketChannel;
 

src/main/java/com/teragrep/rlp_03/context/channel/PlainFactory.java → src/main/java/com/teragrep/rlp_03/channel/socket/PlainFactory.java

@@ -43,7 +43,7 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context.channel;
+package com.teragrep.rlp_03.channel.socket;
 
 import java.nio.channels.SocketChannel;
 

src/main/java/com/teragrep/rlp_03/context/channel/PlainSocket.java → src/main/java/com/teragrep/rlp_03/channel/socket/PlainSocket.java

@@ -43,12 +43,12 @@
  * Teragrep, the applicable Commercial License may apply to this file if you as
  * a licensee so wish it.
  */
-package com.teragrep.rlp_03.context.channel;
+package com.teragrep.rlp_03.channel.socket;
 
-import com.teragrep.rlp_03.EncryptionInfo;
-import com.teragrep.rlp_03.EncryptionInfoStub;
-import com.teragrep.rlp_03.TransportInfo;
-import com.teragrep.rlp_03.TransportInfoImpl;
+import com.teragrep.rlp_03.channel.info.EncryptionInfo;
+import com.teragrep.rlp_03.channel.info.EncryptionInfoStub;
+import com.teragrep.rlp_03.channel.info.TransportInfo;
+import com.teragrep.rlp_03.channel.info.TransportInfoImpl;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;