Refactor module packaging

hexagontk · Sep 24, 2023 · 35b41f4 · 35b41f4
1 parent 3a1cb2a
commit 35b41f4
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/http/http_client_jetty_ws/api/http_client_jetty_ws.api b/http/http_client_jetty_ws/api/http_client_jetty_ws.api
@@ -1,4 +1,4 @@
-public final class com/hexagonkt/http/client/jetty/JettyClientWsSession : com/hexagonkt/http/model/ws/WsSession {
+public final class com/hexagonkt/http/client/jetty/ws/JettyClientWsSession : com/hexagonkt/http/model/ws/WsSession {
 	public fun <init> (Ljava/net/URI;Lorg/eclipse/jetty/websocket/api/Session;)V
 	public fun close (ILjava/lang/String;)V
 	public fun getAttributes ()Ljava/util/Map;
@@ -12,15 +12,15 @@ public final class com/hexagonkt/http/client/jetty/JettyClientWsSession : com/he
 	public fun send ([B)V
 }
 
-public final class com/hexagonkt/http/client/jetty/JettyWebSocketAdapter {
+public final class com/hexagonkt/http/client/jetty/ws/JettyWebSocketAdapter {
 	public fun <init> (Ljava/net/URI;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function3;)V
 	public final fun onWebSocketBinary (Lorg/eclipse/jetty/websocket/api/Session;Ljava/nio/ByteBuffer;Lorg/eclipse/jetty/websocket/api/Callback;)V
 	public final fun onWebSocketClose (Lorg/eclipse/jetty/websocket/api/Session;ILjava/lang/String;)V
 	public final fun onWebSocketConnect (Lorg/eclipse/jetty/websocket/api/Session;)V
 	public final fun onWebSocketText (Lorg/eclipse/jetty/websocket/api/Session;Ljava/lang/String;)V
 }
 
-public final class com/hexagonkt/http/client/jetty/JettyWsClientAdapter : com/hexagonkt/http/client/jetty/JettyClientAdapter {
+public final class com/hexagonkt/http/client/jetty/ws/JettyWsClientAdapter : com/hexagonkt/http/client/jetty/JettyClientAdapter {
 	public fun <init> ()V
 	public fun shutDown ()V
 	public fun startUp (Lcom/hexagonkt/http/client/HttpClient;)V

diff --git a/...http/client/jetty/JettyClientWsSession.kt → ...p/client/jetty/ws/JettyClientWsSession.kt b/...http/client/jetty/JettyClientWsSession.kt → ...p/client/jetty/ws/JettyClientWsSession.kt
@@ -1,4 +1,4 @@
-package com.hexagonkt.http.client.jetty
+package com.hexagonkt.http.client.jetty.ws
 
 import com.hexagonkt.http.model.HttpRequestPort
 import com.hexagonkt.http.model.ws.WsSession

diff --git a/...ttp/client/jetty/JettyWebSocketAdapter.kt → .../client/jetty/ws/JettyWebSocketAdapter.kt b/...ttp/client/jetty/JettyWebSocketAdapter.kt → .../client/jetty/ws/JettyWebSocketAdapter.kt
@@ -1,4 +1,4 @@
-package com.hexagonkt.http.client.jetty
+package com.hexagonkt.http.client.jetty.ws
 
 import com.hexagonkt.http.model.ws.WsSession
 import org.eclipse.jetty.websocket.api.Callback

diff --git a/...http/client/jetty/JettyWsClientAdapter.kt → ...p/client/jetty/ws/JettyWsClientAdapter.kt b/...http/client/jetty/JettyWsClientAdapter.kt → ...p/client/jetty/ws/JettyWsClientAdapter.kt
@@ -1,7 +1,8 @@
-package com.hexagonkt.http.client.jetty
+package com.hexagonkt.http.client.jetty.ws
 
 import com.hexagonkt.core.urlOf
 import com.hexagonkt.http.client.HttpClient
+import com.hexagonkt.http.client.jetty.JettyClientAdapter
 import com.hexagonkt.http.model.ws.WsSession
 import org.eclipse.jetty.websocket.client.WebSocketClient
 import java.net.URI

diff --git a/...tp/client/jetty/JettyClientAdapterTest.kt → ...client/jetty/ws/JettyClientAdapterTest.kt b/...tp/client/jetty/JettyClientAdapterTest.kt → ...client/jetty/ws/JettyClientAdapterTest.kt
@@ -1,4 +1,4 @@
-package com.hexagonkt.http.client.jetty
+package com.hexagonkt.http.client.jetty.ws
 
 import com.hexagonkt.http.client.HttpClient
 import com.hexagonkt.http.model.HttpRequest

diff --git a/...p_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/JettyServletAdapterTest.kt b/...p_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/JettyServletAdapterTest.kt
@@ -4,7 +4,7 @@ import com.hexagonkt.core.media.TEXT_PLAIN
 import com.hexagonkt.core.urlOf
 import com.hexagonkt.http.client.HttpClient
 import com.hexagonkt.http.client.HttpClientSettings
-import com.hexagonkt.http.client.jetty.JettyWsClientAdapter
+import com.hexagonkt.http.client.jetty.ws.JettyWsClientAdapter
 import com.hexagonkt.http.model.ContentType
 import com.hexagonkt.http.model.OK_200
 import com.hexagonkt.http.handlers.path

diff --git a/...ttp_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/poc/JettyWsServerTest.kt b/...ttp_server_jetty/src/test/kotlin/com/hexagonkt/http/server/jetty/poc/JettyWsServerTest.kt
@@ -8,7 +8,7 @@ import org.eclipse.jetty.ee10.servlet.ServletContextHandler
 import java.util.*
 import com.hexagonkt.http.client.HttpClient
 import com.hexagonkt.http.client.HttpClientSettings
-import com.hexagonkt.http.client.jetty.JettyWsClientAdapter
+import com.hexagonkt.http.client.jetty.ws.JettyWsClientAdapter
 import com.hexagonkt.http.model.HttpMethod.GET
 import com.hexagonkt.http.model.ws.NORMAL
 import com.hexagonkt.http.server.HttpServer

diff --git a/.../http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/AdapterExamplesTest.kt b/.../http_server_netty/src/test/kotlin/com/hexagonkt/http/server/netty/AdapterExamplesTest.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.http.server.netty
 
-import com.hexagonkt.http.client.jetty.JettyWsClientAdapter
+import com.hexagonkt.http.client.jetty.ws.JettyWsClientAdapter
 import com.hexagonkt.http.test.examples.*
 import com.hexagonkt.serialization.jackson.JacksonTextFormat
 import com.hexagonkt.serialization.jackson.json.Json