Merge branch 'SentryMan-roles-again'

Author: rbygrave

http-generator-core/src/main/java/io/avaje/http/generator/core/Util.java

@@ -8,7 +8,9 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.SimpleAnnotationValueVisitor8;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public class Util {
 
@@ -38,7 +40,7 @@ public static String typeDef(TypeMirror typeMirror) {
     }
   }
 
- public static String trimAnnotations(String type) {
+  public static String trimAnnotations(String type) {
     int pos = type.indexOf("@");
     if (pos == -1) {
       return type;
@@ -72,10 +74,14 @@ static String combinePath(String beanPath, String webMethodPath) {
   }
 
   public static String shortName(String fullType) {
+    return shortName(fullType, false);
+  }
+
+  public static String shortName(String fullType, boolean role) {
     int p = fullType.lastIndexOf('.');
     if (p == -1) {
       return fullType;
-    } else if (fullType.startsWith("java")) {
+    } else if (fullType.startsWith("java") || role) {
       return fullType.substring(p + 1);
     } else {
       var result = "";

http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerMethodWriter.java

@@ -78,7 +78,7 @@ void write(boolean requestScoped) {
         if (i > 0) {
           writer.append(", ");
         }
-        writer.append(Util.shortName(roles.get(i)));
+        writer.append(Util.shortName(roles.get(i), true));
       }
     }
     writer.append(");").eol().eol();

http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerMethodWriter.java

@@ -81,7 +81,7 @@ void write(boolean requestScoped) {
         if (i > 0) {
           writer.append(", ");
         }
-        writer.append(Util.shortName(roles.get(i)));
+        writer.append(Util.shortName(roles.get(i), true));
       }
     }
     writer.append(");").eol().eol();

tests/pom.xml

@@ -19,7 +19,7 @@
     <assertj.version>3.24.1</assertj.version>
     <jackson.version>2.14.1</jackson.version>
     <jex.version>2.5</jex.version>
-    <avaje-inject.version>8.12-RC1</avaje-inject.version>
+    <avaje-inject.version>8.12-RC3</avaje-inject.version>
   </properties>
 
   <modules>

tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/test/OpenAPIController.java

@@ -75,21 +75,18 @@ Person testPost(Person b) {
         description = "Some other Error",
         type = ErrorResponse.class)
   })
-  Person testPostl(List<Person> m) {
-
+  Person testPostList(List<Person> m) {
     return new Person(0, "baby");
   }
 
   @Put("/put")
   @Produces(value = MediaType.TEXT_PLAIN, defaultStatus = 203)
   @OpenAPIResponse(responseCode = "204", type = String.class)
   String testDefaultStatus(Context ctx) {
-
     if (ctx.contentType().equals(MediaType.APPLICATION_PDF)) {
       ctx.status(204);
       return "";
     }
-
     return "only partial info";
   }
 }

tests/test-javalin-jsonb/src/main/java/org/example/myapp/web/test/TestController.java

@@ -4,20 +4,24 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.example.myapp.web.AppRoles;
+import org.example.myapp.web.Roles;
+
 import io.avaje.http.api.Controller;
 import io.avaje.http.api.Form;
 import io.avaje.http.api.Get;
 import io.avaje.http.api.Header;
+import io.avaje.http.api.MatrixParam;
 import io.avaje.http.api.MediaType;
 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.avaje.http.api.MatrixParam;
 import io.javalin.http.Context;
 
 @Path("test/")
 @Controller
+@Roles(AppRoles.ANYONE)
 public class TestController {
 
   @Get
@@ -40,7 +44,6 @@ byte[] testBytes() {
 
   @Get("/ctx")
   void testVoid(Context ctx) {
-
     ctx.result("success path:" + ctx.path());
   }
 
@@ -107,7 +110,8 @@ String testForm(String name, String email, String url) {
   String testFormBean(MyForm form) {
     return form.name + "|" + form.email + "|" + form.url;
   }
-  
+
+  @Roles(AppRoles.ADMIN)
   @Get("/withMatrixParam/{type-1;category;vendor-34}/{range;style}")
   void neo(
       @MatrixParam("type-1") String type,
@@ -116,6 +120,6 @@ void neo(
       String range,
       String style) {
 
-	System.out.println("Ever have that feeling where you're not sure if you're awake or dreaming?");
+    System.out.println("Ever have that feeling where you're not sure if you're awake or dreaming?");
   }
 }

tests/test-nima-jsonb/pom.xml

@@ -36,12 +36,12 @@
 		<dependency>
 			<groupId>io.helidon.nima.webserver</groupId>
 			<artifactId>helidon-nima-webserver</artifactId>
-			<version>4.0.0-ALPHA2</version>
+			<version>4.0.0-ALPHA4</version>
 		</dependency>
 		<dependency>
 			<groupId>io.helidon.nima.http.media</groupId>
 			<artifactId>helidon-nima-http-media-jsonb</artifactId>
-			<version>4.0.0-ALPHA2</version>
+			<version>4.0.0-ALPHA4</version>
 		</dependency>
 		<dependency>
 			<groupId>io.avaje</groupId>

tests/test-nima/pom.xml

@@ -17,7 +17,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-
   <dependencies>
     <dependency>
       <groupId>io.avaje</groupId>
@@ -33,12 +32,12 @@
     <dependency>
       <groupId>io.helidon.nima.webserver</groupId>
       <artifactId>helidon-nima-webserver</artifactId>
-      <version>4.0.0-ALPHA2</version>
+      <version>4.0.0-ALPHA4</version>
     </dependency>
     <dependency>
       <groupId>io.helidon.nima.http.media</groupId>
       <artifactId>helidon-nima-http-media-jsonb</artifactId>
-      <version>4.0.0-ALPHA2</version>
+      <version>4.0.0-ALPHA4</version>
     </dependency>
 
     <!--    <dependency>-->