#37 - Change package to io.avaje.http etc.

rbygrave · rbygrave · commit 2f175637a240 · 2020-08-28T00:58:35.000+12:00
diff --git a/controller/pom.xml b/controller/pom.xml
@@ -2,7 +2,9 @@
 <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>dinject-controller</artifactId>
+  <artifactId>avaje-http-api</artifactId>
+  <groupId>io.avaje</groupId>
+  <version>0.1-SNAPSHOT</version>
 
   <parent>
     <groupId>io.dinject</groupId>
diff --git a/controller/src/main/java/io/avaje/http/api/BeanParam.java b/controller/src/main/java/io/avaje/http/api/BeanParam.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/Controller.java b/controller/src/main/java/io/avaje/http/api/Controller.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/Cookie.java b/controller/src/main/java/io/avaje/http/api/Cookie.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/Default.java b/controller/src/main/java/io/avaje/http/api/Default.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/Delete.java b/controller/src/main/java/io/avaje/http/api/Delete.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/Form.java b/controller/src/main/java/io/avaje/http/api/Form.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/FormParam.java b/controller/src/main/java/io/avaje/http/api/FormParam.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/Get.java b/controller/src/main/java/io/avaje/http/api/Get.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/Header.java b/controller/src/main/java/io/avaje/http/api/Header.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/HttpMethod.java b/controller/src/main/java/io/avaje/http/api/HttpMethod.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/controller/src/main/java/io/avaje/http/api/InvalidPathArgumentException.java b/controller/src/main/java/io/avaje/http/api/InvalidPathArgumentException.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 /**
  * Exception for all invalid path type conversions - numbers, uuid, date time types etc.
diff --git a/controller/src/main/java/io/avaje/http/api/InvalidTypeArgumentException.java b/controller/src/main/java/io/avaje/http/api/InvalidTypeArgumentException.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 /**
  * Exception for all invalid path type conversions - numbers, uuid, date time types etc.
diff --git a/controller/src/main/java/io/avaje/http/api/MediaType.java b/controller/src/main/java/io/avaje/http/api/MediaType.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 /**
  * Common media types used by controllers.
diff --git a/controller/src/main/java/io/avaje/http/api/Patch.java b/controller/src/main/java/io/avaje/http/api/Patch.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/Path.java b/controller/src/main/java/io/avaje/http/api/Path.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/PathSegment.java b/controller/src/main/java/io/avaje/http/api/PathSegment.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/controller/src/main/java/io/avaje/http/api/PathTypeConversion.java b/controller/src/main/java/io/avaje/http/api/PathTypeConversion.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.math.BigDecimal;
 import java.time.Instant;
diff --git a/controller/src/main/java/io/avaje/http/api/Post.java b/controller/src/main/java/io/avaje/http/api/Post.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/Produces.java b/controller/src/main/java/io/avaje/http/api/Produces.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/Put.java b/controller/src/main/java/io/avaje/http/api/Put.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/QueryParam.java b/controller/src/main/java/io/avaje/http/api/QueryParam.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
diff --git a/controller/src/main/java/io/avaje/http/api/RequiredArgumentException.java b/controller/src/main/java/io/avaje/http/api/RequiredArgumentException.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 /**
  * Exception for parameters that are required.
diff --git a/controller/src/main/java/io/avaje/http/api/ValidationException.java b/controller/src/main/java/io/avaje/http/api/ValidationException.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 import java.util.Map;
 
diff --git a/controller/src/main/java/io/avaje/http/api/Validator.java b/controller/src/main/java/io/avaje/http/api/Validator.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 /**
  * Validator for form beans or request beans.
diff --git a/controller/src/main/java/io/avaje/http/api/WebRoutes.java b/controller/src/main/java/io/avaje/http/api/WebRoutes.java
@@ -1,4 +1,4 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
 /**
  * Registers routes to a web framework.
diff --git a/controller/src/main/java/io/avaje/http/api/package-info.java b/controller/src/main/java/io/avaje/http/api/package-info.java
@@ -2,4 +2,4 @@
  * Provides annotations to support Controllers for web frameworks that
  * are route based (like Sparkjava, Javlin etc).
  */
-package io.dinject.controller;
+package io.avaje.http.api;
diff --git a/controller/src/test/java/io/avaje/http/api/PathSegmentTest.java b/controller/src/test/java/io/avaje/http/api/PathSegmentTest.java
@@ -1,5 +1,6 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
+import io.avaje.http.api.PathSegment;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/controller/src/test/java/io/avaje/http/api/PathTypeConversionTest.java b/controller/src/test/java/io/avaje/http/api/PathTypeConversionTest.java
@@ -1,5 +1,9 @@
-package io.dinject.controller;
+package io.avaje.http.api;
 
+import io.avaje.http.api.InvalidPathArgumentException;
+import io.avaje.http.api.InvalidTypeArgumentException;
+import io.avaje.http.api.PathTypeConversion;
+import io.avaje.http.api.RequiredArgumentException;
 import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
