Use @JsonGen annotation

vietj · vietj · commit 043265e8c681 · 2023-11-30T15:11:08.000+01:00
diff --git a/vertx-db2-client/src/main/generated/io/vertx/db2client/DB2ConnectOptionsConverter.java b/vertx-db2-client/src/main/generated/io/vertx/db2client/DB2ConnectOptionsConverter.java
@@ -17,7 +17,7 @@ public class DB2ConnectOptionsConverter {
   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, DB2ConnectOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, DB2ConnectOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "ssl":
@@ -31,11 +31,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(DB2ConnectOptions obj, JsonObject json) {
+   static void toJson(DB2ConnectOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(DB2ConnectOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(DB2ConnectOptions obj, java.util.Map<String, Object> json) {
     json.put("ssl", obj.isSsl());
     json.put("pipeliningLimit", obj.getPipeliningLimit());
   }
diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/DB2ConnectOptions.java b/vertx-db2-client/src/main/java/io/vertx/db2client/DB2ConnectOptions.java
@@ -23,6 +23,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 io.vertx.core.net.*;
 import io.vertx.core.tracing.TracingPolicy;
@@ -34,7 +35,8 @@
 /**
  * Connect options for configuring {@link DB2Connection} or {@link DB2Builder}.
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class DB2ConnectOptions extends SqlConnectOptions {
 
   /**
diff --git a/vertx-mssql-client/src/main/generated/io/vertx/mssqlclient/MSSQLConnectOptionsConverter.java b/vertx-mssql-client/src/main/generated/io/vertx/mssqlclient/MSSQLConnectOptionsConverter.java
@@ -17,7 +17,7 @@ public class MSSQLConnectOptionsConverter {
   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, MSSQLConnectOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MSSQLConnectOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "packetSize":
@@ -34,11 +34,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(MSSQLConnectOptions obj, JsonObject json) {
+   static void toJson(MSSQLConnectOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(MSSQLConnectOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(MSSQLConnectOptions obj, java.util.Map<String, Object> json) {
     json.put("packetSize", obj.getPacketSize());
     json.put("ssl", obj.isSsl());
   }
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/MSSQLConnectOptions.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/MSSQLConnectOptions.java
@@ -13,6 +13,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 io.vertx.core.net.*;
 import io.vertx.mssqlclient.impl.MSSQLConnectionUriParser;
@@ -25,7 +26,8 @@
 /**
  * Connect options for configuring {@link MSSQLConnection}.
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class MSSQLConnectOptions extends SqlConnectOptions {
 
   /**
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/MSSQLInfo.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/MSSQLInfo.java
@@ -12,12 +12,14 @@
 package io.vertx.mssqlclient;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
  * An information message sent by the server to the client.
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class MSSQLInfo {
 
   private int number;
diff --git a/vertx-mysql-client/src/main/generated/io/vertx/mysqlclient/MySQLAuthOptionsConverter.java b/vertx-mysql-client/src/main/generated/io/vertx/mysqlclient/MySQLAuthOptionsConverter.java
@@ -17,7 +17,7 @@ public class MySQLAuthOptionsConverter {
   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, MySQLAuthOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MySQLAuthOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "user":
@@ -69,11 +69,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(MySQLAuthOptions obj, JsonObject json) {
+   static void toJson(MySQLAuthOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(MySQLAuthOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(MySQLAuthOptions obj, java.util.Map<String, Object> json) {
     if (obj.getUser() != null) {
       json.put("user", obj.getUser());
     }
diff --git a/vertx-mysql-client/src/main/generated/io/vertx/mysqlclient/MySQLConnectOptionsConverter.java b/vertx-mysql-client/src/main/generated/io/vertx/mysqlclient/MySQLConnectOptionsConverter.java
@@ -17,7 +17,7 @@ public class MySQLConnectOptionsConverter {
   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, MySQLConnectOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MySQLConnectOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "collation":
@@ -69,11 +69,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(MySQLConnectOptions obj, JsonObject json) {
+   static void toJson(MySQLConnectOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(MySQLConnectOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(MySQLConnectOptions obj, java.util.Map<String, Object> json) {
     if (obj.getCollation() != null) {
       json.put("collation", obj.getCollation());
     }
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/MySQLAuthOptions.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/MySQLAuthOptions.java
@@ -13,6 +13,7 @@
 
 import io.vertx.codegen.annotations.DataObject;
 import io.vertx.codegen.annotations.GenIgnore;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonObject;
 import io.vertx.mysqlclient.impl.MySQLCollation;
@@ -26,7 +27,8 @@
 /**
  * Authentication options for MySQL authentication which can be used for CHANGE_USER command.
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class MySQLAuthOptions {
   private String user;
   private String password;
diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/MySQLConnectOptions.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/MySQLConnectOptions.java
@@ -13,6 +13,7 @@
 
 import io.vertx.codegen.annotations.DataObject;
 import io.vertx.codegen.annotations.GenIgnore;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.net.*;
@@ -29,7 +30,8 @@
 /**
  * Connect options for configuring {@link MySQLConnection} or {@link MySQLBuilder}.
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class MySQLConnectOptions extends SqlConnectOptions {
 
   /**
diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/OracleConnectOptions.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/OracleConnectOptions.java
@@ -12,6 +12,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 io.vertx.core.net.SocketAddress;
 import io.vertx.core.tracing.TracingPolicy;
@@ -21,7 +22,8 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class OracleConnectOptions extends SqlConnectOptions {
 
   /**
diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/OraclePrepareOptions.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/OraclePrepareOptions.java
@@ -12,11 +12,13 @@
 package io.vertx.oracleclient;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import io.vertx.sqlclient.PrepareOptions;
 
-@DataObject(generateConverter = true, inheritConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class OraclePrepareOptions extends PrepareOptions {
 
   public static final boolean DEFAULT_AUTO_GENERATED_KEY = true;
diff --git a/vertx-pg-client/src/main/generated/io/vertx/pgclient/PgConnectOptionsConverter.java b/vertx-pg-client/src/main/generated/io/vertx/pgclient/PgConnectOptionsConverter.java
@@ -17,7 +17,7 @@ public class PgConnectOptionsConverter {
   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, PgConnectOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, PgConnectOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "pipeliningLimit":
@@ -39,11 +39,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(PgConnectOptions obj, JsonObject json) {
+   static void toJson(PgConnectOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(PgConnectOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(PgConnectOptions obj, java.util.Map<String, Object> json) {
     json.put("pipeliningLimit", obj.getPipeliningLimit());
     if (obj.getSslMode() != null) {
       json.put("sslMode", obj.getSslMode().name());
diff --git a/vertx-pg-client/src/main/generated/io/vertx/pgclient/PgNotificationConverter.java b/vertx-pg-client/src/main/generated/io/vertx/pgclient/PgNotificationConverter.java
@@ -17,7 +17,7 @@ public class PgNotificationConverter {
   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, PgNotification obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, PgNotification obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "processId":
@@ -39,11 +39,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(PgNotification obj, JsonObject json) {
+   static void toJson(PgNotification obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(PgNotification obj, java.util.Map<String, Object> json) {
+   static void toJson(PgNotification obj, java.util.Map<String, Object> json) {
     json.put("processId", obj.getProcessId());
     if (obj.getChannel() != null) {
       json.put("channel", obj.getChannel());
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/PgConnectOptions.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/PgConnectOptions.java
@@ -19,6 +19,7 @@
 
 import io.vertx.codegen.annotations.GenIgnore;
 import io.vertx.codegen.annotations.Unstable;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.tracing.TracingPolicy;
 import io.vertx.pgclient.impl.PgConnectionUriParser;
 import io.vertx.codegen.annotations.DataObject;
@@ -38,7 +39,8 @@
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
  * @author Billy Yuan <billy112487983@gmail.com>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class PgConnectOptions extends SqlConnectOptions {
 
   /**
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/PgNotice.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/PgNotice.java
@@ -17,13 +17,15 @@
 package io.vertx.pgclient;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.impl.logging.Logger;
 import io.vertx.core.json.JsonObject;
 
 /**
  * A notification emited by Postgres.
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class PgNotice {
 
   private String severity;
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/PgNotification.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/PgNotification.java
@@ -17,12 +17,14 @@
 package io.vertx.pgclient;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.json.JsonObject;
 
 /**
  * A notification emited by Postgres.
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class PgNotification {
 
   private int processId;
diff --git a/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/generator/MapperGenBase.java b/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/generator/MapperGenBase.java
@@ -73,7 +73,7 @@ private Case getCase(DataObjectModel model, String name) {
   public String render(DataObjectModel model, int index, int size, Map<String, Object> session) {
     StringWriter buffer = new StringWriter();
     PrintWriter writer = new PrintWriter(buffer);
-    String visibility= model.isPublicConverter() ? "public" : "";
+    String visibility= "public";
 
     formatter = getCase(model, "formatter");
 
diff --git a/vertx-sql-client/src/main/generated/io/vertx/sqlclient/PoolOptionsConverter.java b/vertx-sql-client/src/main/generated/io/vertx/sqlclient/PoolOptionsConverter.java
@@ -17,7 +17,7 @@ public class PoolOptionsConverter {
   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, PoolOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, PoolOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "maxSize":
@@ -84,11 +84,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(PoolOptions obj, JsonObject json) {
+   static void toJson(PoolOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(PoolOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(PoolOptions obj, java.util.Map<String, Object> json) {
     json.put("maxSize", obj.getMaxSize());
     json.put("maxWaitQueueSize", obj.getMaxWaitQueueSize());
     if (obj.getIdleTimeoutUnit() != null) {
diff --git a/vertx-sql-client/src/main/generated/io/vertx/sqlclient/SqlConnectOptionsConverter.java b/vertx-sql-client/src/main/generated/io/vertx/sqlclient/SqlConnectOptionsConverter.java
@@ -17,7 +17,7 @@ public class SqlConnectOptionsConverter {
   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, SqlConnectOptions obj) {
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, SqlConnectOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
       switch (member.getKey()) {
         case "host":
@@ -96,11 +96,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,
     }
   }
 
-  public static void toJson(SqlConnectOptions obj, JsonObject json) {
+   static void toJson(SqlConnectOptions obj, JsonObject json) {
     toJson(obj, json.getMap());
   }
 
-  public static void toJson(SqlConnectOptions obj, java.util.Map<String, Object> json) {
+   static void toJson(SqlConnectOptions obj, java.util.Map<String, Object> json) {
     if (obj.getHost() != null) {
       json.put("host", obj.getHost());
     }
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/PoolOptions.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/PoolOptions.java
@@ -18,6 +18,7 @@
 package io.vertx.sqlclient;
 
 import io.vertx.codegen.annotations.DataObject;
+import io.vertx.codegen.json.annotations.JsonGen;
 import io.vertx.core.impl.Arguments;
 import io.vertx.core.json.JsonObject;
 
@@ -29,7 +30,8 @@
  *
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
  */
-@DataObject(generateConverter = true)
+@DataObject
+@JsonGen(publicConverter = false)
 public class PoolOptions {
 
   /**
diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/SqlConnectOptions.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/SqlConnectOptions.java

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class DB2ConnectOptionsConverter {`
`17`	`17`	`private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;`
`18`	`18`	`private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;`
`19`	`19`
`20`		`- public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, DB2ConnectOptions obj) {`
	`20`	`+ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, DB2ConnectOptions obj) {`
`21`	`21`	`for (java.util.Map.Entry<String, Object> member : json) {`
`22`	`22`	`switch (member.getKey()) {`
`23`	`23`	`case "ssl":`
`@@ -31,11 +31,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`- public static void toJson(DB2ConnectOptions obj, JsonObject json) {`
	`34`	`+ static void toJson(DB2ConnectOptions obj, JsonObject json) {`
`35`	`35`	`toJson(obj, json.getMap());`
`36`	`36`	`}`
`37`	`37`
`38`		`- public static void toJson(DB2ConnectOptions obj, java.util.Map<String, Object> json) {`
	`38`	`+ static void toJson(DB2ConnectOptions obj, java.util.Map<String, Object> json) {`
`39`	`39`	`json.put("ssl", obj.isSsl());`
`40`	`40`	`json.put("pipeliningLimit", obj.getPipeliningLimit());`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class MSSQLConnectOptionsConverter {`
`17`	`17`	`private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;`
`18`	`18`	`private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;`
`19`	`19`
`20`		`- public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MSSQLConnectOptions obj) {`
	`20`	`+ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MSSQLConnectOptions obj) {`
`21`	`21`	`for (java.util.Map.Entry<String, Object> member : json) {`
`22`	`22`	`switch (member.getKey()) {`
`23`	`23`	`case "packetSize":`
`@@ -34,11 +34,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`- public static void toJson(MSSQLConnectOptions obj, JsonObject json) {`
	`37`	`+ static void toJson(MSSQLConnectOptions obj, JsonObject json) {`
`38`	`38`	`toJson(obj, json.getMap());`
`39`	`39`	`}`
`40`	`40`
`41`		`- public static void toJson(MSSQLConnectOptions obj, java.util.Map<String, Object> json) {`
	`41`	`+ static void toJson(MSSQLConnectOptions obj, java.util.Map<String, Object> json) {`
`42`	`42`	`json.put("packetSize", obj.getPacketSize());`
`43`	`43`	`json.put("ssl", obj.isSsl());`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class MySQLAuthOptionsConverter {`
`17`	`17`	`private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;`
`18`	`18`	`private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;`
`19`	`19`
`20`		`- public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MySQLAuthOptions obj) {`
	`20`	`+ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MySQLAuthOptions obj) {`
`21`	`21`	`for (java.util.Map.Entry<String, Object> member : json) {`
`22`	`22`	`switch (member.getKey()) {`
`23`	`23`	`case "user":`
`@@ -69,11 +69,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- public static void toJson(MySQLAuthOptions obj, JsonObject json) {`
	`72`	`+ static void toJson(MySQLAuthOptions obj, JsonObject json) {`
`73`	`73`	`toJson(obj, json.getMap());`
`74`	`74`	`}`
`75`	`75`
`76`		`- public static void toJson(MySQLAuthOptions obj, java.util.Map<String, Object> json) {`
	`76`	`+ static void toJson(MySQLAuthOptions obj, java.util.Map<String, Object> json) {`
`77`	`77`	`if (obj.getUser() != null) {`
`78`	`78`	`json.put("user", obj.getUser());`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class MySQLConnectOptionsConverter {`
`17`	`17`	`private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;`
`18`	`18`	`private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;`
`19`	`19`
`20`		`- public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MySQLConnectOptions obj) {`
	`20`	`+ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MySQLConnectOptions obj) {`
`21`	`21`	`for (java.util.Map.Entry<String, Object> member : json) {`
`22`	`22`	`switch (member.getKey()) {`
`23`	`23`	`case "collation":`
`@@ -69,11 +69,11 @@ public static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json,`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- public static void toJson(MySQLConnectOptions obj, JsonObject json) {`
	`72`	`+ static void toJson(MySQLConnectOptions obj, JsonObject json) {`
`73`	`73`	`toJson(obj, json.getMap());`
`74`	`74`	`}`
`75`	`75`
`76`		`- public static void toJson(MySQLConnectOptions obj, java.util.Map<String, Object> json) {`
	`76`	`+ static void toJson(MySQLConnectOptions obj, java.util.Map<String, Object> json) {`
`77`	`77`	`if (obj.getCollation() != null) {`
`78`	`78`	`json.put("collation", obj.getCollation());`
`79`	`79`	`}`