Use @JsonGen annotation

vert-x3 · Nov 30, 2023 · b50cf9e · b50cf9e
1 parent a76d604
commit b50cf9e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 24 deletions.
diff --git a/...mongo/src/main/generated/io/vertx/ext/auth/mongo/MongoAuthenticationOptionsConverter.java b/...mongo/src/main/generated/io/vertx/ext/auth/mongo/MongoAuthenticationOptionsConverter.java
@@ -17,17 +17,17 @@ public class MongoAuthenticationOptionsConverter {
   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, MongoAuthenticationOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MongoAuthenticationOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "collectionName":
           if (member.getValue() instanceof String) {
             obj.setCollectionName((String)member.getValue());
           }
           break;
-        case "passwordCredentialField":
+        case "usernameField":
           if (member.getValue() instanceof String) {
-            obj.setPasswordCredentialField((String)member.getValue());
+            obj.setUsernameField((String)member.getValue());
           }
           break;
         case "passwordField":
@@ -40,34 +40,34 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
             obj.setUsernameCredentialField((String)member.getValue());
           }
           break;
-        case "usernameField":
+        case "passwordCredentialField":
           if (member.getValue() instanceof String) {
-            obj.setUsernameField((String)member.getValue());
+            obj.setPasswordCredentialField((String)member.getValue());
           }
           break;
       }
     }
   }
 
-  public static void toJson(MongoAuthenticationOptions obj, JsonObject json) {
+   static void toJson(MongoAuthenticationOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(MongoAuthenticationOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(MongoAuthenticationOptions obj, java.util.Map<String, Object> json) {
     if (obj.getCollectionName() != null) {
       json.put("collectionName", obj.getCollectionName());
     }
-    if (obj.getPasswordCredentialField() != null) {
-      json.put("passwordCredentialField", obj.getPasswordCredentialField());
+    if (obj.getUsernameField() != null) {
+      json.put("usernameField", obj.getUsernameField());
     }
     if (obj.getPasswordField() != null) {
       json.put("passwordField", obj.getPasswordField());
     }
     if (obj.getUsernameCredentialField() != null) {
       json.put("usernameCredentialField", obj.getUsernameCredentialField());
     }
-    if (obj.getUsernameField() != null) {
-      json.put("usernameField", obj.getUsernameField());
+    if (obj.getPasswordCredentialField() != null) {
+      json.put("passwordCredentialField", obj.getPasswordCredentialField());
     }
   }
 }
diff --git a/...-mongo/src/main/generated/io/vertx/ext/auth/mongo/MongoAuthorizationOptionsConverter.java b/...-mongo/src/main/generated/io/vertx/ext/auth/mongo/MongoAuthorizationOptionsConverter.java
@@ -17,49 +17,49 @@ public class MongoAuthorizationOptionsConverter {
   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, MongoAuthorizationOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MongoAuthorizationOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "collectionName":
           if (member.getValue() instanceof String) {
             obj.setCollectionName((String)member.getValue());
           }
           break;
-        case "permissionField":
+        case "usernameField":
           if (member.getValue() instanceof String) {
-            obj.setPermissionField((String)member.getValue());
+            obj.setUsernameField((String)member.getValue());
           }
           break;
         case "roleField":
           if (member.getValue() instanceof String) {
             obj.setRoleField((String)member.getValue());
           }
           break;
-        case "usernameField":
+        case "permissionField":
           if (member.getValue() instanceof String) {
-            obj.setUsernameField((String)member.getValue());
+            obj.setPermissionField((String)member.getValue());
           }
           break;
       }
     }
   }
 
-  public static void toJson(MongoAuthorizationOptions obj, JsonObject json) {
+   static void toJson(MongoAuthorizationOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(MongoAuthorizationOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(MongoAuthorizationOptions obj, java.util.Map<String, Object> json) {
     if (obj.getCollectionName() != null) {
       json.put("collectionName", obj.getCollectionName());
     }
-    if (obj.getPermissionField() != null) {
-      json.put("permissionField", obj.getPermissionField());
+    if (obj.getUsernameField() != null) {
+      json.put("usernameField", obj.getUsernameField());
     }
     if (obj.getRoleField() != null) {
       json.put("roleField", obj.getRoleField());
     }
-    if (obj.getUsernameField() != null) {
-      json.put("usernameField", obj.getUsernameField());
+    if (obj.getPermissionField() != null) {
+      json.put("permissionField", obj.getPermissionField());
     }
   }
 }
diff --git a/vertx-auth-mongo/src/main/java/io/vertx/ext/auth/mongo/MongoAuthenticationOptions.java b/vertx-auth-mongo/src/main/java/io/vertx/ext/auth/mongo/MongoAuthenticationOptions.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.auth.mongo;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
@@ -24,7 +25,8 @@
  * @author francoisprunier
  *
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class MongoAuthenticationOptions {
 
   private String collectionName;

diff --git a/vertx-auth-mongo/src/main/java/io/vertx/ext/auth/mongo/MongoAuthorizationOptions.java b/vertx-auth-mongo/src/main/java/io/vertx/ext/auth/mongo/MongoAuthorizationOptions.java
@@ -16,6 +16,7 @@
 package io.vertx.ext.auth.mongo;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
@@ -24,7 +25,8 @@
  * @author francoisprunier
  *
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class MongoAuthorizationOptions {
 
   private String collectionName;