diff --git a/generator-core/src/main/java/io/dinject/webroutegen/BaseProcessor.java b/generator-core/src/main/java/io/dinject/webroutegen/BaseProcessor.java
@@ -1,6 +1,6 @@
 package io.dinject.webroutegen;
 
-import io.dinject.controller.Controller;
+import io.avaje.http.api.Controller;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 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/Constants.java b/generator-core/src/main/java/io/dinject/webroutegen/Constants.java
@@ -8,9 +8,9 @@ class Constants {
   static final String GENERATED_9 = "javax.annotation.processing.Generated";
   //static final String GENERATED_8 = "javax.annotation.Generated";
 
-  static final String IMPORT_PATH_TYPE_CONVERT = "import static io.dinject.controller.PathTypeConversion.*;";
+  static final String IMPORT_PATH_TYPE_CONVERT = "import static io.avaje.http.api.PathTypeConversion.*;";
 
-  static final String IMPORT_CONTROLLER = "io.dinject.controller.*";
-  static final String VALIDATOR = "io.dinject.controller.Validator";
+  static final String IMPORT_CONTROLLER = "io.avaje.http.api.*";
+  static final String VALIDATOR = "io.avaje.http.api.Validator";
 
 }
diff --git a/generator-core/src/main/java/io/dinject/webroutegen/ControllerReader.java b/generator-core/src/main/java/io/dinject/webroutegen/ControllerReader.java
@@ -1,7 +1,7 @@
 package io.dinject.webroutegen;
 
-import io.dinject.controller.Path;
-import io.dinject.controller.Produces;
+import io.avaje.http.api.Path;
+import io.avaje.http.api.Produces;
 import io.swagger.v3.oas.annotations.Hidden;
 
 import javax.lang.model.element.Element;
diff --git a/generator-core/src/main/java/io/dinject/webroutegen/ElementReader.java b/generator-core/src/main/java/io/dinject/webroutegen/ElementReader.java
@@ -1,12 +1,12 @@
 package io.dinject.webroutegen;
 
-import io.dinject.controller.BeanParam;
-import io.dinject.controller.Cookie;
-import io.dinject.controller.Default;
-import io.dinject.controller.Form;
-import io.dinject.controller.FormParam;
-import io.dinject.controller.Header;
-import io.dinject.controller.QueryParam;
+import io.avaje.http.api.BeanParam;
+import io.avaje.http.api.Cookie;
+import io.avaje.http.api.Default;
+import io.avaje.http.api.Form;
+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;
 
diff --git a/generator-core/src/main/java/io/dinject/webroutegen/MethodReader.java b/generator-core/src/main/java/io/dinject/webroutegen/MethodReader.java
@@ -1,12 +1,12 @@
 package io.dinject.webroutegen;
 
-import io.dinject.controller.Delete;
-import io.dinject.controller.Form;
-import io.dinject.controller.Get;
-import io.dinject.controller.Patch;
-import io.dinject.controller.Post;
-import io.dinject.controller.Produces;
-import io.dinject.controller.Put;
+import io.avaje.http.api.Delete;
+import io.avaje.http.api.Form;
+import io.avaje.http.api.Get;
+import io.avaje.http.api.Patch;
+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.swagger.v3.oas.annotations.tags.Tag;
diff --git a/generator-core/src/main/java/io/dinject/webroutegen/openapi/MethodDocBuilder.java b/generator-core/src/main/java/io/dinject/webroutegen/openapi/MethodDocBuilder.java
@@ -1,6 +1,6 @@
 package io.dinject.webroutegen.openapi;
 
-import io.dinject.controller.MediaType;
+import io.avaje.http.api.MediaType;
 import io.dinject.webroutegen.MethodParam;
 import io.dinject.webroutegen.MethodReader;
 import io.dinject.webroutegen.javadoc.Javadoc;
diff --git a/generator-helidon/src/main/java/io/dinject/webroutegen/ControllerMethodWriter.java b/generator-helidon/src/main/java/io/dinject/webroutegen/ControllerMethodWriter.java
@@ -1,6 +1,6 @@
 package io.dinject.webroutegen;
 
-import io.dinject.controller.MediaType;
+import io.avaje.http.api.MediaType;
 
 import java.util.List;
 
diff --git a/generator-javalin/src/main/java/io/dinject/webroutegen/ControllerMethodWriter.java b/generator-javalin/src/main/java/io/dinject/webroutegen/ControllerMethodWriter.java
@@ -1,6 +1,6 @@
 package io.dinject.webroutegen;
 
-import io.dinject.controller.MediaType;
+import io.avaje.http.api.MediaType;
 
 import java.util.List;
 
diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,7 @@
     <module>generator-core</module>
     <module>generator-javalin</module>
     <module>generator-helidon</module>
-<!--    <module>tests</module>-->
+    <module>tests</module>
 <!--    <module>generator-client</module>-->
   </modules>
 
diff --git a/tests/test-helidon/pom.xml b/tests/test-helidon/pom.xml
@@ -18,7 +18,7 @@
     <mainClass>org.example.Main</mainClass>
     <helidon-version>2.0.1</helidon-version>
     <dinject-version>2.3</dinject-version>
