Skip to content

Commit

Permalink
feat(connection): Enforce deprecation of old con. api by module design
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@cb0s
cb0s committed Nov 14, 2021
1 parent 356187d commit 822aba9
Show file tree
Hide file tree
Showing 22 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))



Expand Down
2 changes: 1 addition & 1 deletion ...ces/connection/rework/ConnectionData.java → ...n/services/connection/ConnectionData.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../connection/rework/ConnectionDetails.java → ...ervices/connection/ConnectionDetails.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ervices/connection/rework/RawMessage.java → ...stion/services/connection/RawMessage.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../services/connection/rework/Receiver.java → ...lestion/services/connection/Receiver.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...on/services/connection/rework/Sender.java → ...telestion/services/connection/Sender.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ervices/connection/rework/SenderData.java → ...stion/services/connection/SenderData.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...vices/connection/rework/StaticSender.java → ...ion/services/connection/StaticSender.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ion/services/connection/rework/Tuple.java → .../telestion/services/connection/Tuple.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.wuespace.telestion.services.connection.rework;
package de.wuespace.telestion.services.connection;

import com.fasterxml.jackson.annotation.JsonProperty;

Expand Down
3 changes: 2 additions & 1 deletion ...stion/services/connection/SerialConn.java → ...ervices/connection/legacy/SerialConn.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...stion/services/connection/SerialData.java → ...ervices/connection/legacy/SerialData.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...elestion/services/connection/TcpConn.java → ...n/services/connection/legacy/TcpConn.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions .../connection/rework/serial/SerialConn.java → ...ervices/connection/serial/SerialConn.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...nnection/rework/serial/SerialDetails.java → ...ices/connection/serial/SerialDetails.java
View file
Original file line number Diff line number Diff line change
@@ -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;

/**
*
Expand Down
7 changes: 3 additions & 4 deletions ...ices/connection/rework/tcp/TcpClient.java → ...on/services/connection/tcp/TcpClient.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rvices/connection/rework/tcp/TcpData.java → ...tion/services/connection/tcp/TcpData.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ces/connection/rework/tcp/TcpDetails.java → ...n/services/connection/tcp/TcpDetails.java
View file
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
8 changes: 4 additions & 4 deletions .../connection/rework/tcp/TcpDispatcher.java → ...ervices/connection/tcp/TcpDispatcher.java
View file
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
6 changes: 3 additions & 3 deletions ...ices/connection/rework/tcp/TcpServer.java → ...on/services/connection/tcp/TcpServer.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...es/connection/rework/tcp/TcpTimeouts.java → .../services/connection/tcp/TcpTimeouts.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.wuespace.telestion.services.connection.rework.tcp;
package de.wuespace.telestion.services.connection.tcp;

import java.time.Duration;

Expand Down
2 changes: 1 addition & 1 deletion ...rvices/connection/rework/udp/UdpConn.java → ...tion/services/connection/udp/UdpConn.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package de.wuespace.telestion.services.connection.rework.udp;
package de.wuespace.telestion.services.connection.udp;

public class UdpConn {
public UdpConn() {
Expand Down
4 changes: 2 additions & 2 deletions ...ces/connection/rework/udp/UdpDetails.java → ...n/services/connection/udp/UdpDetails.java
View file
Original file line number Diff line number Diff line change
@@ -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,
Expand Down

0 comments on commit 822aba9

Please sign in to comment.