Use @JsonGen annotation

vert-x3 · Nov 30, 2023 · 5ac30c6 · 5ac30c6
1 parent aae1346
commit 5ac30c6
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 42 deletions.
diff --git a/src/main/generated/io/vertx/ext/bridge/BridgeOptionsConverter.java b/src/main/generated/io/vertx/ext/bridge/BridgeOptionsConverter.java
@@ -17,7 +17,7 @@ public class BridgeOptionsConverter {
   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, BridgeOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, BridgeOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "inboundPermitteds":
@@ -44,11 +44,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(BridgeOptions obj, JsonObject json) {
+   static void toJson(BridgeOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(BridgeOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(BridgeOptions obj, java.util.Map<String, Object> json) {
     if (obj.getInboundPermitteds() != null) {
       JsonArray array = new JsonArray();
       obj.getInboundPermitteds().forEach(item -> array.add(item.toJson()));

diff --git a/src/main/generated/io/vertx/ext/bridge/PermittedOptionsConverter.java b/src/main/generated/io/vertx/ext/bridge/PermittedOptionsConverter.java
@@ -17,7 +17,7 @@ public class PermittedOptionsConverter {
   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, PermittedOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, PermittedOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "address":
@@ -44,11 +44,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(PermittedOptions obj, JsonObject json) {
+   static void toJson(PermittedOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(PermittedOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(PermittedOptions obj, java.util.Map<String, Object> json) {
     if (obj.getAddress() != null) {
       json.put("address", obj.getAddress());
     }

diff --git a/src/main/java/io/vertx/ext/bridge/BridgeOptions.java b/src/main/java/io/vertx/ext/bridge/BridgeOptions.java
@@ -17,6 +17,7 @@
 package io.vertx.ext.bridge;
 
 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="http://escoffier.me">Clement Escoffier</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class BridgeOptions {
 
   private List<PermittedOptions> inboundPermitted = new ArrayList<>();

diff --git a/src/main/java/io/vertx/ext/bridge/PermittedOptions.java b/src/main/java/io/vertx/ext/bridge/PermittedOptions.java
@@ -17,6 +17,7 @@
 package io.vertx.ext.bridge;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 
@@ -25,7 +26,8 @@
  *
  * @author <a href="http://escoffier.me">Clement Escoffier</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class PermittedOptions {
 
   /**

diff --git a/src/test/generated/io/vertx/ext/bridge/inheritance/MyBridgeOptionsConverter.java b/src/test/generated/io/vertx/ext/bridge/inheritance/MyBridgeOptionsConverter.java
@@ -17,53 +17,23 @@ public class MyBridgeOptionsConverter {
   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, MyBridgeOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MyBridgeOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "flag":
           if (member.getValue() instanceof Boolean) {
             obj.setFlag((Boolean)member.getValue());
           }
           break;
-        case "inboundPermitteds":
-          if (member.getValue() instanceof JsonArray) {
-            java.util.ArrayList<io.vertx.ext.bridge.PermittedOptions> list =  new java.util.ArrayList<>();
-            ((Iterable<Object>)member.getValue()).forEach( item -> {
-              if (item instanceof JsonObject)
-                list.add(new io.vertx.ext.bridge.PermittedOptions((io.vertx.core.json.JsonObject)item));
-            });
-            obj.setInboundPermitteds(list);
-          }
-          break;
-        case "outboundPermitteds":
-          if (member.getValue() instanceof JsonArray) {
-            java.util.ArrayList<io.vertx.ext.bridge.PermittedOptions> list =  new java.util.ArrayList<>();
-            ((Iterable<Object>)member.getValue()).forEach( item -> {
-              if (item instanceof JsonObject)
-                list.add(new io.vertx.ext.bridge.PermittedOptions((io.vertx.core.json.JsonObject)item));
-            });
-            obj.setOutboundPermitteds(list);
-          }
-          break;
       }
     }
   }
 
-  public static void toJson(MyBridgeOptions obj, JsonObject json) {
+   static void toJson(MyBridgeOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(MyBridgeOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(MyBridgeOptions obj, java.util.Map<String, Object> json) {
     json.put("flag", obj.isFlag());
-    if (obj.getInboundPermitteds() != null) {
-      JsonArray array = new JsonArray();
-      obj.getInboundPermitteds().forEach(item -> array.add(item.toJson()));
-      json.put("inboundPermitteds", array);
-    }
-    if (obj.getOutboundPermitteds() != null) {
-      JsonArray array = new JsonArray();
-      obj.getOutboundPermitteds().forEach(item -> array.add(item.toJson()));
-      json.put("outboundPermitteds", array);
-    }
   }
 }
diff --git a/src/test/java/io/vertx/ext/bridge/inheritance/MyBridgeOptions.java b/src/test/java/io/vertx/ext/bridge/inheritance/MyBridgeOptions.java
@@ -1,13 +1,15 @@
 package io.vertx.ext.bridge.inheritance;
 
 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;
 
 /**
  * @author <a href="http://escoffier.me">Clement Escoffier</a>
  */
-@DataObject(generateConverter = true, inheritConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class MyBridgeOptions extends BridgeOptions {
 
   private boolean flag;