feat(api): Update request methods in WithEventBus trait

Author: fussel178

modules/telestion-api/src/main/java/de/wuespace/telestion/api/verticle/trait/DecodedMessage.java

@@ -3,9 +3,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import de.wuespace.telestion.api.message.JsonMessage;
 import io.vertx.core.eventbus.Message;
+import io.vertx.core.json.JsonObject;
 
-public record DecodedMessage<V extends JsonMessage, T>(
+public record DecodedMessage<V extends JsonMessage, T extends JsonObject>(
 		@JsonProperty V body,
 		@JsonProperty Message<T> message
-		) implements JsonMessage {
+) implements JsonMessage {
 }

modules/telestion-api/src/main/java/de/wuespace/telestion/api/verticle/trait/WithEventBus.java

@@ -32,6 +32,7 @@
  */
 public interface WithEventBus extends Verticle {
 	/* PUBLISH */
+
 	/**
 	 * @see io.vertx.core.eventbus.EventBus#publish(String, Object, DeliveryOptions)
 	 */
@@ -61,6 +62,7 @@ default void publish(String address, JsonMessage message) {
 	}
 
 	/* SEND */
+
 	/**
 	 * @see io.vertx.core.eventbus.EventBus#send(String, Object, DeliveryOptions)
 	 */
@@ -90,69 +92,83 @@ default void send(String address, JsonMessage message) {
 	}
 
 	/* REQUEST */
+
 	/**
-	 * @param responseType the type of the response to map to
 	 * @see io.vertx.core.eventbus.EventBus#request(String, Object, DeliveryOptions)
 	 */
-	default <V extends JsonMessage, T> Future<DecodedMessage<V, T>> request(
-			String address, Object request, DeliveryOptions options, Class<V> responseType) {
-		return getVertx().eventBus().<T>request(address, request, options)
-				.map(raw -> new DecodedMessage<>(JsonMessage.from(raw.body(), responseType), raw));
+	default <T> Future<Message<T>> request(String address, Object request, DeliveryOptions options) {
+		return getVertx().eventBus().request(address, request, options);
 	}
 
-	default <V extends JsonMessage, T> Future<DecodedMessage<V, T>> request(
-			String address, JsonMessage request, DeliveryOptions options, Class<V> responseType) {
-		return request(address, request.json(), options, responseType);
+	/**
+	 * @see io.vertx.core.eventbus.EventBus#request(String, Object)
+	 */
+	default <T> Future<Message<T>> request(String address, Object request) {
+		return getVertx().eventBus().request(address, request);
+	}
+
+	/**
+	 * @param responseType the type of the response to map to
+	 * @see io.vertx.core.eventbus.EventBus#request(String, Object, DeliveryOptions)
+	 */
+	default <V extends JsonMessage, T extends JsonObject> Future<DecodedMessage<V, T>> request(
+			String address, Object request, DeliveryOptions options, Class<V> responseType
+	) {
+		return this.<T>request(address, request, options)
+				.map(raw -> new DecodedMessage<>(raw.body().mapTo(responseType), raw));
 	}
 
 	/**
 	 * @param responseType the type of the response to map to
 	 * @see io.vertx.core.eventbus.EventBus#request(String, Object)
 	 */
-	default <V extends JsonMessage, T> Future<DecodedMessage<V, T>> request(
-			String address, Object request, Class<V> responseType) {
-		return getVertx().eventBus().<T>request(address, request)
-				.map(raw -> new DecodedMessage<>(((JsonObject) raw.body()).mapTo(responseType), raw));
+	default <V extends JsonMessage, T extends JsonObject> Future<DecodedMessage<V, T>> request(
+			String address, Object request, Class<V> responseType
+	) {
+		return this.<T>request(address, request)
+				.map(raw -> new DecodedMessage<>(raw.body().mapTo(responseType), raw));
 	}
 
-	default <V extends JsonMessage, T> Future<DecodedMessage<V, T>> request(
-			String address, JsonMessage request, Class<V> responseType) {
+	/**
+	 * @param responseType the type of the response to map to
+	 * @see io.vertx.core.eventbus.EventBus#request(String, Object, DeliveryOptions)
+	 */
+	default <V extends JsonMessage, T extends JsonObject> Future<DecodedMessage<V, T>> request(
+			String address, JsonMessage request, DeliveryOptions options, Class<V> responseType
+	) {
+		return request(address, request.json(), options, responseType);
+	}
+
+	/**
+	 * @param responseType the type of the response to map to
+	 * @see io.vertx.core.eventbus.EventBus#request(String, Object)
+	 */
+	default <V extends JsonMessage, T extends JsonObject> Future<DecodedMessage<V, T>> request(
+			String address, JsonMessage request, Class<V> responseType
+	) {
 		return request(address, request.json(), responseType);
 	}
 
 	/* REGISTER/CONSUME */
+
 	/**
-	 * Registers a handler onto an eventbus channel.
-	 *
-	 * @param address the eventbus address name
-	 * @param handler the handler that gets called when a new message arrives at the specified eventbus address
 	 * @see io.vertx.core.eventbus.EventBus#consumer(String, Handler)
 	 */
 	default <T> void register(String address, Handler<Message<T>> handler) {
 		getVertx().eventBus().consumer(address, handler);
 	}
 
 	/**
-	 * Registers a handler onto an eventbus channel.
-	 * The received messages are mapped to the specified json type before handing over to the handler.
-	 *
-	 * @param address the eventbus address name
-	 * @param handler the handler that gets called when a new message arrives at the specified eventbus address
-	 * @param type    the json type to map to
+	 * @param type the type of received message to map to
 	 * @see io.vertx.core.eventbus.EventBus#consumer(String, Handler)
 	 */
 	default <V extends JsonMessage> void register(String address, MessageHandler<V> handler, Class<V> type) {
 		register(address, message -> JsonMessage.on(type, message, handler::handle));
 	}
 
 	/**
-	 * Registers a handler onto an eventbus channel.
-	 * The received messages are mapped to the specified json type before handing over to the handler.
-	 * The handler gets the plain message object received from the eventbus, too.
-	 *
-	 * @param address the eventbus address name
-	 * @param handler the handler that gets called when a new message arrives at the specified eventbus address
-	 * @param type    the json type to map to
+	 * @param type the type of received message to map to
+	 * @see io.vertx.core.eventbus.EventBus#consumer(String, Handler)
 	 */
 	default <V extends JsonMessage, T> void register(String address, ExtendedMessageHandler<V, T> handler, Class<V> type) {
 		this.<T>register(address, message -> JsonMessage.on(type, message, body -> handler.handle(body, message)));