move FrameDelegate to com.teragrep.rlp_03.delegate, move classes from…

… com.teragrep.rlp_03.delegate.relp to com.teragrep.rlp_03.delegate (#96)
teragrep · Mar 11, 2024 · 3bcb2a7 · 3bcb2a7
1 parent 1834014
commit 3bcb2a7
Show file tree

Hide file tree

Showing 25 changed files with 26 additions and 24 deletions.
diff --git a/src/main/java/com/teragrep/rlp_03/Server.java b/src/main/java/com/teragrep/rlp_03/Server.java
@@ -47,6 +47,7 @@
 package com.teragrep.rlp_03;
 
 import com.teragrep.rlp_03.context.channel.SocketFactory;
+import com.teragrep.rlp_03.delegate.FrameDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/com/teragrep/rlp_03/ServerFactory.java b/src/main/java/com/teragrep/rlp_03/ServerFactory.java
@@ -52,6 +52,7 @@
 import com.teragrep.rlp_03.context.channel.PlainFactory;
 import com.teragrep.rlp_03.context.channel.SocketFactory;
 import com.teragrep.rlp_03.context.channel.TLSFactory;
+import com.teragrep.rlp_03.delegate.FrameDelegate;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

diff --git a/src/main/java/com/teragrep/rlp_03/SocketPoll.java b/src/main/java/com/teragrep/rlp_03/SocketPoll.java
@@ -49,6 +49,7 @@
 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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/com/teragrep/rlp_03/context/ConnectionContextImpl.java b/src/main/java/com/teragrep/rlp_03/context/ConnectionContextImpl.java
@@ -46,7 +46,7 @@
 
 package com.teragrep.rlp_03.context;
 
-import com.teragrep.rlp_03.FrameDelegate;
+import com.teragrep.rlp_03.delegate.FrameDelegate;
 import com.teragrep.rlp_03.context.buffer.BufferLeasePool;
 import com.teragrep.rlp_03.context.channel.Socket;
 import org.slf4j.Logger;

diff --git a/src/main/java/com/teragrep/rlp_03/context/RelpReadImpl.java b/src/main/java/com/teragrep/rlp_03/context/RelpReadImpl.java
@@ -46,9 +46,8 @@
 
 package com.teragrep.rlp_03.context;
 
-import com.teragrep.rlp_01.RelpCommand;
 import com.teragrep.rlp_03.FrameContext;
-import com.teragrep.rlp_03.FrameDelegate;
+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;

diff --git a/...3/delegate/relp/DefaultFrameDelegate.java → ...rlp_03/delegate/DefaultFrameDelegate.java b/...3/delegate/relp/DefaultFrameDelegate.java → ...rlp_03/delegate/DefaultFrameDelegate.java
@@ -44,12 +44,11 @@
  * a licensee so wish it.
  */
 
-package com.teragrep.rlp_03.delegate.relp;
+package com.teragrep.rlp_03.delegate;
 
 
 import com.teragrep.rlp_01.RelpCommand;
 import com.teragrep.rlp_03.FrameContext;
-import com.teragrep.rlp_03.FrameDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...va/com/teragrep/rlp_03/FrameDelegate.java → ...ragrep/rlp_03/delegate/FrameDelegate.java b/...va/com/teragrep/rlp_03/FrameDelegate.java → ...ragrep/rlp_03/delegate/FrameDelegate.java
@@ -44,7 +44,9 @@
  * a licensee so wish it.
  */
 
-package com.teragrep.rlp_03;
+package com.teragrep.rlp_03.delegate;
+
+import com.teragrep.rlp_03.FrameContext;
 
 /*
  * FrameDelegate is responsible for delegating processing of. RelpFrames

diff --git a/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegatePool.java b/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegatePool.java
@@ -46,7 +46,6 @@
 
 package com.teragrep.rlp_03.delegate;
 
-import com.teragrep.rlp_03.FrameDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegateStub.java b/src/main/java/com/teragrep/rlp_03/delegate/FrameDelegateStub.java
@@ -48,7 +48,6 @@
 
 
 import com.teragrep.rlp_03.FrameContext;
-import com.teragrep.rlp_03.FrameDelegate;
 
 public class FrameDelegateStub implements FrameDelegate {
 

diff --git a/src/main/java/com/teragrep/rlp_03/delegate/PoolingDelegate.java b/src/main/java/com/teragrep/rlp_03/delegate/PoolingDelegate.java
@@ -47,7 +47,6 @@
 package com.teragrep.rlp_03.delegate;
 
 import com.teragrep.rlp_03.FrameContext;
-import com.teragrep.rlp_03.FrameDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...agrep/rlp_03/delegate/relp/RelpEvent.java → ...m/teragrep/rlp_03/delegate/RelpEvent.java b/...agrep/rlp_03/delegate/relp/RelpEvent.java → ...m/teragrep/rlp_03/delegate/RelpEvent.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.delegate.relp;
+package com.teragrep.rlp_03.delegate;
 
 import com.teragrep.rlp_01.RelpFrameTX;
 import com.teragrep.rlp_03.FrameContext;

diff --git a/.../rlp_03/delegate/relp/RelpEventClose.java → ...agrep/rlp_03/delegate/RelpEventClose.java b/.../rlp_03/delegate/relp/RelpEventClose.java → ...agrep/rlp_03/delegate/RelpEventClose.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.delegate.relp;
+package com.teragrep.rlp_03.delegate;
 
 import com.teragrep.rlp_01.RelpCommand;
 import com.teragrep.rlp_01.RelpFrameTX;

diff --git a/...p/rlp_03/delegate/relp/RelpEventOpen.java → ...ragrep/rlp_03/delegate/RelpEventOpen.java b/...p/rlp_03/delegate/relp/RelpEventOpen.java → ...ragrep/rlp_03/delegate/RelpEventOpen.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.delegate.relp;
+package com.teragrep.rlp_03.delegate;
 
 import com.teragrep.rlp_01.RelpCommand;
 import com.teragrep.rlp_01.RelpFrameTX;

diff --git a/...3/delegate/relp/RelpEventServerClose.java → ...rlp_03/delegate/RelpEventServerClose.java b/...3/delegate/relp/RelpEventServerClose.java → ...rlp_03/delegate/RelpEventServerClose.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.delegate.relp;
+package com.teragrep.rlp_03.delegate;
 
 import com.teragrep.rlp_01.RelpCommand;
 import com.teragrep.rlp_01.RelpFrameTX;

diff --git a/...rlp_03/delegate/relp/RelpEventSyslog.java → ...grep/rlp_03/delegate/RelpEventSyslog.java b/...rlp_03/delegate/relp/RelpEventSyslog.java → ...grep/rlp_03/delegate/RelpEventSyslog.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.delegate.relp;
+package com.teragrep.rlp_03.delegate;
 
 import com.teragrep.rlp_01.RelpCommand;
 import com.teragrep.rlp_01.RelpFrameTX;

diff --git a/src/test/java/com/teragrep/rlp_03/CloseByteConsumerTest.java b/src/test/java/com/teragrep/rlp_03/CloseByteConsumerTest.java
@@ -49,7 +49,7 @@
 import com.teragrep.rlp_01.RelpBatch;
 import com.teragrep.rlp_01.RelpConnection;
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;

diff --git a/src/test/java/com/teragrep/rlp_03/CloseRelpFrameServerRXConsumerTest.java b/src/test/java/com/teragrep/rlp_03/CloseRelpFrameServerRXConsumerTest.java
@@ -49,7 +49,7 @@
 import com.teragrep.rlp_01.RelpBatch;
 import com.teragrep.rlp_01.RelpConnection;
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;

diff --git a/src/test/java/com/teragrep/rlp_03/ConnectionStormTest.java b/src/test/java/com/teragrep/rlp_03/ConnectionStormTest.java
@@ -48,7 +48,7 @@
 
 import com.teragrep.rlp_01.RelpConnection;
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.*;
 
 import java.util.LinkedList;

diff --git a/src/test/java/com/teragrep/rlp_03/ManualPerformanceTest.java b/src/test/java/com/teragrep/rlp_03/ManualPerformanceTest.java
@@ -47,7 +47,8 @@
 package com.teragrep.rlp_03;
 
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.FrameDelegate;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.slf4j.Logger;

diff --git a/src/test/java/com/teragrep/rlp_03/ManualTest.java b/src/test/java/com/teragrep/rlp_03/ManualTest.java
@@ -48,7 +48,7 @@
 
 import com.teragrep.rlp_03.config.Config;
 import com.teragrep.rlp_03.config.TLSConfig;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import com.teragrep.rlp_03.tls.SSLContextWithCustomTrustAndKeyManagerHelper;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;

diff --git a/src/test/java/com/teragrep/rlp_03/MultiClientTest.java b/src/test/java/com/teragrep/rlp_03/MultiClientTest.java
@@ -49,7 +49,8 @@
 import com.teragrep.rlp_01.RelpBatch;
 import com.teragrep.rlp_01.RelpConnection;
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.FrameDelegate;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.condition.DisabledOnJre;
 import org.junit.jupiter.api.condition.JRE;

diff --git a/src/test/java/com/teragrep/rlp_03/SendMessageTest.java b/src/test/java/com/teragrep/rlp_03/SendMessageTest.java
@@ -49,7 +49,7 @@
 import com.teragrep.rlp_01.RelpBatch;
 import com.teragrep.rlp_01.RelpConnection;
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/src/test/java/com/teragrep/rlp_03/ServerShutdownTest.java b/src/test/java/com/teragrep/rlp_03/ServerShutdownTest.java
@@ -47,7 +47,7 @@
 package com.teragrep.rlp_03;
 
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

diff --git a/src/test/java/com/teragrep/rlp_03/TearDownTest.java b/src/test/java/com/teragrep/rlp_03/TearDownTest.java
@@ -49,7 +49,7 @@
 import com.teragrep.rlp_01.RelpBatch;
 import com.teragrep.rlp_01.RelpConnection;
 import com.teragrep.rlp_03.config.Config;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.*;
 
 import java.nio.charset.StandardCharsets;

diff --git a/src/test/java/com/teragrep/rlp_03/TlsClientTest.java b/src/test/java/com/teragrep/rlp_03/TlsClientTest.java
@@ -51,7 +51,7 @@
 import com.teragrep.rlp_01.SSLContextFactory;
 import com.teragrep.rlp_03.config.Config;
 import com.teragrep.rlp_03.config.TLSConfig;
-import com.teragrep.rlp_03.delegate.relp.DefaultFrameDelegate;
+import com.teragrep.rlp_03.delegate.DefaultFrameDelegate;
 import org.junit.jupiter.api.*;
 
 import javax.net.ssl.KeyManagerFactory;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,7 +48,6 @@


		import com.teragrep.rlp_03.FrameContext;
		import com.teragrep.rlp_03.FrameDelegate;

		public class FrameDelegateStub implements FrameDelegate {

Expand Down