Merge pull request #70 from avaje/feature/jex2x-with-slashAcceptingNamedPaths

Add support for Jex 2.0 with slash accepting named paths (rather than splat)

Author: rbygrave

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

@@ -28,13 +28,13 @@ static PathSegments parse(String fullPath) {
             final String name = section.substring(1);
             Segment segment = createSegment(name);
             segments.add(segment);
-            chunks.named(segment.path(name));
+            chunks.named(segment.path(name), ':');
 
-          } else if ((section.startsWith("{") && (section.endsWith("}")))) {
+          } else if (isPathParameter(section)) {
             String name = section.substring(1, section.length() - 1);
             Segment segment = createSegment(name);
             segments.add(segment);
-            chunks.named(segment.path(name));
+            chunks.named(segment.path(name), section.charAt(0));
 
           } else {
             Segment segment = createLiteralSegment(section);
@@ -44,10 +44,14 @@ static PathSegments parse(String fullPath) {
         }
       }
     }
-
     return new PathSegments(chunks, segments);
   }
 
+  private static boolean isPathParameter(String section) {
+    return section.startsWith("{") && section.endsWith("}")
+      || section.startsWith("<") && section.endsWith(">");
+  }
+
   private static Segment createLiteralSegment(String section) {
     return new Segment(section, true);
   }
@@ -250,8 +254,8 @@ String path(String section) {
   private static class Chunks {
     private final List<Chunk> chunks = new ArrayList<>();
 
-    void named(String name) {
-      chunks.add(new Chunk(name));
+    void named(String name, char firstChar) {
+      chunks.add(new Chunk(name, firstChar));
     }
 
     void literal(String val) {
@@ -269,7 +273,7 @@ String fullPath(String prefix, String suffix) {
 
   private static class LiteralChunk extends Chunk {
     private LiteralChunk(String value) {
-      super(value);
+      super(value, ' ');
     }
 
     @Override
@@ -280,12 +284,18 @@ void append(StringBuilder fullPath, String prefix, String suffix) {
 
   private static class Chunk {
     final String value;
-    private Chunk(String value) {
+    final char firstChar;
+    private Chunk(String value, char firstChar) {
       this.value = value;
+      this.firstChar = firstChar;
     }
 
     void append(StringBuilder fullPath, String prefix, String suffix) {
-      fullPath.append(prefix).append(value).append(suffix);
+      if ('<' == firstChar) {
+        fullPath.append('<').append(value).append('>');
+      } else {
+        fullPath.append(prefix).append(value).append(suffix);
+      }
     }
   }
 

tests/test-jex/pom.xml

@@ -17,7 +17,7 @@
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
     <main.class>org.example.myapp.Main</main.class>
-    <jex.version>1.6</jex.version>
+    <jex.version>2.0</jex.version>
     <swagger.version>2.0.8</swagger.version>
     <jackson.version>2.12.3</jackson.version>
     <avaje-inject.version>6.1</avaje-inject.version>
@@ -38,6 +38,12 @@
       <version>${jex.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-jex-jetty</artifactId>
+      <version>${jex.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>

tests/test-jex/src/main/java/org/example/web/HelloController.java

@@ -32,9 +32,15 @@ String name(String name) {
   }
 
   @Produces("text/plain")
-  @Get("splat/{name}/*/other/*")
+  @Get("splat/{name}/<s0>/other/<s1>")
   String splat(String name, Context ctx) {
-    return "got name:" + name + " splat0:" + ctx.splat(0) + " splat1:" + ctx.splat(1);
+    return "got name:" + name + " splat0:" + ctx.pathParam("s0") + " splat1:" + ctx.pathParam("s1");
+  }
+
+  @Produces("text/plain")
+  @Get("splat2/{name}/<nam0>/other/<nam1>")
+  String splat2(String name, String nam0, String nam1) {
+    return "got name:" + name + " splat0:" + nam0 + " splat1:" + nam1;
   }
 
   @Valid

tests/test-jex/src/main/resources/public/openapi.json

@@ -90,7 +90,7 @@
         }
       }
     },
-    "/splat/{name}/*/other/*" : {
+    "/splat/{name}/<s0>/other/<s1>" : {
       "get" : {
         "tags" : [ ],
         "summary" : "",
@@ -116,6 +116,47 @@
           }
         }
       }
+    },
+    "/splat2/{name}/<nam0>/other/<nam1>" : {
+      "get" : {
+        "tags" : [ ],
+        "summary" : "",
+        "description" : "",
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        }, {
+          "name" : "nam0",
+          "in" : "path",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        }, {
+          "name" : "nam1",
+          "in" : "path",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "",
+            "content" : {
+              "text/plain" : {
+                "schema" : {
+                  "type" : "string"
+                }
+              }
+            }
+          }
+        }
+      }
     }
   },
   "components" : {

tests/test-jex/src/test/java/org/example/web/HelloControllerTest.java

@@ -43,6 +43,12 @@ void splat() {
     assertEquals("got name:one splat0:a/b splat1:x/y/z", client.request().path("splat/one/a/b/other/x/y/z").GET().asString().body());
   }
 
+  @Test
+  void splat2() {
+    assertEquals("got name:one splat0:a/b splat1:x/y/z", client.request().path("splat2/one/a/b/other/x/y/z").GET().asString().body());
+  }
+
+
   @Test
   void validation() {