From 822aba9646b06a4611d10e45ebc9c8452f233ac5 Mon Sep 17 00:00:00 2001 From: Cedric Date: Sun, 14 Nov 2021 13:21:39 +0100 Subject: [PATCH] feat(connection): Enforce deprecation of old con. api by module design Move deprecated connection modules to legacy package and remove rework package to allow for one final breaking change once the new connection api is finished. --- CHANGELOG.md | 2 +- .../services/connection/{rework => }/ConnectionData.java | 2 +- .../connection/{rework => }/ConnectionDetails.java | 2 +- .../services/connection/{rework => }/RawMessage.java | 2 +- .../services/connection/{rework => }/Receiver.java | 2 +- .../services/connection/{rework => }/Sender.java | 2 +- .../services/connection/{rework => }/SenderData.java | 2 +- .../services/connection/{rework => }/StaticSender.java | 2 +- .../telestion/services/connection/{rework => }/Tuple.java | 2 +- .../services/connection/{ => legacy}/SerialConn.java | 3 ++- .../services/connection/{ => legacy}/SerialData.java | 2 +- .../services/connection/{ => legacy}/TcpConn.java | 2 +- .../connection/{rework => }/serial/SerialConn.java | 6 +++--- .../connection/{rework => }/serial/SerialDetails.java | 4 ++-- .../services/connection/{rework => }/tcp/TcpClient.java | 7 +++---- .../services/connection/{rework => }/tcp/TcpData.java | 2 +- .../services/connection/{rework => }/tcp/TcpDetails.java | 4 ++-- .../connection/{rework => }/tcp/TcpDispatcher.java | 8 ++++---- .../services/connection/{rework => }/tcp/TcpServer.java | 6 +++--- .../services/connection/{rework => }/tcp/TcpTimeouts.java | 2 +- .../services/connection/{rework => }/udp/UdpConn.java | 2 +- .../services/connection/{rework => }/udp/UdpDetails.java | 4 ++-- 22 files changed, 35 insertions(+), 35 deletions(-) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/ConnectionData.java (95%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/ConnectionDetails.java (80%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/RawMessage.java (79%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/Receiver.java (96%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/Sender.java (96%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/SenderData.java (95%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/StaticSender.java (95%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/Tuple.java (90%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{ => legacy}/SerialConn.java (95%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{ => legacy}/SerialData.java (84%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{ => legacy}/TcpConn.java (99%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/serial/SerialConn.java (93%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/serial/SerialDetails.java (70%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/tcp/TcpClient.java (95%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/tcp/TcpData.java (84%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/tcp/TcpDetails.java (73%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/tcp/TcpDispatcher.java (87%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/tcp/TcpServer.java (97%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/tcp/TcpTimeouts.java (86%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/udp/UdpConn.java (62%) rename modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/{rework => }/udp/UdpDetails.java (64%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 204ff3d2a..07f949bd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ ### Features * **api:** Add new configuration provider which enables default values ([a973cd1](https://github.com/wuespace/telestion-core/commit/a973cd1f0d30513bcfcae655db156138f74b145a)) -* **connection:** Add configuration of baud rate to `SerialConn` verticle. Usages of the `de.wuespace.telestion.services.connection.rework.serial.SerialConn` now requires an additional parameter: `int baudRate`. To migrate, add this parameter to any application configuration using this verticle. The value used before is `9600`. Therefore, you can use `"baudRate": 9600` to match the old default configuration. ([ae4dad2](https://github.com/wuespace/telestion-core/commit/ae4dad2c9732047551ea74cca5b35b45bfd47f83)) +* **connection:** Add configuration of baud rate to `SerialConn` verticle. Usages of the `de.wuespace.telestion.services.connection.serial.SerialConn` now requires an additional parameter: `int baudRate`. To migrate, add this parameter to any application configuration using this verticle. The value used before is `9600`. Therefore, you can use `"baudRate": 9600` to match the old default configuration. ([ae4dad2](https://github.com/wuespace/telestion-core/commit/ae4dad2c9732047551ea74cca5b35b45bfd47f83)) diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/ConnectionData.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/ConnectionData.java similarity index 95% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/ConnectionData.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/ConnectionData.java index ff73190d3..d340a1306 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/ConnectionData.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/ConnectionData.java @@ -1,4 +1,4 @@ -package de.wuespace.telestion.services.connection.rework; +package de.wuespace.telestion.services.connection; import com.fasterxml.jackson.annotation.JsonProperty; import de.wuespace.telestion.api.message.JsonMessage; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/ConnectionDetails.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/ConnectionDetails.java similarity index 80% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/ConnectionDetails.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/ConnectionDetails.java index 527d5d999..93b62f422 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/ConnectionDetails.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/ConnectionDetails.java @@ -1,4 +1,4 @@ -package de.wuespace.telestion.services.connection.rework; +package de.wuespace.telestion.services.connection; import com.fasterxml.jackson.annotation.JsonTypeInfo; import de.wuespace.telestion.api.message.JsonMessage; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/RawMessage.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/RawMessage.java similarity index 79% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/RawMessage.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/RawMessage.java index a987e636b..25667d323 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/RawMessage.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/RawMessage.java @@ -1,4 +1,4 @@ -package de.wuespace.telestion.services.connection.rework; +package de.wuespace.telestion.services.connection; import com.fasterxml.jackson.annotation.JsonProperty; import de.wuespace.telestion.api.message.JsonMessage; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/Receiver.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/Receiver.java similarity index 96% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/Receiver.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/Receiver.java index c5a2c0bbf..a011f0a94 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/Receiver.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/Receiver.java @@ -1,4 +1,4 @@ -package de.wuespace.telestion.services.connection.rework; +package de.wuespace.telestion.services.connection; import com.fasterxml.jackson.annotation.JsonProperty; import io.vertx.core.AbstractVerticle; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/Sender.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/Sender.java similarity index 96% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/Sender.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/Sender.java index d076a328a..a648d3b7b 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/Sender.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/Sender.java @@ -1,4 +1,4 @@ -package de.wuespace.telestion.services.connection.rework; +package de.wuespace.telestion.services.connection; import com.fasterxml.jackson.annotation.JsonProperty; import de.wuespace.telestion.api.config.Config; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/SenderData.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/SenderData.java similarity index 95% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/SenderData.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/SenderData.java index 3df451606..e53f5ea5d 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/SenderData.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/SenderData.java @@ -1,4 +1,4 @@ -package de.wuespace.telestion.services.connection.rework; +package de.wuespace.telestion.services.connection; import com.fasterxml.jackson.annotation.JsonProperty; import de.wuespace.telestion.api.message.JsonMessage; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/StaticSender.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/StaticSender.java similarity index 95% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/StaticSender.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/StaticSender.java index 32971826c..a1fa268c6 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/StaticSender.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/StaticSender.java @@ -1,4 +1,4 @@ -package de.wuespace.telestion.services.connection.rework; +package de.wuespace.telestion.services.connection; import com.fasterxml.jackson.annotation.JsonProperty; import de.wuespace.telestion.api.config.Config; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/Tuple.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/Tuple.java similarity index 90% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/Tuple.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/Tuple.java index dc7fd27ef..05e3d9f1f 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/Tuple.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/Tuple.java @@ -1,4 +1,4 @@ -package de.wuespace.telestion.services.connection.rework; +package de.wuespace.telestion.services.connection; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/SerialConn.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/legacy/SerialConn.java similarity index 95% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/SerialConn.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/legacy/SerialConn.java index 949cfaec7..6b5666300 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/SerialConn.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/legacy/SerialConn.java @@ -1,6 +1,7 @@ -package de.wuespace.telestion.services.connection; +package de.wuespace.telestion.services.connection.legacy; import com.fasterxml.jackson.annotation.JsonProperty; +import de.wuespace.telestion.services.connection.SerialData; import de.wuespace.telestion.services.monitoring.MessageLogger; import io.vertx.core.AbstractVerticle; import io.vertx.core.Promise; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/SerialData.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/legacy/SerialData.java similarity index 84% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/SerialData.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/legacy/SerialData.java index 5ec5a6c6f..c3f74a77d 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/SerialData.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/legacy/SerialData.java @@ -1,4 +1,4 @@ -package de.wuespace.telestion.services.connection; +package de.wuespace.telestion.services.connection.legacy; import com.fasterxml.jackson.annotation.JsonProperty; import de.wuespace.telestion.api.message.JsonMessage; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/TcpConn.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/legacy/TcpConn.java similarity index 99% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/TcpConn.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/legacy/TcpConn.java index e9e60ea41..751adbc88 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/TcpConn.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/legacy/TcpConn.java @@ -1,4 +1,4 @@ -package de.wuespace.telestion.services.connection; +package de.wuespace.telestion.services.connection.legacy; import com.fasterxml.jackson.annotation.JsonProperty; import de.wuespace.telestion.api.config.Config; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/serial/SerialConn.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/serial/SerialConn.java similarity index 93% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/serial/SerialConn.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/serial/SerialConn.java index 11f3bce8b..cb9eb8683 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/serial/SerialConn.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/serial/SerialConn.java @@ -1,11 +1,11 @@ -package de.wuespace.telestion.services.connection.rework.serial; +package de.wuespace.telestion.services.connection.serial; import com.fasterxml.jackson.annotation.JsonProperty; import com.fazecast.jSerialComm.SerialPort; import de.wuespace.telestion.api.config.Config; import de.wuespace.telestion.api.message.JsonMessage; -import de.wuespace.telestion.services.connection.rework.ConnectionData; -import de.wuespace.telestion.services.connection.rework.SenderData; +import de.wuespace.telestion.services.connection.ConnectionData; +import de.wuespace.telestion.services.connection.SenderData; import io.vertx.core.AbstractVerticle; import io.vertx.core.Promise; import org.slf4j.Logger; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/serial/SerialDetails.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/serial/SerialDetails.java similarity index 70% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/serial/SerialDetails.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/serial/SerialDetails.java index 697daccfa..52dbc13f4 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/serial/SerialDetails.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/serial/SerialDetails.java @@ -1,7 +1,7 @@ -package de.wuespace.telestion.services.connection.rework.serial; +package de.wuespace.telestion.services.connection.serial; import com.fasterxml.jackson.annotation.JsonProperty; -import de.wuespace.telestion.services.connection.rework.ConnectionDetails; +import de.wuespace.telestion.services.connection.ConnectionDetails; /** * diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpClient.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpClient.java similarity index 95% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpClient.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpClient.java index 0490c8976..b8bc2fded 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpClient.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpClient.java @@ -1,14 +1,13 @@ -package de.wuespace.telestion.services.connection.rework.tcp; +package de.wuespace.telestion.services.connection.tcp; import com.fasterxml.jackson.annotation.JsonProperty; import de.wuespace.telestion.api.config.Config; import de.wuespace.telestion.api.message.JsonMessage; -import de.wuespace.telestion.services.connection.rework.ConnectionData; -import de.wuespace.telestion.services.connection.rework.Tuple; +import de.wuespace.telestion.services.connection.ConnectionData; +import de.wuespace.telestion.services.connection.Tuple; import io.reactivex.annotations.NonNull; import io.vertx.core.AbstractVerticle; import io.vertx.core.CompositeFuture; -import io.vertx.core.Handler; import io.vertx.core.Promise; import io.vertx.core.buffer.Buffer; import io.vertx.core.net.NetClient; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpData.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpData.java similarity index 84% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpData.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpData.java index 69e43cfb0..74b897138 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpData.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpData.java @@ -1,4 +1,4 @@ -package de.wuespace.telestion.services.connection.rework.tcp; +package de.wuespace.telestion.services.connection.tcp; import com.fasterxml.jackson.annotation.JsonProperty; import de.wuespace.telestion.api.message.JsonMessage; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpDetails.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpDetails.java similarity index 73% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpDetails.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpDetails.java index b18fa9ff8..ad952063e 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpDetails.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpDetails.java @@ -1,7 +1,7 @@ -package de.wuespace.telestion.services.connection.rework.tcp; +package de.wuespace.telestion.services.connection.tcp; import com.fasterxml.jackson.annotation.JsonProperty; -import de.wuespace.telestion.services.connection.rework.ConnectionDetails; +import de.wuespace.telestion.services.connection.ConnectionDetails; public record TcpDetails(@JsonProperty String ip, @JsonProperty int port, diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpDispatcher.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpDispatcher.java similarity index 87% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpDispatcher.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpDispatcher.java index 491626b96..a1c65f3b7 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpDispatcher.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpDispatcher.java @@ -1,11 +1,11 @@ -package de.wuespace.telestion.services.connection.rework.tcp; +package de.wuespace.telestion.services.connection.tcp; import com.fasterxml.jackson.annotation.JsonProperty; import de.wuespace.telestion.api.config.Config; import de.wuespace.telestion.api.message.JsonMessage; -import de.wuespace.telestion.services.connection.rework.ConnectionData; -import de.wuespace.telestion.services.connection.rework.SenderData; -import de.wuespace.telestion.services.connection.rework.Tuple; +import de.wuespace.telestion.services.connection.ConnectionData; +import de.wuespace.telestion.services.connection.SenderData; +import de.wuespace.telestion.services.connection.Tuple; import io.vertx.core.AbstractVerticle; import io.vertx.core.Promise; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpServer.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpServer.java similarity index 97% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpServer.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpServer.java index 5f3579376..f93ab93b4 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpServer.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpServer.java @@ -1,10 +1,10 @@ -package de.wuespace.telestion.services.connection.rework.tcp; +package de.wuespace.telestion.services.connection.tcp; import com.fasterxml.jackson.annotation.JsonProperty; import de.wuespace.telestion.api.config.Config; import de.wuespace.telestion.api.message.JsonMessage; -import de.wuespace.telestion.services.connection.rework.ConnectionData; -import de.wuespace.telestion.services.connection.rework.Tuple; +import de.wuespace.telestion.services.connection.ConnectionData; +import de.wuespace.telestion.services.connection.Tuple; import io.reactivex.annotations.NonNull; import io.vertx.core.*; import io.vertx.core.buffer.Buffer; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpTimeouts.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpTimeouts.java similarity index 86% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpTimeouts.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpTimeouts.java index 602b3144f..53c439bc3 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/tcp/TcpTimeouts.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/tcp/TcpTimeouts.java @@ -1,4 +1,4 @@ -package de.wuespace.telestion.services.connection.rework.tcp; +package de.wuespace.telestion.services.connection.tcp; import java.time.Duration; diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/udp/UdpConn.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/udp/UdpConn.java similarity index 62% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/udp/UdpConn.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/udp/UdpConn.java index 5cf3eecb4..62beed10b 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/udp/UdpConn.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/udp/UdpConn.java @@ -1,4 +1,4 @@ -package de.wuespace.telestion.services.connection.rework.udp; +package de.wuespace.telestion.services.connection.udp; public class UdpConn { public UdpConn() { diff --git a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/udp/UdpDetails.java b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/udp/UdpDetails.java similarity index 64% rename from modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/udp/UdpDetails.java rename to modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/udp/UdpDetails.java index 54ad70700..d5b0c51fc 100644 --- a/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/rework/udp/UdpDetails.java +++ b/modules/telestion-services/src/main/java/de/wuespace/telestion/services/connection/udp/UdpDetails.java @@ -1,7 +1,7 @@ -package de.wuespace.telestion.services.connection.rework.udp; +package de.wuespace.telestion.services.connection.udp; import com.fasterxml.jackson.annotation.JsonProperty; -import de.wuespace.telestion.services.connection.rework.ConnectionDetails; +import de.wuespace.telestion.services.connection.ConnectionDetails; public record UdpDetails(@JsonProperty String ip, @JsonProperty int port,