#37 - Move to io.avaje

generator-client/pom.xml → 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">
   <parent>
-    <artifactId>controller-parent</artifactId>
-    <groupId>io.dinject</groupId>
+    <artifactId>avaje-http-generator-parent</artifactId>
+    <groupId>io.avaje</groupId>
     <version>1.22-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>

generator-core/pom.xml → http-generator-core/pom.xml

@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>webgen-core</artifactId>
+  <artifactId>avaje-http-generator-core</artifactId>
 
   <parent>
-    <groupId>io.dinject</groupId>
-    <artifactId>controller-parent</artifactId>
-    <version>1.23-SNAPSHOT</version>
+    <groupId>io.avaje</groupId>
+    <artifactId>avaje-http-generator-parent</artifactId>
+    <version>0.1-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -31,9 +31,9 @@
     </dependency>
 
     <dependency>
-      <groupId>io.dinject</groupId>
-      <artifactId>dinject-controller</artifactId>
-      <version>${project.version}</version>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-http-api</artifactId>
+      <version>0.1</version>
     </dependency>
 
     <dependency>
@@ -56,7 +56,6 @@
 
   </dependencies>
 
-
   <build>
     <plugins>
       <plugin>

generator-core/src/main/java/io/dinject/webroutegen/Append.java → http-generator-core/src/main/java/io/avaje/http/generator/core/Append.java

@@ -1,20 +1,20 @@
-package io.dinject.webroutegen;
+package io.avaje.http.generator.core;
 
 import java.io.IOException;
 import java.io.Writer;
 
 /**
  * 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));
   }
 

generator-core/src/main/java/io/dinject/webroutegen/BaseControllerWriter.java → 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;

generator-core/src/main/java/io/dinject/webroutegen/BaseProcessor.java → 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;
 
 }

generator-core/src/main/java/io/dinject/webroutegen/BeanParamReader.java → 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;

generator-core/src/main/java/io/dinject/webroutegen/Constants.java → 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 {
 

generator-core/src/main/java/io/dinject/webroutegen/ControllerReader.java → 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,35 +227,35 @@ private void readMethod(ExecutableElement method, DeclaredType declaredType) {
     }
   }
 
-  List<String> getRoles() {
+  public List<String> getRoles() {
     return roles;
   }
 
-  List<MethodReader> getMethods() {
+  public List<MethodReader> getMethods() {
     return methods;
   }
 
-  String getPath() {
+  public String getPath() {
     Path path = findAnnotation(Path.class);
     if (path == null) {
       return null;
     }
     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<String> getStaticImportTypes() {
+  public Set<String> getStaticImportTypes() {
     return staticImportTypes;
   }
 
-  Set<String> getImportTypes() {
+  public Set<String> getImportTypes() {
     return importTypes;
   }
 

generator-core/src/main/java/io/dinject/webroutegen/ElementReader.java → 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) {

generator-core/src/main/java/io/dinject/webroutegen/MethodParam.java → 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);
   }
 

generator-core/src/main/java/io/dinject/webroutegen/MethodReader.java → 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;
 

generator-core/src/main/java/io/dinject/webroutegen/ParamType.java → 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 {
 

generator-core/src/main/java/io/dinject/webroutegen/PathSegments.java → 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<Segment> segments) {
   }
 
 
-  boolean contains(String varName) {
+  public boolean contains(String varName) {
     return allNames.contains(varName);
   }
 
-  List<Segment> matrixSegments() {
+  public List<Segment> 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");

generator-core/src/main/java/io/dinject/webroutegen/PlatformAdapter.java → 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;