Use @JsonGen annotation

vert-x3 · Nov 30, 2023 · c39ce0e · c39ce0e
1 parent b0860a7
commit c39ce0e
Show file tree

Hide file tree

Showing 19 changed files with 57 additions and 35 deletions.
diff --git a/vertx-web-api-service/src/main/java/io/vertx/ext/web/api/service/ServiceRequest.java b/vertx-web-api-service/src/main/java/io/vertx/ext/web/api/service/ServiceRequest.java
@@ -2,6 +2,7 @@
 
 import io.vertx.codegen.annotations.DataObject;
 import io.vertx.codegen.annotations.Fluent;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.MultiMap;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.json.JsonObject;
@@ -12,7 +13,8 @@
 /**
  * Data object that encapsulates all informations about an HTTP Request
  */
-@DataObject(generateConverter = true, publicConverter = false)
+@DataObject
+@JsonGen(publicConverter = false)
 public class ServiceRequest {
 
   /**

diff --git a/vertx-web-api-service/src/main/java/io/vertx/ext/web/api/service/ServiceResponse.java b/vertx-web-api-service/src/main/java/io/vertx/ext/web/api/service/ServiceResponse.java
@@ -3,6 +3,7 @@
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.vertx.codegen.annotations.DataObject;
 import io.vertx.codegen.annotations.Fluent;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.MultiMap;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpHeaders;
@@ -14,7 +15,8 @@
 /**
  * Data object that encapsulates all informations about an HTTP Response
  */
-@DataObject(generateConverter = true, publicConverter = false)
+@DataObject
+@JsonGen(publicConverter = false)
 public class ServiceResponse {
 
   private final static Integer DEFAULT_STATUS_CODE = 200;

diff --git a/vertx-web-api-service/src/test/java/io/vertx/ext/web/api/service/FilterData.java b/vertx-web-api-service/src/test/java/io/vertx/ext/web/api/service/FilterData.java
@@ -2,12 +2,14 @@
 
 import io.vertx.codegen.annotations.DataObject;
 import io.vertx.codegen.annotations.Fluent;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class FilterData {
 
   private List<String> from;

diff --git a/...b-client/src/main/generated/io/vertx/ext/web/client/CachingWebClientOptionsConverter.java b/...b-client/src/main/generated/io/vertx/ext/web/client/CachingWebClientOptionsConverter.java
@@ -17,7 +17,7 @@ public class CachingWebClientOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, CachingWebClientOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, CachingWebClientOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "enableVaryCaching":
@@ -51,11 +51,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(CachingWebClientOptions obj, JsonObject json) {
+   static void toJson(CachingWebClientOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(CachingWebClientOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(CachingWebClientOptions obj, java.util.Map<String, Object> json) {
     if (obj.getCachedStatusCodes() != null) {
       JsonArray array = new JsonArray();
       obj.getCachedStatusCodes().forEach(item -> array.add(item));

diff --git a/...eb-client/src/main/generated/io/vertx/ext/web/client/OAuth2WebClientOptionsConverter.java b/...eb-client/src/main/generated/io/vertx/ext/web/client/OAuth2WebClientOptionsConverter.java
@@ -17,7 +17,7 @@ public class OAuth2WebClientOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, OAuth2WebClientOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, OAuth2WebClientOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "renewTokenOnForbidden":
@@ -34,11 +34,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(OAuth2WebClientOptions obj, JsonObject json) {
+   static void toJson(OAuth2WebClientOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(OAuth2WebClientOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(OAuth2WebClientOptions obj, java.util.Map<String, Object> json) {
     json.put("renewTokenOnForbidden", obj.isRenewTokenOnForbidden());
     json.put("leeway", obj.getLeeway());
   }

diff --git a/vertx-web-client/src/main/generated/io/vertx/ext/web/client/WebClientOptionsConverter.java b/vertx-web-client/src/main/generated/io/vertx/ext/web/client/WebClientOptionsConverter.java
@@ -17,7 +17,7 @@ public class WebClientOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, WebClientOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, WebClientOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "userAgentEnabled":
@@ -44,11 +44,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(WebClientOptions obj, JsonObject json) {
+   static void toJson(WebClientOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(WebClientOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(WebClientOptions obj, java.util.Map<String, Object> json) {
     json.put("userAgentEnabled", obj.isUserAgentEnabled());
     if (obj.getUserAgent() != null) {
       json.put("userAgent", obj.getUserAgent());

diff --git a/vertx-web-client/src/main/java/io/vertx/ext/web/client/CachingWebClientOptions.java b/vertx-web-client/src/main/java/io/vertx/ext/web/client/CachingWebClientOptions.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.web.client;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.Http2Settings;
 import io.vertx.core.http.HttpMethod;
@@ -32,7 +33,8 @@
 /**
  * @author <a href="mailto:craigday3@gmail.com">Craig Day</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class CachingWebClientOptions extends WebClientOptions {
 
   public static final Set<Integer> DEFAULT_CACHED_STATUS_CODES = buildDefaultStatusCodes();

diff --git a/vertx-web-client/src/main/java/io/vertx/ext/web/client/OAuth2WebClientOptions.java b/vertx-web-client/src/main/java/io/vertx/ext/web/client/OAuth2WebClientOptions.java
@@ -17,12 +17,14 @@
 package io.vertx.ext.web.client;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
  * @author Paulo Lopes
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class OAuth2WebClientOptions {
 
   /**

diff --git a/vertx-web-client/src/main/java/io/vertx/ext/web/client/WebClientOptions.java b/vertx-web-client/src/main/java/io/vertx/ext/web/client/WebClientOptions.java
@@ -17,6 +17,7 @@
 package io.vertx.ext.web.client;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.Http2Settings;
 import io.vertx.core.http.HttpClientOptions;
@@ -34,7 +35,8 @@
 /**
  * @author Thomas Segismont
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class WebClientOptions extends HttpClientOptions {
 
   /**

diff --git a/...l/src/main/generated/io/vertx/ext/web/handler/graphql/GraphQLHandlerOptionsConverter.java b/...l/src/main/generated/io/vertx/ext/web/handler/graphql/GraphQLHandlerOptionsConverter.java
@@ -17,7 +17,7 @@ public class GraphQLHandlerOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, GraphQLHandlerOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, GraphQLHandlerOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "requestBatchingEnabled":
@@ -34,11 +34,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(GraphQLHandlerOptions obj, JsonObject json) {
+   static void toJson(GraphQLHandlerOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(GraphQLHandlerOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(GraphQLHandlerOptions obj, java.util.Map<String, Object> json) {
     json.put("requestBatchingEnabled", obj.isRequestBatchingEnabled());
     json.put("requestMultipartEnabled", obj.isRequestMultipartEnabled());
   }

diff --git a/.../src/main/generated/io/vertx/ext/web/handler/graphql/GraphiQLHandlerOptionsConverter.java b/.../src/main/generated/io/vertx/ext/web/handler/graphql/GraphiQLHandlerOptionsConverter.java
@@ -17,7 +17,7 @@ public class GraphiQLHandlerOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, GraphiQLHandlerOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, GraphiQLHandlerOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "enabled":
@@ -76,11 +76,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(GraphiQLHandlerOptions obj, JsonObject json) {
+   static void toJson(GraphiQLHandlerOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(GraphiQLHandlerOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(GraphiQLHandlerOptions obj, java.util.Map<String, Object> json) {
     json.put("enabled", obj.isEnabled());
     json.put("httpEnabled", obj.isHttpEnabled());
     if (obj.getGraphQLUri() != null) {

diff --git a/...hql/src/main/generated/io/vertx/ext/web/handler/graphql/ws/GraphQLWSOptionsConverter.java b/...hql/src/main/generated/io/vertx/ext/web/handler/graphql/ws/GraphQLWSOptionsConverter.java
@@ -17,7 +17,7 @@ public class GraphQLWSOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, GraphQLWSOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, GraphQLWSOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "connectionInitWaitTimeout":
@@ -29,11 +29,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(GraphQLWSOptions obj, JsonObject json) {
+   static void toJson(GraphQLWSOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(GraphQLWSOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(GraphQLWSOptions obj, java.util.Map<String, Object> json) {
     json.put("connectionInitWaitTimeout", obj.getConnectionInitWaitTimeout());
   }
 }
diff --git a/vertx-web-graphql/src/main/java/io/vertx/ext/web/handler/graphql/GraphQLHandlerOptions.java b/vertx-web-graphql/src/main/java/io/vertx/ext/web/handler/graphql/GraphQLHandlerOptions.java
@@ -17,14 +17,16 @@
 package io.vertx.ext.web.handler.graphql;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
  * Options for configuring the {@link GraphQLHandler}.
  *
  * @author Thomas Segismont
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class GraphQLHandlerOptions {
 
   /**

diff --git a/vertx-web-graphql/src/main/java/io/vertx/ext/web/handler/graphql/GraphiQLHandlerOptions.java b/vertx-web-graphql/src/main/java/io/vertx/ext/web/handler/graphql/GraphiQLHandlerOptions.java
@@ -17,6 +17,7 @@
 package io.vertx.ext.web.handler.graphql;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.common.WebEnvironment;
 
@@ -28,7 +29,8 @@
  *
  * @author Thomas Segismont
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class GraphiQLHandlerOptions {
 
   /**

diff --git a/vertx-web-graphql/src/main/java/io/vertx/ext/web/handler/graphql/ws/GraphQLWSOptions.java b/vertx-web-graphql/src/main/java/io/vertx/ext/web/handler/graphql/ws/GraphQLWSOptions.java
@@ -17,12 +17,14 @@
 package io.vertx.ext.web.handler.graphql.ws;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
  * Options for configuring the {@link GraphQLWSHandler}.
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class GraphQLWSOptions {
 
   /**

diff --git a/vertx-web/src/main/generated/io/vertx/ext/web/Http2PushMappingConverter.java b/vertx-web/src/main/generated/io/vertx/ext/web/Http2PushMappingConverter.java
@@ -17,7 +17,7 @@ public class Http2PushMappingConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, Http2PushMapping obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, Http2PushMapping obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "filePath":
@@ -39,11 +39,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(Http2PushMapping obj, JsonObject json) {
+   static void toJson(Http2PushMapping obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(Http2PushMapping obj, java.util.Map<String, Object> json) {
+   static void toJson(Http2PushMapping obj, java.util.Map<String, Object> json) {
     if (obj.getFilePath() != null) {
       json.put("filePath", obj.getFilePath());
     }

diff --git a/...-web/src/main/generated/io/vertx/ext/web/handler/sockjs/SockJSBridgeOptionsConverter.java b/...-web/src/main/generated/io/vertx/ext/web/handler/sockjs/SockJSBridgeOptionsConverter.java
@@ -17,7 +17,7 @@ public class SockJSBridgeOptionsConverter {
   private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
   private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
 
-  public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, SockJSBridgeOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, SockJSBridgeOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "maxAddressLength":
@@ -44,11 +44,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(SockJSBridgeOptions obj, JsonObject json) {
+   static void toJson(SockJSBridgeOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(SockJSBridgeOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(SockJSBridgeOptions obj, java.util.Map<String, Object> json) {
     json.put("maxAddressLength", obj.getMaxAddressLength());
     json.put("maxHandlersPerSocket", obj.getMaxHandlersPerSocket());
     json.put("pingTimeout", obj.getPingTimeout());

diff --git a/vertx-web/src/main/java/io/vertx/ext/web/Http2PushMapping.java b/vertx-web/src/main/java/io/vertx/ext/web/Http2PushMapping.java
@@ -1,9 +1,11 @@
 package io.vertx.ext.web;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class Http2PushMapping {
   private String filePath;
   private String extensionTarget;

diff --git a/vertx-web/src/main/java/io/vertx/ext/web/handler/sockjs/SockJSBridgeOptions.java b/vertx-web/src/main/java/io/vertx/ext/web/handler/sockjs/SockJSBridgeOptions.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.web.handler.sockjs;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 import io.vertx.ext.bridge.BridgeOptions;
@@ -28,7 +29,8 @@
  *
  * @author <a href="http://tfox.org">Tim Fox</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class SockJSBridgeOptions extends BridgeOptions {
 
   /**