From 2282a9d94be2f4bc8945f880a29c9104da084473 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Mon, 17 Jun 2024 14:36:19 +0200 Subject: [PATCH] Update to vertx5-parent --- pom.xml | 41 ++++-- .../io/vertx/ext/stomp/FrameConverter.java | 99 -------------- .../stomp/StompClientOptionsConverter.java | 116 ---------------- .../stomp/StompServerOptionsConverter.java | 128 ------------------ 4 files changed, 32 insertions(+), 352 deletions(-) delete mode 100644 src/main/generated/io/vertx/ext/stomp/FrameConverter.java delete mode 100644 src/main/generated/io/vertx/ext/stomp/StompClientOptionsConverter.java delete mode 100644 src/main/generated/io/vertx/ext/stomp/StompServerOptionsConverter.java diff --git a/pom.xml b/pom.xml index 2ec52e0..9cfe1cf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ io.vertx - vertx-ext-parent - 38 + vertx5-parent + 3 vertx-stomp @@ -118,17 +118,29 @@ - - - ${project.basedir}/src/test/resources - true - - + + + + + maven-compiler-plugin + + + default-compile + compile + + + io.vertx.codegen.CodeGenProcessor + io.vertx.docgen.JavaDocGenProcessor + + + + + + maven-failsafe-plugin - 2.19.1 @@ -143,6 +155,17 @@ + + maven-assembly-plugin + + + package-docs + + single + + + + diff --git a/src/main/generated/io/vertx/ext/stomp/FrameConverter.java b/src/main/generated/io/vertx/ext/stomp/FrameConverter.java deleted file mode 100644 index f56b4df..0000000 --- a/src/main/generated/io/vertx/ext/stomp/FrameConverter.java +++ /dev/null @@ -1,99 +0,0 @@ -package io.vertx.ext.stomp; - -import io.vertx.core.json.JsonObject; -import io.vertx.core.json.JsonArray; -import java.time.Instant; -import java.time.format.DateTimeFormatter; -import java.util.Base64; - -/** - * Converter and mapper for {@link io.vertx.ext.stomp.Frame}. - * NOTE: This class has been automatically generated from the {@link io.vertx.ext.stomp.Frame} original class using Vert.x codegen. - */ -public class FrameConverter { - - private static final Base64.Decoder BASE64_DECODER = Base64.getUrlDecoder(); - private static final Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding(); - - static void fromJson(Iterable> json, Frame obj) { - for (java.util.Map.Entry member : json) { - switch (member.getKey()) { - case "headers": - if (member.getValue() instanceof JsonObject) { - ((Iterable>)member.getValue()).forEach(entry -> { - if (entry.getValue() instanceof String) - obj.addHeader(entry.getKey(), (String)entry.getValue()); - }); - } - break; - case "ack": - break; - case "command": - if (member.getValue() instanceof String) { - obj.setCommand(io.vertx.ext.stomp.Command.valueOf((String)member.getValue())); - } - break; - case "body": - if (member.getValue() instanceof String) { - obj.setBody(io.vertx.core.buffer.Buffer.buffer(BASE64_DECODER.decode((String)member.getValue()))); - } - break; - case "bodyAsString": - break; - case "destination": - if (member.getValue() instanceof String) { - obj.setDestination((String)member.getValue()); - } - break; - case "transaction": - if (member.getValue() instanceof String) { - obj.setTransaction((String)member.getValue()); - } - break; - case "id": - if (member.getValue() instanceof String) { - obj.setId((String)member.getValue()); - } - break; - case "receipt": - break; - } - } - } - - static void toJson(Frame obj, JsonObject json) { - toJson(obj, json.getMap()); - } - - static void toJson(Frame obj, java.util.Map json) { - if (obj.getHeaders() != null) { - JsonObject map = new JsonObject(); - obj.getHeaders().forEach((key, value) -> map.put(key, value)); - json.put("headers", map); - } - if (obj.getAck() != null) { - json.put("ack", obj.getAck()); - } - if (obj.getCommand() != null) { - json.put("command", obj.getCommand().name()); - } - if (obj.getBody() != null) { - json.put("body", BASE64_ENCODER.encodeToString(obj.getBody().getBytes())); - } - if (obj.getBodyAsString() != null) { - json.put("bodyAsString", obj.getBodyAsString()); - } - if (obj.getDestination() != null) { - json.put("destination", obj.getDestination()); - } - if (obj.getTransaction() != null) { - json.put("transaction", obj.getTransaction()); - } - if (obj.getId() != null) { - json.put("id", obj.getId()); - } - if (obj.getReceipt() != null) { - json.put("receipt", obj.getReceipt()); - } - } -} diff --git a/src/main/generated/io/vertx/ext/stomp/StompClientOptionsConverter.java b/src/main/generated/io/vertx/ext/stomp/StompClientOptionsConverter.java deleted file mode 100644 index 70ac038..0000000 --- a/src/main/generated/io/vertx/ext/stomp/StompClientOptionsConverter.java +++ /dev/null @@ -1,116 +0,0 @@ -package io.vertx.ext.stomp; - -import io.vertx.core.json.JsonObject; -import io.vertx.core.json.JsonArray; -import java.time.Instant; -import java.time.format.DateTimeFormatter; -import java.util.Base64; - -/** - * Converter and mapper for {@link io.vertx.ext.stomp.StompClientOptions}. - * NOTE: This class has been automatically generated from the {@link io.vertx.ext.stomp.StompClientOptions} original class using Vert.x codegen. - */ -public class StompClientOptionsConverter { - - private static final Base64.Decoder BASE64_DECODER = Base64.getUrlDecoder(); - private static final Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding(); - - static void fromJson(Iterable> json, StompClientOptions obj) { - for (java.util.Map.Entry member : json) { - switch (member.getKey()) { - case "host": - if (member.getValue() instanceof String) { - obj.setHost((String)member.getValue()); - } - break; - case "login": - if (member.getValue() instanceof String) { - obj.setLogin((String)member.getValue()); - } - break; - case "passcode": - if (member.getValue() instanceof String) { - obj.setPasscode((String)member.getValue()); - } - break; - case "port": - if (member.getValue() instanceof Number) { - obj.setPort(((Number)member.getValue()).intValue()); - } - break; - case "acceptedVersions": - if (member.getValue() instanceof JsonArray) { - java.util.ArrayList list = new java.util.ArrayList<>(); - ((Iterable)member.getValue()).forEach( item -> { - if (item instanceof String) - list.add((String)item); - }); - obj.setAcceptedVersions(list); - } - break; - case "autoComputeContentLength": - if (member.getValue() instanceof Boolean) { - obj.setAutoComputeContentLength((Boolean)member.getValue()); - } - break; - case "useStompFrame": - if (member.getValue() instanceof Boolean) { - obj.setUseStompFrame((Boolean)member.getValue()); - } - break; - case "bypassHostHeader": - if (member.getValue() instanceof Boolean) { - obj.setBypassHostHeader((Boolean)member.getValue()); - } - break; - case "heartbeat": - if (member.getValue() instanceof JsonObject) { - obj.setHeartbeat(((JsonObject)member.getValue()).copy()); - } - break; - case "virtualHost": - if (member.getValue() instanceof String) { - obj.setVirtualHost((String)member.getValue()); - } - break; - case "trailingLine": - if (member.getValue() instanceof Boolean) { - obj.setTrailingLine((Boolean)member.getValue()); - } - break; - } - } - } - - static void toJson(StompClientOptions obj, JsonObject json) { - toJson(obj, json.getMap()); - } - - static void toJson(StompClientOptions obj, java.util.Map json) { - if (obj.getHost() != null) { - json.put("host", obj.getHost()); - } - if (obj.getLogin() != null) { - json.put("login", obj.getLogin()); - } - if (obj.getPasscode() != null) { - json.put("passcode", obj.getPasscode()); - } - json.put("port", obj.getPort()); - if (obj.getAcceptedVersions() != null) { - JsonArray array = new JsonArray(); - obj.getAcceptedVersions().forEach(item -> array.add(item)); - json.put("acceptedVersions", array); - } - json.put("autoComputeContentLength", obj.isAutoComputeContentLength()); - json.put("useStompFrame", obj.isUseStompFrame()); - json.put("bypassHostHeader", obj.isBypassHostHeader()); - if (obj.getHeartbeat() != null) { - json.put("heartbeat", obj.getHeartbeat()); - } - if (obj.getVirtualHost() != null) { - json.put("virtualHost", obj.getVirtualHost()); - } - json.put("trailingLine", obj.isTrailingLine()); - } -} diff --git a/src/main/generated/io/vertx/ext/stomp/StompServerOptionsConverter.java b/src/main/generated/io/vertx/ext/stomp/StompServerOptionsConverter.java deleted file mode 100644 index 70eaa5f..0000000 --- a/src/main/generated/io/vertx/ext/stomp/StompServerOptionsConverter.java +++ /dev/null @@ -1,128 +0,0 @@ -package io.vertx.ext.stomp; - -import io.vertx.core.json.JsonObject; -import io.vertx.core.json.JsonArray; -import java.time.Instant; -import java.time.format.DateTimeFormatter; -import java.util.Base64; - -/** - * Converter and mapper for {@link io.vertx.ext.stomp.StompServerOptions}. - * NOTE: This class has been automatically generated from the {@link io.vertx.ext.stomp.StompServerOptions} original class using Vert.x codegen. - */ -public class StompServerOptionsConverter { - - private static final Base64.Decoder BASE64_DECODER = Base64.getUrlDecoder(); - private static final Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding(); - - static void fromJson(Iterable> json, StompServerOptions obj) { - for (java.util.Map.Entry member : json) { - switch (member.getKey()) { - case "maxBodyLength": - if (member.getValue() instanceof Number) { - obj.setMaxBodyLength(((Number)member.getValue()).intValue()); - } - break; - case "maxHeaderLength": - if (member.getValue() instanceof Number) { - obj.setMaxHeaderLength(((Number)member.getValue()).intValue()); - } - break; - case "maxHeaders": - if (member.getValue() instanceof Number) { - obj.setMaxHeaders(((Number)member.getValue()).intValue()); - } - break; - case "supportedVersions": - if (member.getValue() instanceof JsonArray) { - java.util.ArrayList list = new java.util.ArrayList<>(); - ((Iterable)member.getValue()).forEach( item -> { - if (item instanceof String) - list.add((String)item); - }); - obj.setSupportedVersions(list); - } - break; - case "secured": - if (member.getValue() instanceof Boolean) { - obj.setSecured((Boolean)member.getValue()); - } - break; - case "sendErrorOnNoSubscriptions": - if (member.getValue() instanceof Boolean) { - obj.setSendErrorOnNoSubscriptions((Boolean)member.getValue()); - } - break; - case "timeFactor": - if (member.getValue() instanceof Number) { - obj.setTimeFactor(((Number)member.getValue()).intValue()); - } - break; - case "heartbeat": - if (member.getValue() instanceof JsonObject) { - obj.setHeartbeat(((JsonObject)member.getValue()).copy()); - } - break; - case "maxFrameInTransaction": - if (member.getValue() instanceof Number) { - obj.setMaxFrameInTransaction(((Number)member.getValue()).intValue()); - } - break; - case "transactionChunkSize": - if (member.getValue() instanceof Number) { - obj.setTransactionChunkSize(((Number)member.getValue()).intValue()); - } - break; - case "maxSubscriptionsByClient": - if (member.getValue() instanceof Number) { - obj.setMaxSubscriptionsByClient(((Number)member.getValue()).intValue()); - } - break; - case "websocketBridge": - if (member.getValue() instanceof Boolean) { - obj.setWebsocketBridge((Boolean)member.getValue()); - } - break; - case "websocketPath": - if (member.getValue() instanceof String) { - obj.setWebsocketPath((String)member.getValue()); - } - break; - case "trailingLine": - if (member.getValue() instanceof Boolean) { - obj.setTrailingLine((Boolean)member.getValue()); - } - break; - } - } - } - - static void toJson(StompServerOptions obj, JsonObject json) { - toJson(obj, json.getMap()); - } - - static void toJson(StompServerOptions obj, java.util.Map json) { - json.put("maxBodyLength", obj.getMaxBodyLength()); - json.put("maxHeaderLength", obj.getMaxHeaderLength()); - json.put("maxHeaders", obj.getMaxHeaders()); - if (obj.getSupportedVersions() != null) { - JsonArray array = new JsonArray(); - obj.getSupportedVersions().forEach(item -> array.add(item)); - json.put("supportedVersions", array); - } - json.put("secured", obj.isSecured()); - json.put("sendErrorOnNoSubscriptions", obj.isSendErrorOnNoSubscriptions()); - json.put("timeFactor", obj.getTimeFactor()); - if (obj.getHeartbeat() != null) { - json.put("heartbeat", obj.getHeartbeat()); - } - json.put("maxFrameInTransaction", obj.getMaxFrameInTransaction()); - json.put("transactionChunkSize", obj.getTransactionChunkSize()); - json.put("maxSubscriptionsByClient", obj.getMaxSubscriptionsByClient()); - json.put("websocketBridge", obj.isWebsocketBridge()); - if (obj.getWebsocketPath() != null) { - json.put("websocketPath", obj.getWebsocketPath()); - } - json.put("trailingLine", obj.isTrailingLine()); - } -}