Update to vertx-codegen processor repackage

vert-x3 · Jun 15, 2024 · a8f3a1d · a8f3a1d
1 parent 89668c6
commit a8f3a1d
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 41 deletions.
diff --git a/src/main/java/io/vertx/serviceproxy/generator/GeneratorUtils.java b/src/main/java/io/vertx/serviceproxy/generator/GeneratorUtils.java
@@ -1,10 +1,10 @@
 package io.vertx.serviceproxy.generator;
 
-import io.vertx.codegen.ParamInfo;
-import io.vertx.codegen.type.ClassKind;
-import io.vertx.codegen.type.ClassTypeInfo;
-import io.vertx.codegen.type.MapperInfo;
-import io.vertx.codegen.type.ParameterizedTypeInfo;
+import io.vertx.codegen.processor.ParamInfo;
+import io.vertx.codegen.processor.type.ClassKind;
+import io.vertx.codegen.processor.type.ClassTypeInfo;
+import io.vertx.codegen.processor.type.MapperInfo;
+import io.vertx.codegen.processor.type.ParameterizedTypeInfo;
 import io.vertx.serviceproxy.generator.model.ProxyModel;
 
 import java.io.InputStream;

diff --git a/src/main/java/io/vertx/serviceproxy/generator/ServiceProxyGen.java b/src/main/java/io/vertx/serviceproxy/generator/ServiceProxyGen.java
@@ -1,14 +1,14 @@
 package io.vertx.serviceproxy.generator;
 
-import io.vertx.codegen.Generator;
-import io.vertx.codegen.MethodInfo;
-import io.vertx.codegen.MethodKind;
-import io.vertx.codegen.ParamInfo;
-import io.vertx.codegen.TypeParamInfo;
+import io.vertx.codegen.processor.Generator;
+import io.vertx.codegen.processor.MethodInfo;
+import io.vertx.codegen.processor.MethodKind;
+import io.vertx.codegen.processor.ParamInfo;
+import io.vertx.codegen.processor.TypeParamInfo;
 import io.vertx.codegen.annotations.ModuleGen;
 import io.vertx.codegen.annotations.ProxyGen;
-import io.vertx.codegen.type.*;
-import io.vertx.codegen.writer.CodeWriter;
+import io.vertx.codegen.processor.type.*;
+import io.vertx.codegen.processor.writer.CodeWriter;
 import io.vertx.serviceproxy.generator.model.ProxyMethodInfo;
 import io.vertx.serviceproxy.generator.model.ProxyModel;
 

diff --git a/src/main/java/io/vertx/serviceproxy/generator/ServiceProxyGenLoader.java b/src/main/java/io/vertx/serviceproxy/generator/ServiceProxyGenLoader.java
@@ -1,7 +1,7 @@
 package io.vertx.serviceproxy.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/src/main/java/io/vertx/serviceproxy/generator/ServiceProxyHandlerGen.java b/src/main/java/io/vertx/serviceproxy/generator/ServiceProxyHandlerGen.java
@@ -1,14 +1,12 @@
 package io.vertx.serviceproxy.generator;
 
-import io.vertx.codegen.GenException;
-import io.vertx.codegen.Generator;
-import io.vertx.codegen.MethodKind;
-import io.vertx.codegen.ParamInfo;
+import io.vertx.codegen.processor.Generator;
+import io.vertx.codegen.processor.MethodKind;
+import io.vertx.codegen.processor.ParamInfo;
 import io.vertx.codegen.annotations.ModuleGen;
 import io.vertx.codegen.annotations.ProxyGen;
-import io.vertx.codegen.type.*;
-import io.vertx.codegen.writer.CodeWriter;
-import io.vertx.core.VertxException;
+import io.vertx.codegen.processor.type.*;
+import io.vertx.codegen.processor.writer.CodeWriter;
 import io.vertx.serviceproxy.generator.model.ProxyMethodInfo;
 import io.vertx.serviceproxy.generator.model.ProxyModel;
 

diff --git a/src/main/java/io/vertx/serviceproxy/generator/model/ProxyMethodInfo.java b/src/main/java/io/vertx/serviceproxy/generator/model/ProxyMethodInfo.java
@@ -16,13 +16,13 @@
  * You may elect to redistribute this code under either of these licenses.
  */
 
