Use @JsonGen annotation

vert-x3 · Nov 30, 2023 · 8daf466 · 8daf466
1 parent 37f4b5c
commit 8daf466
Show file tree

Hide file tree

Showing 29 changed files with 87 additions and 29 deletions.
diff --git a/src/main/java/io/vertx/ext/consul/BlockingQueryOptions.java b/src/main/java/io/vertx/ext/consul/BlockingQueryOptions.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
@@ -24,7 +25,8 @@
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  * @see <a href="https://www.consul.io/docs/agent/http.html">Blocking Queries documentation</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class BlockingQueryOptions {
 
   private long index;

diff --git a/src/main/java/io/vertx/ext/consul/Check.java b/src/main/java/io/vertx/ext/consul/Check.java
@@ -16,14 +16,16 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
  * Holds check properties
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class Check {
 
   private String id;

diff --git a/src/main/java/io/vertx/ext/consul/CheckList.java b/src/main/java/io/vertx/ext/consul/CheckList.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.ArrayList;
@@ -27,7 +28,8 @@
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class CheckList {
 
   private long index;

diff --git a/src/main/java/io/vertx/ext/consul/CheckOptions.java b/src/main/java/io/vertx/ext/consul/CheckOptions.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.List;
@@ -26,7 +27,8 @@
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class CheckOptions {
 
   private String id;

diff --git a/src/main/java/io/vertx/ext/consul/CheckQueryOptions.java b/src/main/java/io/vertx/ext/consul/CheckQueryOptions.java
@@ -16,14 +16,16 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
  * Options used to requesting list of checks
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class CheckQueryOptions {
 
   private String near;

diff --git a/src/main/java/io/vertx/ext/consul/ConsulClientOptions.java b/src/main/java/io/vertx/ext/consul/ConsulClientOptions.java
@@ -17,6 +17,7 @@
 
 import io.vertx.codegen.annotations.DataObject;
 import io.vertx.codegen.annotations.GenIgnore;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.VertxException;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.Http2Settings;
@@ -35,7 +36,8 @@
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class ConsulClientOptions extends WebClientOptions {
 
   private static final String CONSUL_DEFAULT_HOST = "localhost";

diff --git a/src/main/java/io/vertx/ext/consul/Coordinate.java b/src/main/java/io/vertx/ext/consul/Coordinate.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.List;
@@ -26,7 +27,8 @@
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  * @see <a href="https://www.consul.io/docs/internals/coordinates.html">Network coordinates</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class Coordinate {
 
   private String node;

diff --git a/src/main/java/io/vertx/ext/consul/CoordinateList.java b/src/main/java/io/vertx/ext/consul/CoordinateList.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.ArrayList;
@@ -27,7 +28,8 @@
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class CoordinateList {
 
   private long index;

diff --git a/src/main/java/io/vertx/ext/consul/DcCoordinates.java b/src/main/java/io/vertx/ext/consul/DcCoordinates.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.List;
@@ -25,7 +26,8 @@
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class DcCoordinates {
 
   private String dc;

diff --git a/src/main/java/io/vertx/ext/consul/Event.java b/src/main/java/io/vertx/ext/consul/Event.java
@@ -16,14 +16,16 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
  * Holds properties of Consul event
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class Event {
 
   private String id;

diff --git a/src/main/java/io/vertx/ext/consul/EventList.java b/src/main/java/io/vertx/ext/consul/EventList.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.ArrayList;
@@ -27,7 +28,8 @@
 
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class EventList {
 
   private long index;

diff --git a/src/main/java/io/vertx/ext/consul/EventListOptions.java b/src/main/java/io/vertx/ext/consul/EventListOptions.java
@@ -16,14 +16,16 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
  * Holds options for events list request
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class EventListOptions {
 
   private String name;

diff --git a/src/main/java/io/vertx/ext/consul/EventOptions.java b/src/main/java/io/vertx/ext/consul/EventOptions.java
@@ -16,14 +16,16 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
  * Options used to trigger a new user event.
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class EventOptions {
 
   private String node;

diff --git a/src/main/java/io/vertx/ext/consul/KeyValue.java b/src/main/java/io/vertx/ext/consul/KeyValue.java
@@ -17,6 +17,7 @@
 
 import io.vertx.codegen.annotations.DataObject;
 import io.vertx.codegen.annotations.GenIgnore;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
@@ -25,7 +26,8 @@
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  * @see <a href="https://www.consul.io/docs/agent/http/kv.html">Consul key/value store</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class KeyValue implements TxnResult {
 
   private String key;

diff --git a/src/main/java/io/vertx/ext/consul/KeyValueList.java b/src/main/java/io/vertx/ext/consul/KeyValueList.java
@@ -17,6 +17,7 @@
 
 import io.vertx.codegen.annotations.DataObject;
 import io.vertx.codegen.annotations.GenIgnore;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.ArrayList;
@@ -28,7 +29,8 @@
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class KeyValueList {
 
   private long index;

diff --git a/src/main/java/io/vertx/ext/consul/Node.java b/src/main/java/io/vertx/ext/consul/Node.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.Map;
@@ -24,7 +25,8 @@
 /**
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class Node {
 
   private String id;

diff --git a/src/main/java/io/vertx/ext/consul/NodeList.java b/src/main/java/io/vertx/ext/consul/NodeList.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.ArrayList;
@@ -27,7 +28,8 @@
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class NodeList {
 
   private long index;

diff --git a/src/main/java/io/vertx/ext/consul/NodeQueryOptions.java b/src/main/java/io/vertx/ext/consul/NodeQueryOptions.java
@@ -16,14 +16,16 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
  * Options used to requesting list of nodes
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class NodeQueryOptions {
 
   private String near;

diff --git a/src/main/java/io/vertx/ext/consul/PreparedQueryExecuteOptions.java b/src/main/java/io/vertx/ext/consul/PreparedQueryExecuteOptions.java
@@ -16,14 +16,16 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
  * Options used to execute prepared query
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class PreparedQueryExecuteOptions {
 
   private int limit;

diff --git a/src/main/java/io/vertx/ext/consul/PreparedQueryExecuteResponse.java b/src/main/java/io/vertx/ext/consul/PreparedQueryExecuteResponse.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.List;
@@ -25,7 +26,8 @@
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class PreparedQueryExecuteResponse {
 
   private String service;

diff --git a/src/main/java/io/vertx/ext/consul/ServiceEntry.java b/src/main/java/io/vertx/ext/consul/ServiceEntry.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.consul.impl.Utils;
 
@@ -29,7 +30,8 @@
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class ServiceEntry {
 
   private Node node;

diff --git a/src/main/java/io/vertx/ext/consul/ServiceEntryList.java b/src/main/java/io/vertx/ext/consul/ServiceEntryList.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.consul;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.ArrayList;
@@ -27,7 +28,8 @@
  *
  * @author <a href="mailto:ruslan.sennov@gmail.com">Ruslan Sennov</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class ServiceEntryList {
 
   private long index;