added test, pattern support for #1054

Author: fehguy

modules/swagger-jaxrs/src/main/java/com/wordnik/swagger/jaxrs/Reader.java

@@ -124,6 +124,32 @@ protected Swagger read(Class<?> cls, String parentPath, boolean readHidden, Stri
 
         String operationPath = getPath(apiPath, methodPath, parentPath);
         if(operationPath != null && apiOperation != null) {
+          String [] pps = operationPath.split("/");
+          String [] pathParts = new String[pps.length];
+          Map<String, String> regexMap = new HashMap<String, String>();
+
+          for(int i = 0; i < pps.length; i++) {
+            String p = pps[i];
+            if(p.startsWith("{")) {
+              int pos = p.indexOf(":");
+              if(pos > 0) {
+                String left = p.substring(1, pos);
+                String right = p.substring(pos + 1, p.length()-1);
+                pathParts[i] = "{" + left + "}";
+                regexMap.put(left, right);
+              }
+              else
+                pathParts[i] = p;
+            }
+            else pathParts[i] = p;
+          }
+          StringBuilder pathBuilder = new StringBuilder();
+          for(String p : pathParts) {
+            if(!p.isEmpty())
+              pathBuilder.append("/").append(p);
+          }
+          operationPath = pathBuilder.toString();
+
           String httpMethod = extractOperationMethod(apiOperation, method, SwaggerExtensions.chain());
 
           Operation operation = parseMethod(method);
@@ -132,6 +158,12 @@ protected Swagger read(Class<?> cls, String parentPath, boolean readHidden, Stri
               operation.parameter(param);
             }
           }
+          for(Parameter param : operation.getParameters()) {
+            if(regexMap.get(param.getName()) != null) {
+              String pattern = regexMap.get(param.getName());
+              param.setPattern(pattern);
+            }
+          }
 
           String protocols = apiOperation.protocols();
           if(!"".equals(protocols)) {

modules/swagger-jaxrs/src/test/scala/RegexPathParamTest.scala

@@ -0,0 +1,27 @@
+import resources._
+
+import com.wordnik.swagger.jaxrs.config._
+import com.wordnik.swagger.models.parameters._
+import com.wordnik.swagger.models.properties.MapProperty
+
+import com.wordnik.swagger.models.Swagger
+import com.wordnik.swagger.jaxrs.Reader
+import com.wordnik.swagger.util.Json
+
+import scala.collection.JavaConverters._
+
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
+import org.scalatest.FlatSpec
+import org.scalatest.Matchers
+
+@RunWith(classOf[JUnitRunner])
+class RegexPathParamTest extends FlatSpec with Matchers {
+  it should "scan a simple resource" in {
+    val swagger = new Reader(new Swagger()).read(classOf[RegexPathParamResource])
+    val get = swagger.getPaths().get("/{report_type}").getGet()
+    val param = get.getParameters().get(0)
+    param.getName() should be ("report_type")
+    param.getPattern() should be ("[aA-zZ]+")
+  }
+}

modules/swagger-jaxrs/src/test/scala/resources/RegexPathParamResource.java

@@ -0,0 +1,18 @@
+package resources;
+
+import com.wordnik.swagger.annotations.*;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+
+import java.util.*;
+
+@Api(value = "/external/info/")
+public class RegexPathParamResource {
+  @GET
+  @ApiOperation(value="this", tags="tag1")
+  @Path("/{report_type:[aA-zZ]+}")
+  public Response getThis(@ApiParam(value = "test") @PathParam("report_type") String param) {
+    return Response.ok().build();
+  }
+}