diff --git a/generator-helidon/src/main/java/io/dinject/webroutegen/HelidonProcessor.java b/generator-helidon/src/main/java/io/dinject/webroutegen/HelidonProcessor.java deleted file mode 100644 index c22c6c81b..000000000 --- a/generator-helidon/src/main/java/io/dinject/webroutegen/HelidonProcessor.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.dinject.webroutegen; - -import java.io.IOException; - -public class HelidonProcessor extends BaseProcessor { - - @Override - protected PlatformAdapter providePlatformAdapter() { - return new HelidonPlatformAdapter(); - } - - @Override - void writeControllerAdapter(ProcessingContext ctx, ControllerReader reader) throws IOException { - new ControllerWriter(reader, ctx).write(); - } -} diff --git a/generator-helidon/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/generator-helidon/src/main/resources/META-INF/services/javax.annotation.processing.Processor deleted file mode 100644 index 8d740800b..000000000 --- a/generator-helidon/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ /dev/null @@ -1 +0,0 @@ -io.dinject.webroutegen.HelidonProcessor diff --git a/generator-javalin/src/main/java/io/dinject/webroutegen/JavalinProcessor.java b/generator-javalin/src/main/java/io/dinject/webroutegen/JavalinProcessor.java deleted file mode 100644 index 7059fd657..000000000 --- a/generator-javalin/src/main/java/io/dinject/webroutegen/JavalinProcessor.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.dinject.webroutegen; - -import java.io.IOException; - -public class JavalinProcessor extends BaseProcessor { - - @Override - protected PlatformAdapter providePlatformAdapter() { - return new JavalinAdapter(); - } - - @Override - void writeControllerAdapter(ProcessingContext ctx, ControllerReader reader) throws IOException { - new ControllerWriter(reader, ctx).write(); - } -} diff --git a/generator-javalin/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/generator-javalin/src/main/resources/META-INF/services/javax.annotation.processing.Processor deleted file mode 100644 index 83ae32c0f..000000000 --- a/generator-javalin/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ /dev/null @@ -1 +0,0 @@ -io.dinject.webroutegen.JavalinProcessor diff --git a/controller/LICENSE b/http-api/LICENSE similarity index 100% rename from controller/LICENSE rename to http-api/LICENSE diff --git a/controller/README.md b/http-api/README.md similarity index 100% rename from controller/README.md rename to http-api/README.md diff --git a/controller/pom.xml b/http-api/pom.xml similarity index 100% rename from controller/pom.xml rename to http-api/pom.xml diff --git a/controller/src/main/java/io/avaje/http/api/BeanParam.java b/http-api/src/main/java/io/avaje/http/api/BeanParam.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/BeanParam.java rename to http-api/src/main/java/io/avaje/http/api/BeanParam.java diff --git a/controller/src/main/java/io/avaje/http/api/Controller.java b/http-api/src/main/java/io/avaje/http/api/Controller.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/Controller.java rename to http-api/src/main/java/io/avaje/http/api/Controller.java diff --git a/controller/src/main/java/io/avaje/http/api/Cookie.java b/http-api/src/main/java/io/avaje/http/api/Cookie.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/Cookie.java rename to http-api/src/main/java/io/avaje/http/api/Cookie.java diff --git a/controller/src/main/java/io/avaje/http/api/Default.java b/http-api/src/main/java/io/avaje/http/api/Default.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/Default.java rename to http-api/src/main/java/io/avaje/http/api/Default.java diff --git a/controller/src/main/java/io/avaje/http/api/Delete.java b/http-api/src/main/java/io/avaje/http/api/Delete.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/Delete.java rename to http-api/src/main/java/io/avaje/http/api/Delete.java diff --git a/controller/src/main/java/io/avaje/http/api/Form.java b/http-api/src/main/java/io/avaje/http/api/Form.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/Form.java rename to http-api/src/main/java/io/avaje/http/api/Form.java diff --git a/controller/src/main/java/io/avaje/http/api/FormParam.java b/http-api/src/main/java/io/avaje/http/api/FormParam.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/FormParam.java rename to http-api/src/main/java/io/avaje/http/api/FormParam.java diff --git a/controller/src/main/java/io/avaje/http/api/Get.java b/http-api/src/main/java/io/avaje/http/api/Get.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/Get.java rename to http-api/src/main/java/io/avaje/http/api/Get.java diff --git a/controller/src/main/java/io/avaje/http/api/Header.java b/http-api/src/main/java/io/avaje/http/api/Header.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/Header.java rename to http-api/src/main/java/io/avaje/http/api/Header.java diff --git a/controller/src/main/java/io/avaje/http/api/HttpMethod.java b/http-api/src/main/java/io/avaje/http/api/HttpMethod.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/HttpMethod.java rename to http-api/src/main/java/io/avaje/http/api/HttpMethod.java diff --git a/controller/src/main/java/io/avaje/http/api/InvalidPathArgumentException.java b/http-api/src/main/java/io/avaje/http/api/InvalidPathArgumentException.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/InvalidPathArgumentException.java rename to http-api/src/main/java/io/avaje/http/api/InvalidPathArgumentException.java diff --git a/controller/src/main/java/io/avaje/http/api/InvalidTypeArgumentException.java b/http-api/src/main/java/io/avaje/http/api/InvalidTypeArgumentException.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/InvalidTypeArgumentException.java rename to http-api/src/main/java/io/avaje/http/api/InvalidTypeArgumentException.java diff --git a/controller/src/main/java/io/avaje/http/api/MediaType.java b/http-api/src/main/java/io/avaje/http/api/MediaType.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/MediaType.java rename to http-api/src/main/java/io/avaje/http/api/MediaType.java diff --git a/controller/src/main/java/io/avaje/http/api/Patch.java b/http-api/src/main/java/io/avaje/http/api/Patch.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/Patch.java rename to http-api/src/main/java/io/avaje/http/api/Patch.java diff --git a/controller/src/main/java/io/avaje/http/api/Path.java b/http-api/src/main/java/io/avaje/http/api/Path.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/Path.java rename to http-api/src/main/java/io/avaje/http/api/Path.java diff --git a/controller/src/main/java/io/avaje/http/api/PathSegment.java b/http-api/src/main/java/io/avaje/http/api/PathSegment.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/PathSegment.java rename to http-api/src/main/java/io/avaje/http/api/PathSegment.java diff --git a/controller/src/main/java/io/avaje/http/api/PathTypeConversion.java b/http-api/src/main/java/io/avaje/http/api/PathTypeConversion.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/PathTypeConversion.java rename to http-api/src/main/java/io/avaje/http/api/PathTypeConversion.java diff --git a/controller/src/main/java/io/avaje/http/api/Post.java b/http-api/src/main/java/io/avaje/http/api/Post.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/Post.java rename to http-api/src/main/java/io/avaje/http/api/Post.java diff --git a/controller/src/main/java/io/avaje/http/api/Produces.java b/http-api/src/main/java/io/avaje/http/api/Produces.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/Produces.java rename to http-api/src/main/java/io/avaje/http/api/Produces.java diff --git a/controller/src/main/java/io/avaje/http/api/Put.java b/http-api/src/main/java/io/avaje/http/api/Put.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/Put.java rename to http-api/src/main/java/io/avaje/http/api/Put.java diff --git a/controller/src/main/java/io/avaje/http/api/QueryParam.java b/http-api/src/main/java/io/avaje/http/api/QueryParam.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/QueryParam.java rename to http-api/src/main/java/io/avaje/http/api/QueryParam.java diff --git a/controller/src/main/java/io/avaje/http/api/RequiredArgumentException.java b/http-api/src/main/java/io/avaje/http/api/RequiredArgumentException.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/RequiredArgumentException.java rename to http-api/src/main/java/io/avaje/http/api/RequiredArgumentException.java diff --git a/controller/src/main/java/io/avaje/http/api/ValidationException.java b/http-api/src/main/java/io/avaje/http/api/ValidationException.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/ValidationException.java rename to http-api/src/main/java/io/avaje/http/api/ValidationException.java diff --git a/controller/src/main/java/io/avaje/http/api/Validator.java b/http-api/src/main/java/io/avaje/http/api/Validator.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/Validator.java rename to http-api/src/main/java/io/avaje/http/api/Validator.java diff --git a/controller/src/main/java/io/avaje/http/api/WebRoutes.java b/http-api/src/main/java/io/avaje/http/api/WebRoutes.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/WebRoutes.java rename to http-api/src/main/java/io/avaje/http/api/WebRoutes.java diff --git a/controller/src/main/java/io/avaje/http/api/package-info.java b/http-api/src/main/java/io/avaje/http/api/package-info.java similarity index 100% rename from controller/src/main/java/io/avaje/http/api/package-info.java rename to http-api/src/main/java/io/avaje/http/api/package-info.java diff --git a/controller/src/test/java/io/avaje/http/api/PathSegmentTest.java b/http-api/src/test/java/io/avaje/http/api/PathSegmentTest.java similarity index 100% rename from controller/src/test/java/io/avaje/http/api/PathSegmentTest.java rename to http-api/src/test/java/io/avaje/http/api/PathSegmentTest.java diff --git a/controller/src/test/java/io/avaje/http/api/PathTypeConversionTest.java b/http-api/src/test/java/io/avaje/http/api/PathTypeConversionTest.java similarity index 100% rename from controller/src/test/java/io/avaje/http/api/PathTypeConversionTest.java rename to http-api/src/test/java/io/avaje/http/api/PathTypeConversionTest.java diff --git a/generator-client/pom.xml b/http-generator-client/pom.xml similarity index 82% rename from generator-client/pom.xml rename to http-generator-client/pom.xml index 4f86af9c8..152e411e5 100644 --- a/generator-client/pom.xml +++ b/http-generator-client/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - controller-parent - io.dinject + avaje-http-generator-parent + io.avaje 1.22-SNAPSHOT 4.0.0 diff --git a/generator-core/pom.xml b/http-generator-core/pom.xml similarity index 86% rename from generator-core/pom.xml rename to http-generator-core/pom.xml index fae6efb59..136b44b8e 100644 --- a/generator-core/pom.xml +++ b/http-generator-core/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - webgen-core + avaje-http-generator-core - io.dinject - controller-parent - 1.23-SNAPSHOT + io.avaje + avaje-http-generator-parent + 0.1-SNAPSHOT .. @@ -31,9 +31,9 @@ - io.dinject - dinject-controller - ${project.version} + io.avaje + avaje-http-api + 0.1 @@ -56,7 +56,6 @@ - diff --git a/generator-core/src/main/java/io/dinject/webroutegen/Append.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/Append.java similarity index 75% rename from generator-core/src/main/java/io/dinject/webroutegen/Append.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/Append.java index 2fd7c87c7..90f89beca 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/Append.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/Append.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; import java.io.IOException; import java.io.Writer; @@ -6,15 +6,15 @@ /** * Helper that wraps a writer with some useful methods to append content. */ -class Append { +public class Append { private final Writer writer; - Append(Writer writer) { + public Append(Writer writer) { this.writer = writer; } - Append append(String content) { + public Append append(String content) { try { writer.append(content); return this; @@ -23,7 +23,7 @@ Append append(String content) { } } - void close() { + public void close() { try { writer.flush(); writer.close(); @@ -32,7 +32,7 @@ void close() { } } - Append eol() { + public Append eol() { try { writer.append("\n"); return this; @@ -44,7 +44,7 @@ Append eol() { /** * Append content with formatted arguments. */ - Append append(String format, Object... args) { + public Append append(String format, Object... args) { return append(String.format(format, args)); } diff --git a/generator-core/src/main/java/io/dinject/webroutegen/BaseControllerWriter.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/BaseControllerWriter.java similarity index 98% rename from generator-core/src/main/java/io/dinject/webroutegen/BaseControllerWriter.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/BaseControllerWriter.java index 5256454fd..3218f4161 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/BaseControllerWriter.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/BaseControllerWriter.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; import javax.lang.model.element.TypeElement; import javax.tools.JavaFileObject; diff --git a/generator-core/src/main/java/io/dinject/webroutegen/BaseProcessor.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/BaseProcessor.java similarity index 95% rename from generator-core/src/main/java/io/dinject/webroutegen/BaseProcessor.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/BaseProcessor.java index de693b5f6..befa5963a 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/BaseProcessor.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/BaseProcessor.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; import io.avaje.http.api.Controller; import io.swagger.v3.oas.annotations.OpenAPIDefinition; @@ -101,6 +101,6 @@ private void writeControllerAdapter(Element controller) { /** * Write the adapter code for the given controller. */ - abstract void writeControllerAdapter(ProcessingContext ctx, ControllerReader reader) throws IOException; + public abstract void writeControllerAdapter(ProcessingContext ctx, ControllerReader reader) throws IOException; } diff --git a/generator-core/src/main/java/io/dinject/webroutegen/BeanParamReader.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/BeanParamReader.java similarity index 99% rename from generator-core/src/main/java/io/dinject/webroutegen/BeanParamReader.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/BeanParamReader.java index c45263810..4e4568dd2 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/BeanParamReader.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/BeanParamReader.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; diff --git a/generator-core/src/main/java/io/dinject/webroutegen/Constants.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/Constants.java similarity index 93% rename from generator-core/src/main/java/io/dinject/webroutegen/Constants.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/Constants.java index 67dba9052..a186a9427 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/Constants.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/Constants.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; class Constants { diff --git a/generator-core/src/main/java/io/dinject/webroutegen/ControllerReader.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/ControllerReader.java similarity index 94% rename from generator-core/src/main/java/io/dinject/webroutegen/ControllerReader.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/ControllerReader.java index de1dae4de..08da6c02c 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/ControllerReader.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/ControllerReader.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; import io.avaje.http.api.Path; import io.avaje.http.api.Produces; @@ -23,7 +23,7 @@ /** * Reads the type information for the Controller (bean). */ -class ControllerReader { +public class ControllerReader { private final ProcessingContext ctx; @@ -152,7 +152,7 @@ public boolean isDocHidden() { return docHidden; } - boolean isIncludeValidator() { + public boolean isIncludeValidator() { return includeValidator; } @@ -227,15 +227,15 @@ private void readMethod(ExecutableElement method, DeclaredType declaredType) { } } - List getRoles() { + public List getRoles() { return roles; } - List getMethods() { + public List getMethods() { return methods; } - String getPath() { + public String getPath() { Path path = findAnnotation(Path.class); if (path == null) { return null; @@ -243,19 +243,19 @@ String getPath() { return Util.trimPath(path.value()); } - void addImportType(String rawType) { + public void addImportType(String rawType) { importTypes.add(rawType); } - void addStaticImportType(String rawType) { + public void addStaticImportType(String rawType) { staticImportTypes.add(rawType); } - Set getStaticImportTypes() { + public Set getStaticImportTypes() { return staticImportTypes; } - Set getImportTypes() { + public Set getImportTypes() { return importTypes; } diff --git a/generator-core/src/main/java/io/dinject/webroutegen/ElementReader.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/ElementReader.java similarity index 96% rename from generator-core/src/main/java/io/dinject/webroutegen/ElementReader.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/ElementReader.java index fcbf4fa26..05d6d5462 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/ElementReader.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/ElementReader.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; import io.avaje.http.api.BeanParam; import io.avaje.http.api.Cookie; @@ -7,14 +7,12 @@ import io.avaje.http.api.FormParam; import io.avaje.http.api.Header; import io.avaje.http.api.QueryParam; -import io.dinject.webroutegen.openapi.MethodDocBuilder; -import io.dinject.webroutegen.openapi.MethodParamDocBuilder; +import io.avaje.http.generator.core.openapi.MethodDocBuilder; +import io.avaje.http.generator.core.openapi.MethodParamDocBuilder; import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; -import static io.dinject.webroutegen.Util.typeDef; - public class ElementReader { private final ProcessingContext ctx; @@ -36,7 +34,7 @@ public class ElementReader { //private boolean notNullJavax; ElementReader(Element element, ProcessingContext ctx, ParamType defaultType, boolean formMarker) { - this(element, typeDef(element.asType()), ctx, defaultType, formMarker); + this(element, Util.typeDef(element.asType()), ctx, defaultType, formMarker); } ElementReader(Element element, String rawType, ProcessingContext ctx, ParamType defaultType, boolean formMarker) { diff --git a/generator-core/src/main/java/io/dinject/webroutegen/MethodParam.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/MethodParam.java similarity index 76% rename from generator-core/src/main/java/io/dinject/webroutegen/MethodParam.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/MethodParam.java index d4116772f..7da9a3ec5 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/MethodParam.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/MethodParam.java @@ -1,6 +1,6 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; -import io.dinject.webroutegen.openapi.MethodDocBuilder; +import io.avaje.http.generator.core.openapi.MethodDocBuilder; import javax.lang.model.element.VariableElement; @@ -12,19 +12,19 @@ public class MethodParam { this.elementParam = new ElementReader(param, rawType, ctx, defaultParamType, formMarker); } - void writeCtxGet(Append writer, PathSegments segments) { + public void writeCtxGet(Append writer, PathSegments segments) { elementParam.writeCtxGet(writer, segments); } - void addImports(ControllerReader bean) { + public void addImports(ControllerReader bean) { elementParam.addImports(bean); } - void writeValidate(Append writer) { + public void writeValidate(Append writer) { elementParam.writeValidate(writer); } - void buildParamName(Append writer) { + public void buildParamName(Append writer) { elementParam.writeParamName(writer); } diff --git a/generator-core/src/main/java/io/dinject/webroutegen/MethodReader.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/MethodReader.java similarity index 97% rename from generator-core/src/main/java/io/dinject/webroutegen/MethodReader.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/MethodReader.java index 840c3c33d..6e16a70c2 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/MethodReader.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/MethodReader.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; import io.avaje.http.api.Delete; import io.avaje.http.api.Form; @@ -7,8 +7,8 @@ import io.avaje.http.api.Post; import io.avaje.http.api.Produces; import io.avaje.http.api.Put; -import io.dinject.webroutegen.javadoc.Javadoc; -import io.dinject.webroutegen.openapi.MethodDocBuilder; +import io.avaje.http.generator.core.javadoc.Javadoc; +import io.avaje.http.generator.core.openapi.MethodDocBuilder; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tags; diff --git a/generator-core/src/main/java/io/dinject/webroutegen/ParamType.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/ParamType.java similarity index 93% rename from generator-core/src/main/java/io/dinject/webroutegen/ParamType.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/ParamType.java index 8441cc504..084e26457 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/ParamType.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/ParamType.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; public enum ParamType { diff --git a/generator-core/src/main/java/io/dinject/webroutegen/PathSegments.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/PathSegments.java similarity index 93% rename from generator-core/src/main/java/io/dinject/webroutegen/PathSegments.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/PathSegments.java index cf8781b39..56b5cc72d 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/PathSegments.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/PathSegments.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; import java.util.ArrayList; import java.util.Arrays; @@ -8,7 +8,7 @@ import java.util.List; import java.util.Set; -class PathSegments { +public class PathSegments { static final PathSegments EMPTY = new PathSegments("", Collections.emptySet()); @@ -74,15 +74,15 @@ private PathSegments(String fullPath, Set segments) { } - boolean contains(String varName) { + public boolean contains(String varName) { return allNames.contains(varName); } - List matrixSegments() { + public List matrixSegments() { return withMatrixs; } - Segment segment(String varName) { + public Segment segment(String varName) { for (Segment segment : segments) { if (segment.isPathParameter(varName)) { @@ -92,11 +92,11 @@ Segment segment(String varName) { return null; } - String fullPath() { + public String fullPath() { return fullPath; } - static class Segment { + public static class Segment { private final String name; @@ -173,7 +173,7 @@ private String matrixKey(String varName) { return Character.toLowerCase(key.charAt(0)) + key.substring(1); } - void writeCreateSegment(Append writer, PlatformAdapter platform) { + public void writeCreateSegment(Append writer, PlatformAdapter platform) { writer.append(platform.indent()); writer.append(" PathSegment %s_segment = PathSegment.of(", name); platform.writeReadParameter(writer, ParamType.PATHPARAM, name + "_segment"); diff --git a/generator-core/src/main/java/io/dinject/webroutegen/PlatformAdapter.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/PlatformAdapter.java similarity index 96% rename from generator-core/src/main/java/io/dinject/webroutegen/PlatformAdapter.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/PlatformAdapter.java index 8bef29cec..abef69a64 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/PlatformAdapter.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/PlatformAdapter.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; import java.util.List; diff --git a/generator-core/src/main/java/io/dinject/webroutegen/ProcessingContext.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/ProcessingContext.java similarity index 79% rename from generator-core/src/main/java/io/dinject/webroutegen/ProcessingContext.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/ProcessingContext.java index a57232c97..3d930ea4b 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/ProcessingContext.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/ProcessingContext.java @@ -1,6 +1,6 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; -import io.dinject.webroutegen.openapi.DocContext; +import io.avaje.http.generator.core.openapi.DocContext; import javax.annotation.processing.Filer; import javax.annotation.processing.Messager; @@ -47,23 +47,23 @@ private boolean isTypeAvailable(String canonicalName) { return null != getTypeElement(canonicalName); } - TypeElement getTypeElement(String canonicalName) { + public TypeElement getTypeElement(String canonicalName) { return elements.getTypeElement(canonicalName); } - boolean isGeneratedAvailable() { + public boolean isGeneratedAvailable() { return generatedAnnotation != null; } - String getGeneratedAnnotation() { + public String getGeneratedAnnotation() { return generatedAnnotation; } - boolean isOpenApiAvailable() { + public boolean isOpenApiAvailable() { return openApiAvailable; } - void logError(Element e, String msg, Object... args) { + public void logError(Element e, String msg, Object... args) { messager.printMessage(Diagnostic.Kind.ERROR, String.format(msg, args), e); } @@ -74,23 +74,23 @@ void logError(Element e, String msg, Object... args) { /** * Create a file writer for the given class name. */ - JavaFileObject createWriter(String cls, Element origin) throws IOException { + public JavaFileObject createWriter(String cls, Element origin) throws IOException { return filer.createSourceFile(cls, origin); } - String getDocComment(Element param) { + public String getDocComment(Element param) { return elements.getDocComment(param); } - DocContext doc() { + public DocContext doc() { return docContext; } - Element asElement(TypeMirror typeMirror) { + public Element asElement(TypeMirror typeMirror) { return types.asElement(typeMirror); } - TypeMirror asMemberOf(DeclaredType declaredType, Element element) { + public TypeMirror asMemberOf(DeclaredType declaredType, Element element) { return types.asMemberOf(declaredType, element); } diff --git a/generator-core/src/main/java/io/dinject/webroutegen/RequestScopeTypes.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/RequestScopeTypes.java similarity index 94% rename from generator-core/src/main/java/io/dinject/webroutegen/RequestScopeTypes.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/RequestScopeTypes.java index 3867de412..b9afd2c06 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/RequestScopeTypes.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/RequestScopeTypes.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; import java.util.HashSet; import java.util.Set; diff --git a/generator-core/src/main/java/io/dinject/webroutegen/TypeHandler.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/TypeHandler.java similarity index 92% rename from generator-core/src/main/java/io/dinject/webroutegen/TypeHandler.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/TypeHandler.java index 3b9056caf..b85e9aca8 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/TypeHandler.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/TypeHandler.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; /** * Handles type conversion for path and query parameters. diff --git a/generator-core/src/main/java/io/dinject/webroutegen/TypeMap.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/TypeMap.java similarity index 99% rename from generator-core/src/main/java/io/dinject/webroutegen/TypeMap.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/TypeMap.java index 5f3bf5318..ed7771f17 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/TypeMap.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/TypeMap.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; import java.util.HashMap; import java.util.Map; diff --git a/generator-core/src/main/java/io/dinject/webroutegen/Util.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/Util.java similarity index 92% rename from generator-core/src/main/java/io/dinject/webroutegen/Util.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/Util.java index 1fb3255e9..603c3fb58 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/Util.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/Util.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.AnnotationValue; @@ -48,7 +48,7 @@ static String combinePath(String beanPath, String webMethodPath) { return sb.toString(); } - static String shortName(String fullType) { + public static String shortName(String fullType) { int p = fullType.lastIndexOf('.'); if (p == -1) { return fullType; @@ -57,7 +57,7 @@ static String shortName(String fullType) { } } - static String snakeCase(String name) { + public static String snakeCase(String name) { StringBuilder sb = new StringBuilder(name.length() + 5); @@ -76,7 +76,7 @@ static String snakeCase(String name) { return sb.toString(); } - static String initcapSnake(String input) { + public static String initcapSnake(String input) { StringBuilder sb = new StringBuilder(input.length()); int len = input.length(); @@ -108,7 +108,7 @@ static String initcapSnake(String input) { * * @param element The bean or method */ - static List findRoles(Element element) { + public static List findRoles(Element element) { List roles = new ArrayList<>(); @@ -137,7 +137,7 @@ private static boolean isRolesAnnotation(DeclaredType annotationType) { /** * Return the bean property name given the setter method. */ - static String propertyName(String setterMethod) { + public static String propertyName(String setterMethod) { String prop = setterMethod.substring(3); return Character.toLowerCase(prop.charAt(0)) + prop.substring(1); diff --git a/generator-core/src/main/java/io/dinject/webroutegen/WebMethod.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/WebMethod.java similarity index 92% rename from generator-core/src/main/java/io/dinject/webroutegen/WebMethod.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/WebMethod.java index 078913de3..f37800811 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/WebMethod.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/WebMethod.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; public enum WebMethod { GET(200), diff --git a/generator-core/src/main/java/io/dinject/webroutegen/javadoc/Javadoc.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/javadoc/Javadoc.java similarity index 96% rename from generator-core/src/main/java/io/dinject/webroutegen/javadoc/Javadoc.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/javadoc/Javadoc.java index ed8cf4fb4..95f2f3d87 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/javadoc/Javadoc.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/javadoc/Javadoc.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen.javadoc; +package io.avaje.http.generator.core.javadoc; import java.util.Collections; diff --git a/generator-core/src/main/java/io/dinject/webroutegen/javadoc/JavadocParser.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/javadoc/JavadocParser.java similarity index 98% rename from generator-core/src/main/java/io/dinject/webroutegen/javadoc/JavadocParser.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/javadoc/JavadocParser.java index 1dcb88d27..79b3c446d 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/javadoc/JavadocParser.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/javadoc/JavadocParser.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen.javadoc; +package io.avaje.http.generator.core.javadoc; import java.util.HashSet; import java.util.LinkedHashMap; diff --git a/generator-core/src/main/java/io/dinject/webroutegen/openapi/DocContext.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/DocContext.java similarity index 99% rename from generator-core/src/main/java/io/dinject/webroutegen/openapi/DocContext.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/DocContext.java index 3929b64fb..903a46f6d 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/openapi/DocContext.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/DocContext.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen.openapi; +package io.avaje.http.generator.core.openapi; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/generator-core/src/main/java/io/dinject/webroutegen/openapi/KnownTypes.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/KnownTypes.java similarity index 99% rename from generator-core/src/main/java/io/dinject/webroutegen/openapi/KnownTypes.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/KnownTypes.java index 34d29e88b..7f228050d 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/openapi/KnownTypes.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/KnownTypes.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen.openapi; +package io.avaje.http.generator.core.openapi; import io.swagger.v3.oas.models.media.BooleanSchema; import io.swagger.v3.oas.models.media.DateSchema; diff --git a/generator-core/src/main/java/io/dinject/webroutegen/openapi/MethodDocBuilder.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/MethodDocBuilder.java similarity index 93% rename from generator-core/src/main/java/io/dinject/webroutegen/openapi/MethodDocBuilder.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/MethodDocBuilder.java index 5f2ddb61f..1cd1d05a2 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/openapi/MethodDocBuilder.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/MethodDocBuilder.java @@ -1,9 +1,9 @@ -package io.dinject.webroutegen.openapi; +package io.avaje.http.generator.core.openapi; import io.avaje.http.api.MediaType; -import io.dinject.webroutegen.MethodParam; -import io.dinject.webroutegen.MethodReader; -import io.dinject.webroutegen.javadoc.Javadoc; +import io.avaje.http.generator.core.MethodParam; +import io.avaje.http.generator.core.MethodReader; +import io.avaje.http.generator.core.javadoc.Javadoc; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; diff --git a/generator-core/src/main/java/io/dinject/webroutegen/openapi/MethodParamDocBuilder.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/MethodParamDocBuilder.java similarity index 90% rename from generator-core/src/main/java/io/dinject/webroutegen/openapi/MethodParamDocBuilder.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/MethodParamDocBuilder.java index e1f17b004..57badb969 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/openapi/MethodParamDocBuilder.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/MethodParamDocBuilder.java @@ -1,8 +1,8 @@ -package io.dinject.webroutegen.openapi; +package io.avaje.http.generator.core.openapi; -import io.dinject.webroutegen.ElementReader; -import io.dinject.webroutegen.ParamType; -import io.dinject.webroutegen.javadoc.Javadoc; +import io.avaje.http.generator.core.ElementReader; +import io.avaje.http.generator.core.ParamType; +import io.avaje.http.generator.core.javadoc.Javadoc; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; diff --git a/generator-core/src/main/java/io/dinject/webroutegen/openapi/SchemaDocBuilder.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/SchemaDocBuilder.java similarity index 98% rename from generator-core/src/main/java/io/dinject/webroutegen/openapi/SchemaDocBuilder.java rename to http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/SchemaDocBuilder.java index e62877aa7..81fa64cd7 100644 --- a/generator-core/src/main/java/io/dinject/webroutegen/openapi/SchemaDocBuilder.java +++ b/http-generator-core/src/main/java/io/avaje/http/generator/core/openapi/SchemaDocBuilder.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen.openapi; +package io.avaje.http.generator.core.openapi; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.models.Operation; @@ -30,7 +30,7 @@ import java.util.Set; import java.util.TreeMap; -import static io.dinject.webroutegen.Util.typeDef; +import static io.avaje.http.generator.core.Util.typeDef; /** * Help build OpenAPI Schema objects. diff --git a/generator-core/src/main/java/org/jetbrains/annotations/NotNull.java b/http-generator-core/src/main/java/org/jetbrains/annotations/NotNull.java similarity index 100% rename from generator-core/src/main/java/org/jetbrains/annotations/NotNull.java rename to http-generator-core/src/main/java/org/jetbrains/annotations/NotNull.java diff --git a/generator-core/src/test/java/io/dinject/webroutegen/PathSegmentsTest.java b/http-generator-core/src/test/java/io/avaje/http/generator/core/PathSegmentsTest.java similarity index 95% rename from generator-core/src/test/java/io/dinject/webroutegen/PathSegmentsTest.java rename to http-generator-core/src/test/java/io/avaje/http/generator/core/PathSegmentsTest.java index 3ad774e16..16b31e944 100644 --- a/generator-core/src/test/java/io/dinject/webroutegen/PathSegmentsTest.java +++ b/http-generator-core/src/test/java/io/avaje/http/generator/core/PathSegmentsTest.java @@ -1,5 +1,6 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.util.List; @@ -71,7 +72,7 @@ public void pathMatrixParams_colonPrefix() { PathSegments segments = PathSegments.parse("/:id;key;other/:foo;baz"); List matrixSegments = segments.matrixSegments(); - assertThat(matrixSegments).hasSize(2); + Assertions.assertThat(matrixSegments).hasSize(2); assertThat(matrixSegments.get(0).name()).isEqualTo("id"); assertThat(matrixSegments.get(0).matrixKeys()).containsOnly("key", "other"); @@ -88,7 +89,7 @@ public void pathMatrixParams_normalised() { PathSegments segments = PathSegments.parse("/{id;key;other}/{foo;baz}"); List matrixSegments = segments.matrixSegments(); - assertThat(matrixSegments).hasSize(2); + Assertions.assertThat(matrixSegments).hasSize(2); assertThat(matrixSegments.get(0).name()).isEqualTo("id"); assertThat(matrixSegments.get(0).matrixKeys()).containsOnly("key", "other"); diff --git a/generator-core/src/test/java/io/dinject/webroutegen/UtilTest.java b/http-generator-core/src/test/java/io/avaje/http/generator/core/UtilTest.java similarity index 98% rename from generator-core/src/test/java/io/dinject/webroutegen/UtilTest.java rename to http-generator-core/src/test/java/io/avaje/http/generator/core/UtilTest.java index 9b5979d6e..dbab04114 100644 --- a/generator-core/src/test/java/io/dinject/webroutegen/UtilTest.java +++ b/http-generator-core/src/test/java/io/avaje/http/generator/core/UtilTest.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.core; import org.junit.jupiter.api.Test; diff --git a/generator-core/src/test/java/io/dinject/webroutegen/javadoc/JavadocParserTest.java b/http-generator-core/src/test/java/io/avaje/http/generator/core/javadoc/JavadocParserTest.java similarity index 98% rename from generator-core/src/test/java/io/dinject/webroutegen/javadoc/JavadocParserTest.java rename to http-generator-core/src/test/java/io/avaje/http/generator/core/javadoc/JavadocParserTest.java index 786a5104d..14166b45c 100644 --- a/generator-core/src/test/java/io/dinject/webroutegen/javadoc/JavadocParserTest.java +++ b/http-generator-core/src/test/java/io/avaje/http/generator/core/javadoc/JavadocParserTest.java @@ -1,4 +1,4 @@ -package io.dinject.webroutegen.javadoc; +package io.avaje.http.generator.core.javadoc; import org.junit.jupiter.api.Test; diff --git a/generator-core/src/test/java/io/dinject/webroutegen/openapi/MethodDocBuilderTest.java b/http-generator-core/src/test/java/io/avaje/http/generator/core/openapi/MethodDocBuilderTest.java similarity index 94% rename from generator-core/src/test/java/io/dinject/webroutegen/openapi/MethodDocBuilderTest.java rename to http-generator-core/src/test/java/io/avaje/http/generator/core/openapi/MethodDocBuilderTest.java index 957ec9a1f..dd19c4454 100644 --- a/generator-core/src/test/java/io/dinject/webroutegen/openapi/MethodDocBuilderTest.java +++ b/http-generator-core/src/test/java/io/avaje/http/generator/core/openapi/MethodDocBuilderTest.java @@ -1,6 +1,6 @@ -package io.dinject.webroutegen.openapi; +package io.avaje.http.generator.core.openapi; -import io.dinject.webroutegen.MethodReader; +import io.avaje.http.generator.core.MethodReader; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/generator-helidon/pom.xml b/http-generator-helidon/pom.xml similarity index 77% rename from generator-helidon/pom.xml rename to http-generator-helidon/pom.xml index 6ce1f115b..d394a5d80 100644 --- a/generator-helidon/pom.xml +++ b/http-generator-helidon/pom.xml @@ -2,20 +2,20 @@ 4.0.0 - helidon-generator + avaje-http-helidon-generator - io.dinject - controller-parent - 1.23-SNAPSHOT + io.avaje + avaje-http-generator-parent + 0.1-SNAPSHOT .. - io.dinject - webgen-core + io.avaje + avaje-http-generator-core ${project.version} diff --git a/generator-helidon/src/main/java/io/dinject/webroutegen/ControllerMethodWriter.java b/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/ControllerMethodWriter.java similarity index 91% rename from generator-helidon/src/main/java/io/dinject/webroutegen/ControllerMethodWriter.java rename to http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/ControllerMethodWriter.java index 74c3b0a79..434bfa497 100644 --- a/generator-helidon/src/main/java/io/dinject/webroutegen/ControllerMethodWriter.java +++ b/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/ControllerMethodWriter.java @@ -1,6 +1,12 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.helidon; import io.avaje.http.api.MediaType; +import io.avaje.http.generator.core.Append; +import io.avaje.http.generator.core.MethodParam; +import io.avaje.http.generator.core.MethodReader; +import io.avaje.http.generator.core.PathSegments; +import io.avaje.http.generator.core.ProcessingContext; +import io.avaje.http.generator.core.WebMethod; import java.util.List; diff --git a/generator-helidon/src/main/java/io/dinject/webroutegen/ControllerWriter.java b/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/ControllerWriter.java similarity index 91% rename from generator-helidon/src/main/java/io/dinject/webroutegen/ControllerWriter.java rename to http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/ControllerWriter.java index 55dab303f..de147e13c 100644 --- a/generator-helidon/src/main/java/io/dinject/webroutegen/ControllerWriter.java +++ b/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/ControllerWriter.java @@ -1,4 +1,9 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.helidon; + +import io.avaje.http.generator.core.BaseControllerWriter; +import io.avaje.http.generator.core.ControllerReader; +import io.avaje.http.generator.core.MethodReader; +import io.avaje.http.generator.core.ProcessingContext; import java.io.IOException; import java.util.List; diff --git a/generator-helidon/src/main/java/io/dinject/webroutegen/HelidonPlatformAdapter.java b/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/HelidonPlatformAdapter.java similarity index 93% rename from generator-helidon/src/main/java/io/dinject/webroutegen/HelidonPlatformAdapter.java rename to http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/HelidonPlatformAdapter.java index 711294994..c2ac630ac 100644 --- a/generator-helidon/src/main/java/io/dinject/webroutegen/HelidonPlatformAdapter.java +++ b/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/HelidonPlatformAdapter.java @@ -1,4 +1,9 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.helidon; + +import io.avaje.http.generator.core.Append; +import io.avaje.http.generator.core.ControllerReader; +import io.avaje.http.generator.core.ParamType; +import io.avaje.http.generator.core.PlatformAdapter; import java.util.List; diff --git a/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/HelidonProcessor.java b/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/HelidonProcessor.java new file mode 100644 index 000000000..4f5b49509 --- /dev/null +++ b/http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/HelidonProcessor.java @@ -0,0 +1,21 @@ +package io.avaje.http.generator.helidon; + +import io.avaje.http.generator.core.BaseProcessor; +import io.avaje.http.generator.core.ControllerReader; +import io.avaje.http.generator.core.PlatformAdapter; +import io.avaje.http.generator.core.ProcessingContext; + +import java.io.IOException; + +public class HelidonProcessor extends BaseProcessor { + + @Override + protected PlatformAdapter providePlatformAdapter() { + return new HelidonPlatformAdapter(); + } + + @Override + public void writeControllerAdapter(ProcessingContext ctx, ControllerReader reader) throws IOException { + new ControllerWriter(reader, ctx).write(); + } +} diff --git a/http-generator-helidon/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/http-generator-helidon/src/main/resources/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 000000000..f3a34e447 --- /dev/null +++ b/http-generator-helidon/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -0,0 +1 @@ +io.avaje.http.generator.helidon.HelidonProcessor diff --git a/generator-javalin/pom.xml b/http-generator-javalin/pom.xml similarity index 77% rename from generator-javalin/pom.xml rename to http-generator-javalin/pom.xml index d38881c73..f3e64f832 100644 --- a/generator-javalin/pom.xml +++ b/http-generator-javalin/pom.xml @@ -2,20 +2,20 @@ 4.0.0 - javalin-generator + avaje-http-javalin-generator - io.dinject - controller-parent - 1.23-SNAPSHOT + io.avaje + avaje-http-generator-parent + 0.1-SNAPSHOT .. - io.dinject - webgen-core + io.avaje + avaje-http-generator-core ${project.version} diff --git a/generator-javalin/src/main/java/io/dinject/webroutegen/ControllerMethodWriter.java b/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerMethodWriter.java similarity index 87% rename from generator-javalin/src/main/java/io/dinject/webroutegen/ControllerMethodWriter.java rename to http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerMethodWriter.java index 765c99cac..7bfc352a6 100644 --- a/generator-javalin/src/main/java/io/dinject/webroutegen/ControllerMethodWriter.java +++ b/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerMethodWriter.java @@ -1,6 +1,13 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.javalin; import io.avaje.http.api.MediaType; +import io.avaje.http.generator.core.Append; +import io.avaje.http.generator.core.MethodParam; +import io.avaje.http.generator.core.MethodReader; +import io.avaje.http.generator.core.PathSegments; +import io.avaje.http.generator.core.ProcessingContext; +import io.avaje.http.generator.core.Util; +import io.avaje.http.generator.core.WebMethod; import java.util.List; diff --git a/generator-javalin/src/main/java/io/dinject/webroutegen/ControllerWriter.java b/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerWriter.java similarity index 89% rename from generator-javalin/src/main/java/io/dinject/webroutegen/ControllerWriter.java rename to http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerWriter.java index 2062b428d..2a4e93555 100644 --- a/generator-javalin/src/main/java/io/dinject/webroutegen/ControllerWriter.java +++ b/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerWriter.java @@ -1,4 +1,9 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.javalin; + +import io.avaje.http.generator.core.BaseControllerWriter; +import io.avaje.http.generator.core.ControllerReader; +import io.avaje.http.generator.core.MethodReader; +import io.avaje.http.generator.core.ProcessingContext; import java.io.IOException; diff --git a/generator-javalin/src/main/java/io/dinject/webroutegen/JavalinAdapter.java b/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/JavalinAdapter.java similarity index 86% rename from generator-javalin/src/main/java/io/dinject/webroutegen/JavalinAdapter.java rename to http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/JavalinAdapter.java index 9b2914c41..e9592e7e9 100644 --- a/generator-javalin/src/main/java/io/dinject/webroutegen/JavalinAdapter.java +++ b/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/JavalinAdapter.java @@ -1,4 +1,9 @@ -package io.dinject.webroutegen; +package io.avaje.http.generator.javalin; + +import io.avaje.http.generator.core.Append; +import io.avaje.http.generator.core.ControllerReader; +import io.avaje.http.generator.core.ParamType; +import io.avaje.http.generator.core.PlatformAdapter; import java.util.List; diff --git a/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/JavalinProcessor.java b/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/JavalinProcessor.java new file mode 100644 index 000000000..db742db89 --- /dev/null +++ b/http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/JavalinProcessor.java @@ -0,0 +1,21 @@ +package io.avaje.http.generator.javalin; + +import io.avaje.http.generator.core.BaseProcessor; +import io.avaje.http.generator.core.ControllerReader; +import io.avaje.http.generator.core.PlatformAdapter; +import io.avaje.http.generator.core.ProcessingContext; + +import java.io.IOException; + +public class JavalinProcessor extends BaseProcessor { + + @Override + protected PlatformAdapter providePlatformAdapter() { + return new JavalinAdapter(); + } + + @Override + public void writeControllerAdapter(ProcessingContext ctx, ControllerReader reader) throws IOException { + new ControllerWriter(reader, ctx).write(); + } +} diff --git a/http-generator-javalin/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/http-generator-javalin/src/main/resources/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 000000000..dc1c70149 --- /dev/null +++ b/http-generator-javalin/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -0,0 +1 @@ +io.avaje.http.generator.javalin.JavalinProcessor diff --git a/pom.xml b/pom.xml index 7967b3b0d..e0c9993d8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,9 +2,9 @@ 4.0.0 - io.dinject - controller-parent - 1.23-SNAPSHOT + io.avaje + avaje-http-generator-parent + 0.1-SNAPSHOT pom @@ -50,12 +50,12 @@ - controller - generator-core - generator-javalin - generator-helidon + http-api + http-generator-core + http-generator-javalin + http-generator-helidon + tests - diff --git a/tests/test-client/pom.xml b/tests/test-client/pom.xml index a8a8c7411..4ef0c233a 100644 --- a/tests/test-client/pom.xml +++ b/tests/test-client/pom.xml @@ -12,6 +12,7 @@ 4.0.0 test-client + 1 @@ -34,9 +35,9 @@ - io.dinject - dinject-controller - 1.21 + io.avaje + avaje-http-api + 0.1 diff --git a/tests/test-client/src/main/java/org/example/Simple$httpclient.java b/tests/test-client/src/main/java/org/example/Simple$httpclient.java index ae3380669..eb28ad350 100644 --- a/tests/test-client/src/main/java/org/example/Simple$httpclient.java +++ b/tests/test-client/src/main/java/org/example/Simple$httpclient.java @@ -1,7 +1,7 @@ package org.example; import io.avaje.http.client.HttpClientContext; -import io.dinject.controller.QueryParam; +import io.avaje.http.api.QueryParam; import java.util.List; diff --git a/tests/test-client/src/main/java/org/example/Simple.java b/tests/test-client/src/main/java/org/example/Simple.java index d2a520ab2..1aadf39c5 100644 --- a/tests/test-client/src/main/java/org/example/Simple.java +++ b/tests/test-client/src/main/java/org/example/Simple.java @@ -1,7 +1,7 @@ package org.example; -import io.dinject.controller.Get; +import io.avaje.http.api.Get; import java.util.List; diff --git a/tests/test-helidon/pom.xml b/tests/test-helidon/pom.xml index 897f39bac..f52642013 100644 --- a/tests/test-helidon/pom.xml +++ b/tests/test-helidon/pom.xml @@ -6,7 +6,7 @@ org.example test-helidon - 1.0 + 1 org.avaje @@ -17,8 +17,8 @@ org.example.Main 2.0.1 - 2.3 - 1.23-SNAPSHOT + 0.9 + 0.1-SNAPSHOT @@ -36,27 +36,25 @@ io.avaje - avaje-inject - 0.1-SNAPSHOT + avaje-http-api + 0.1 - io.avaje - avaje-http-api - 0.1-SNAPSHOT + avaje-inject + ${avaje-inject-version} - io.avaje avaje-inject-generator - 0.1-SNAPSHOT + ${avaje-inject-version} provided - io.dinject - helidon-generator - ${dinject-controller-version} + io.avaje + avaje-http-helidon-generator + ${avaje-http-version} provided diff --git a/tests/test-javalin/pom.xml b/tests/test-javalin/pom.xml index 00e6bd03d..b03796a9e 100644 --- a/tests/test-javalin/pom.xml +++ b/tests/test-javalin/pom.xml @@ -6,7 +6,7 @@ org.example test-javalin - 1.0 + 1 org.avaje @@ -18,8 +18,8 @@ org.example.myapp.Main 2.0.8 1.3.31 - 2.3 - 1.23-SNAPSHOT + 0.9 + 0.1-SNAPSHOT @@ -45,19 +45,19 @@ io.avaje avaje-inject - 0.1-SNAPSHOT + 0.9 io.avaje avaje-http-api - 0.1-SNAPSHOT + 0.1 io.avaje avaje-http-hibernate-validator - 0.1-SNAPSHOT + 0.9 @@ -71,14 +71,14 @@ io.avaje avaje-inject-generator - 0.1-SNAPSHOT + 0.9 provided - io.dinject - javalin-generator - ${dinject-controller-version} + io.avaje + avaje-http-javalin-generator + ${avaje-http-version} provided