-    <dinject-controller-version>1.22-SNAPSHOT</dinject-controller-version>
+    <dinject-controller-version>1.23-SNAPSHOT</dinject-controller-version>
   </properties>
 
   <dependencies>
@@ -35,21 +35,21 @@
     </dependency>
 
     <dependency>
-      <groupId>io.dinject</groupId>
-      <artifactId>dinject</artifactId>
-      <version>${dinject-version}</version>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-inject</artifactId>
+      <version>0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>io.dinject</groupId>
-      <artifactId>dinject-controller</artifactId>
-      <version>${dinject-controller-version}</version>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-http-api</artifactId>
+      <version>0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>io.dinject</groupId>
-      <artifactId>dinject-generator</artifactId>
-      <version>${dinject-version}</version>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-inject-generator</artifactId>
+      <version>0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/tests/test-helidon/src/main/java/org/example/FooController.java b/tests/test-helidon/src/main/java/org/example/FooController.java
@@ -1,14 +1,14 @@
 package org.example;
 
-import io.dinject.controller.Controller;
-import io.dinject.controller.Delete;
-import io.dinject.controller.Form;
-import io.dinject.controller.Get;
-import io.dinject.controller.Header;
-import io.dinject.controller.Path;
-import io.dinject.controller.Post;
-import io.dinject.controller.Produces;
-import io.dinject.controller.Put;
+import io.avaje.http.api.Controller;
+import io.avaje.http.api.Delete;
+import io.avaje.http.api.Form;
+import io.avaje.http.api.Get;
+import io.avaje.http.api.Header;
+import io.avaje.http.api.Path;
+import io.avaje.http.api.Post;
+import io.avaje.http.api.Produces;
+import io.avaje.http.api.Put;
 import io.helidon.common.http.FormParams;
 import io.helidon.webserver.ServerRequest;
 import io.helidon.webserver.ServerResponse;
diff --git a/tests/test-helidon/src/main/java/org/example/Main.java b/tests/test-helidon/src/main/java/org/example/Main.java
@@ -1,6 +1,6 @@
 package org.example;
 
-import io.dinject.SystemContext;
+import io.avaje.inject.SystemContext;
 import io.helidon.health.HealthSupport;
 import io.helidon.media.jackson.JacksonSupport;
 import io.helidon.metrics.MetricsSupport;
diff --git a/tests/test-helidon/src/main/java/org/example/ReqScopedController.java b/tests/test-helidon/src/main/java/org/example/ReqScopedController.java
@@ -1,9 +1,9 @@
 package org.example;
 
-import io.dinject.controller.Controller;
-import io.dinject.controller.Get;
-import io.dinject.controller.Path;
-import io.dinject.controller.Produces;
+import io.avaje.http.api.Controller;
+import io.avaje.http.api.Get;
+import io.avaje.http.api.Path;
+import io.avaje.http.api.Produces;
 import io.helidon.webserver.ServerRequest;
 import io.helidon.webserver.ServerResponse;
 
diff --git a/tests/test-helidon/src/test/java/org/example/FooControllerTest.java b/tests/test-helidon/src/test/java/org/example/FooControllerTest.java
@@ -1,7 +1,7 @@
 package org.example;
 
 import io.avaje.http.client.HttpClientContext;
-import io.dinject.controller.Get;
+import io.avaje.http.api.Get;
 import io.restassured.response.Response;
 import org.example.api.FooBody;
 import org.junit.jupiter.api.Test;
diff --git a/tests/test-javalin/pom.xml b/tests/test-javalin/pom.xml
diff --git a/tests/test-javalin/src/main/java/org/example/myapp/Main.java b/tests/test-javalin/src/main/java/org/example/myapp/Main.java
diff --git a/tests/test-javalin/src/main/java/org/example/myapp/web/BarController.java b/tests/test-javalin/src/main/java/org/example/myapp/web/BarController.java
diff --git a/tests/test-javalin/src/main/java/org/example/myapp/web/BarInterface.java b/tests/test-javalin/src/main/java/org/example/myapp/web/BarInterface.java
diff --git a/tests/test-javalin/src/main/java/org/example/myapp/web/BaseController.java b/tests/test-javalin/src/main/java/org/example/myapp/web/BaseController.java
diff --git a/tests/test-javalin/src/main/java/org/example/myapp/web/BazController.java b/tests/test-javalin/src/main/java/org/example/myapp/web/BazController.java
diff --git a/tests/test-javalin/src/main/java/org/example/myapp/web/Hallo.java b/tests/test-javalin/src/main/java/org/example/myapp/web/Hallo.java
diff --git a/tests/test-javalin/src/main/java/org/example/myapp/web/HelloController.java b/tests/test-javalin/src/main/java/org/example/myapp/web/HelloController.java
diff --git a/tests/test-javalin/src/main/java/org/example/myapp/web/ReqScopedController.java b/tests/test-javalin/src/main/java/org/example/myapp/web/ReqScopedController.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.dinject.controller;`
	`1`	`+package io.avaje.http.api;`
`2`	`2`
`3`	`3`	`import java.lang.annotation.Retention;`
`4`	`4`	`import java.lang.annotation.Target;`