Update to codegen processor repackage

vietj · vietj · commit aaf7273c0c37 · 2024-06-15T12:06:45.000+02: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
@@ -2,7 +2,6 @@
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.impl.JsonUtil;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.Base64;
@@ -13,9 +12,8 @@
  */
 public class DB2ConnectOptionsConverter {
 
-
-  private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
-  private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
+  private static final Base64.Decoder BASE64_DECODER = Base64.getUrlDecoder();
+  private static final Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding();
 
    static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, DB2ConnectOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
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
@@ -2,7 +2,6 @@
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.impl.JsonUtil;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.Base64;
@@ -13,9 +12,8 @@
  */
 public class MSSQLConnectOptionsConverter {
 
-
-  private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
-  private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
+  private static final Base64.Decoder BASE64_DECODER = Base64.getUrlDecoder();
+  private static final Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding();
 
    static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MSSQLConnectOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
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
@@ -2,7 +2,6 @@
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.impl.JsonUtil;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.Base64;
@@ -13,9 +12,8 @@
  */
 public class MySQLAuthOptionsConverter {
 
-
-  private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
-  private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
+  private static final Base64.Decoder BASE64_DECODER = Base64.getUrlDecoder();
+  private static final Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding();
 
    static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MySQLAuthOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
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
@@ -2,7 +2,6 @@
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.impl.JsonUtil;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.Base64;
@@ -13,9 +12,8 @@
  */
 public class MySQLConnectOptionsConverter {
 
-
-  private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
-  private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
+  private static final Base64.Decoder BASE64_DECODER = Base64.getUrlDecoder();
+  private static final Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding();
 
    static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, MySQLConnectOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
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
@@ -2,7 +2,6 @@
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.impl.JsonUtil;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.Base64;
@@ -13,9 +12,8 @@
  */
 public class PgConnectOptionsConverter {
 
-
-  private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
-  private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
+  private static final Base64.Decoder BASE64_DECODER = Base64.getUrlDecoder();
+  private static final Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding();
 
    static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, PgConnectOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
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
@@ -2,7 +2,6 @@
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.impl.JsonUtil;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.Base64;
@@ -13,9 +12,8 @@
  */
 public class PgNotificationConverter {
 
-
-  private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
-  private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
+  private static final Base64.Decoder BASE64_DECODER = Base64.getUrlDecoder();
+  private static final Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding();
 
    static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, PgNotification obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
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
@@ -2,15 +2,15 @@
 
 import io.vertx.codegen.format.CamelCase;
 import io.vertx.codegen.format.Case;
-import io.vertx.codegen.DataObjectModel;
-import io.vertx.codegen.Generator;
-import io.vertx.codegen.PropertyInfo;
-import io.vertx.codegen.PropertyKind;
+import io.vertx.codegen.processor.DataObjectModel;
+import io.vertx.codegen.processor.Generator;
+import io.vertx.codegen.processor.PropertyInfo;
+import io.vertx.codegen.processor.PropertyKind;
 import io.vertx.codegen.annotations.DataObject;
 import io.vertx.codegen.format.LowerCamelCase;
 import io.vertx.codegen.format.SnakeCase;
-import io.vertx.codegen.type.AnnotationValueInfo;
-import io.vertx.codegen.type.ClassTypeInfo;
+import io.vertx.codegen.processor.type.AnnotationValueInfo;
+import io.vertx.codegen.processor.type.ClassTypeInfo;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/generator/MapperGenLoader.java b/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/generator/MapperGenLoader.java
@@ -1,7 +1,7 @@
 package io.vertx.sqlclient.templates.generator;
 
-import io.vertx.codegen.Generator;
-import io.vertx.codegen.GeneratorLoader;
+import io.vertx.codegen.processor.Generator;
+import io.vertx.codegen.processor.GeneratorLoader;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import java.util.stream.Stream;
diff --git a/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/generator/ParametersMapperGen.java b/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/generator/ParametersMapperGen.java
@@ -1,8 +1,8 @@
 package io.vertx.sqlclient.templates.generator;
 
-import io.vertx.codegen.DataObjectModel;
+import io.vertx.codegen.processor.DataObjectModel;
 import io.vertx.codegen.annotations.DataObject;
-import io.vertx.codegen.type.AnnotationValueInfo;
+import io.vertx.codegen.processor.type.AnnotationValueInfo;
 import io.vertx.sqlclient.templates.TupleMapper;
 import io.vertx.sqlclient.templates.annotations.ParametersMapped;
 import io.vertx.sqlclient.templates.annotations.TemplateParameter;
diff --git a/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/generator/RowMapperGen.java b/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/generator/RowMapperGen.java
@@ -1,16 +1,16 @@
 package io.vertx.sqlclient.templates.generator;
 
-import io.vertx.codegen.DataObjectModel;
-import io.vertx.codegen.MapperKind;
-import io.vertx.codegen.PropertyInfo;
+import io.vertx.codegen.processor.DataObjectModel;
+import io.vertx.codegen.processor.MapperKind;
+import io.vertx.codegen.processor.PropertyInfo;
 import io.vertx.codegen.annotations.DataObject;
-import io.vertx.codegen.type.AnnotationValueInfo;
-import io.vertx.codegen.type.ClassKind;
-import io.vertx.codegen.type.ClassTypeInfo;
-import io.vertx.codegen.type.DataObjectInfo;
-import io.vertx.codegen.type.MapperInfo;
-import io.vertx.codegen.type.PrimitiveTypeInfo;
-import io.vertx.codegen.type.TypeInfo;
+import io.vertx.codegen.processor.type.AnnotationValueInfo;
+import io.vertx.codegen.processor.type.ClassKind;
+import io.vertx.codegen.processor.type.ClassTypeInfo;
+import io.vertx.codegen.processor.type.DataObjectInfo;
+import io.vertx.codegen.processor.type.MapperInfo;
+import io.vertx.codegen.processor.type.PrimitiveTypeInfo;
+import io.vertx.codegen.processor.type.TypeInfo;
 import io.vertx.sqlclient.templates.RowMapper;
 import io.vertx.sqlclient.templates.annotations.Column;
 import io.vertx.sqlclient.templates.annotations.RowMapped;
diff --git a/vertx-sql-client-templates/src/main/resources/META-INF/services/io.vertx.codegen.processor.GeneratorLoader b/vertx-sql-client-templates/src/main/resources/META-INF/services/io.vertx.codegen.processor.GeneratorLoader
diff --git a/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/DataObjectParamsTest.java b/vertx-sql-client-templates/src/test/java/io/vertx/sqlclient/templates/DataObjectParamsTest.java
@@ -21,7 +21,6 @@
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.unit.TestContext;
-import io.vertx.sqlclient.Row;
 import org.junit.Test;
 
 import java.time.LocalDate;
@@ -32,7 +31,6 @@
 import java.time.ZoneOffset;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
 
 /**
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
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
@@ -2,7 +2,6 @@
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.impl.JsonUtil;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.Base64;
@@ -13,9 +12,8 @@
  */
 public class PoolOptionsConverter {
 
-
-  private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
-  private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
+  private static final Base64.Decoder BASE64_DECODER = Base64.getUrlDecoder();
+  private static final Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding();
 
    static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, PoolOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
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
@@ -2,7 +2,6 @@
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.impl.JsonUtil;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
 import java.util.Base64;
@@ -13,9 +12,8 @@
  */
 public class SqlConnectOptionsConverter {
 
-
-  private static final Base64.Decoder BASE64_DECODER = JsonUtil.BASE64_DECODER;
-  private static final Base64.Encoder BASE64_ENCODER = JsonUtil.BASE64_ENCODER;
+  private static final Base64.Decoder BASE64_DECODER = Base64.getUrlDecoder();
+  private static final Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding();
 
    static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, SqlConnectOptions obj) {
     for (java.util.Map.Entry<String, Object> member : json) {