-import io.vertx.codegen.MethodInfo;
-import io.vertx.codegen.ParamInfo;
-import io.vertx.codegen.TypeParamInfo;
-import io.vertx.codegen.doc.Doc;
-import io.vertx.codegen.doc.Text;
-import io.vertx.codegen.type.ClassTypeInfo;
-import io.vertx.codegen.type.TypeInfo;
+import io.vertx.codegen.processor.MethodInfo;
+import io.vertx.codegen.processor.ParamInfo;
+import io.vertx.codegen.processor.TypeParamInfo;
+import io.vertx.codegen.processor.doc.Doc;
+import io.vertx.codegen.processor.doc.Text;
+import io.vertx.codegen.processor.type.ClassTypeInfo;
+import io.vertx.codegen.processor.type.TypeInfo;
 
 import java.util.List;
 import java.util.Set;

diff --git a/src/main/java/io/vertx/serviceproxy/generator/model/ProxyModel.java b/src/main/java/io/vertx/serviceproxy/generator/model/ProxyModel.java
@@ -16,12 +16,12 @@
 
 package io.vertx.serviceproxy.generator.model;
 
-import io.vertx.codegen.*;
+import io.vertx.codegen.processor.*;
 import io.vertx.codegen.annotations.ProxyClose;
 import io.vertx.codegen.annotations.ProxyIgnore;
-import io.vertx.codegen.doc.Doc;
-import io.vertx.codegen.doc.Text;
-import io.vertx.codegen.type.*;
+import io.vertx.codegen.processor.doc.Doc;
+import io.vertx.codegen.processor.doc.Text;
+import io.vertx.codegen.processor.type.*;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;

diff --git a/src/main/java/io/vertx/serviceproxy/generator/model/ProxyModelProvider.java b/src/main/java/io/vertx/serviceproxy/generator/model/ProxyModelProvider.java
@@ -1,9 +1,9 @@
 package io.vertx.serviceproxy.generator.model;
 
-import io.vertx.codegen.Model;
-import io.vertx.codegen.ModelProvider;
+import io.vertx.codegen.processor.Model;
+import io.vertx.codegen.processor.ModelProvider;
 import io.vertx.codegen.annotations.ProxyGen;
-import io.vertx.codegen.type.TypeMirrorFactory;
+import io.vertx.codegen.processor.type.TypeMirrorFactory;
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.TypeElement;

diff --git a/...services/io.vertx.codegen.GeneratorLoader → ...o.vertx.codegen.processor.GeneratorLoader b/...services/io.vertx.codegen.GeneratorLoader → ...o.vertx.codegen.processor.GeneratorLoader
diff --git a/...F/services/io.vertx.codegen.ModelProvider → .../io.vertx.codegen.processor.ModelProvider b/...F/services/io.vertx.codegen.ModelProvider → .../io.vertx.codegen.processor.ModelProvider
diff --git a/src/test/java/io/vertx/serviceproxy/codegen/ProxyTest.java b/src/test/java/io/vertx/serviceproxy/codegen/ProxyTest.java
@@ -1,17 +1,15 @@
 package io.vertx.serviceproxy.codegen;
 
-import io.vertx.codegen.*;
-import io.vertx.codegen.type.ClassKind;
-import io.vertx.codegen.type.ClassTypeInfo;
-import io.vertx.codegen.type.ParameterizedTypeInfo;
-import io.vertx.codegen.type.TypeInfo;
+import io.vertx.codegen.processor.*;
+import io.vertx.codegen.processor.type.ClassKind;
+import io.vertx.codegen.processor.type.ParameterizedTypeInfo;
+import io.vertx.codegen.processor.type.TypeInfo;
 import io.vertx.serviceproxy.codegen.future.FuturizedProxy;
 import io.vertx.serviceproxy.codegen.proxytestapi.*;
 import io.vertx.serviceproxy.generator.model.ProxyMethodInfo;
 import io.vertx.serviceproxy.generator.model.ProxyModel;
 import io.vertx.serviceproxy.testmodel.Mappers;
 import io.vertx.test.codegen.GeneratorHelper;
-import io.vertx.test.codegen.TypeInfoTest;
 import org.junit.Test;
 
 import java.time.ZonedDateTime;