Merge branch 'master' of github.com:wordnik/swagger-java-sample-app

ayush · Oct 27, 2011 · 724538c · 724538c
2 parents 24480da + c93cd08
commit 724538c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build.xml b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <project name="swagger-sample-app-java" xmlns:ivy="antlib:org.apache.ivy.ant" default="build.all" basedir=".">
 	<property environment="env" />
-	<property name="version.identifier" value="1.0" />
+	<property name="version.identifier" value="1.1-SHAPSHOT.121026" />
 	<property name="artifact.ext" value="jar" />
 	<property name="organization" value="wordnik" />
 	<property name="module" value="${ant.project.name}" />

diff --git a/ivy.xml b/ivy.xml
@@ -12,7 +12,7 @@
 
     <dependencies>
         <!-- wordnik-->
-        <dependency org="com.wordnik" name="swagger-core" rev="1.1" conf="build->*"/>
+        <dependency org="com.wordnik" name="swagger-core" rev="1.1-SHAPSHOT.121026" conf="build->*"/>
 
         <!-- scala -->
         <dependency org="org.scala-lang" name="scala-library" rev="2.8.1" conf="build->default"/>

diff --git a/src/main/java/com/wordnik/swagger/sample/resource/PetResource.java b/src/main/java/com/wordnik/swagger/sample/resource/PetResource.java
@@ -19,7 +19,7 @@ public class PetResource extends JavaHelp {
 	@ApiErrors(value = { @ApiError(code = 400, reason = "Invalid ID supplied"),
 			@ApiError(code = 404, reason = "Pet not found") })
 	public Response getPetById (
-			@ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathParam("petId") String petId) 
+			@ApiParam(value = "ID of pet that needs to be fetched", allowableValues = "range[1,5]", required = true) @PathParam("petId") String petId) 
 	throws NotFoundException {
 		Pet pet = petData.getPetbyId(ru.getLong(0, 100000, 0, petId));
 		if (null != pet) {