Merge pull request #20 from lugaru1234/issue1458-java-grails2

java-grails2 sample has been modified

Author: webron

java/java-grails2/src/java/io/swagger/sample/data/PetData.java

@@ -57,7 +57,7 @@ public class PetData {
         "url1", "url2" }, new String[] { "tag3", "tag4" }, "available"));
   }
 
-  public Pet getPetbyId(long petId) {
+  public Pet getPetById(long petId) {
     for (Pet pet : pets) {
       if (pet.getId() == petId) {
         return pet;
@@ -66,15 +66,17 @@ public Pet getPetbyId(long petId) {
     return null;
   }
 
-  public void deletePet(long petId) {
+  public boolean deletePet(long petId) {
     if(pets.size() > 0) {
       for (int i = pets.size() - 1; i >= 0; i--) {
         Pet pet = pets.get(i);
         if(pet.getId() == petId) {
           pets.remove(i);
+          return true;
         }
       }
     }
+    return false;
   }
 
   public List<Pet> findPetByStatus(String status) {

java/java-grails2/src/java/io/swagger/sample/data/StoreData.java

@@ -31,11 +31,11 @@ public class StoreData {
     orders.add(createOrder(3, 2, 2, new Date(), "placed"));
     orders.add(createOrder(4, 2, 2, new Date(), "delivered"));
     orders.add(createOrder(5, 3, 2, new Date(), "placed"));
-    orders.add(createOrder(11, 3, 2, new Date(), "placed"));
-    orders.add(createOrder(12, 3, 2, new Date(), "placed"));
-    orders.add(createOrder(13, 3, 2, new Date(), "placed"));
-    orders.add(createOrder(14, 3, 2, new Date(), "placed"));
-    orders.add(createOrder(15, 3, 2, new Date(), "placed"));
+    orders.add(createOrder(6, 3, 2, new Date(), "placed"));
+    orders.add(createOrder(7, 3, 2, new Date(), "placed"));
+    orders.add(createOrder(8, 3, 2, new Date(), "placed"));
+    orders.add(createOrder(9, 3, 2, new Date(), "placed"));
+    orders.add(createOrder(10, 3, 2, new Date(), "placed"));
   }
 
   public Order findOrderById(long orderId) {
@@ -59,14 +59,16 @@ public Order placeOrder(Order order) {
     return order;
   }
 
-  public void deleteOrder(long orderId) {
+  public boolean deleteOrder(long orderId) {
     if (orders.size() > 0) {
       for (int i = orders.size() - 1; i >= 0; i--) {
         if (orders.get(i).getId() == orderId) {
           orders.remove(i);
+          return true;
         }
       }
     }
+    return false;
   }
 
   private static Order createOrder(long id, long petId, int quantity,

java/java-grails2/src/java/io/swagger/sample/data/UserData.java

@@ -72,14 +72,16 @@ public void addUser(User user) {
     users.add(user);
   }
 
-  public void removeUser(String username) {
+  public boolean removeUser(String username) {
     if (users.size() > 0) {
       for (int i = users.size() - 1; i >= 0; i--) {
         if (users.get(i).getUsername().equals(username)) {
           users.remove(i);
+          return true;
         }
       }
     }
+    return false;
   }
 
   private static User createUser(long id, String username, String firstName,

java/java-grails2/src/java/io/swagger/sample/resource/PetResource.java

@@ -29,18 +29,17 @@
 @Produces({"application/json", "application/xml"})
 public class PetResource {
 	static PetData petData = new PetData();
-	static JavaRestResourceUtil ru = new JavaRestResourceUtil();
 
 	@GET
 	@Path("/{petId}")
-	@ApiOperation(value = "Find pet by ID", notes = "Returns a pet when ID < 10. "
+	@ApiOperation(value = "Find pet by ID", notes = "Returns a pet when 0 < ID <= 10. "
 			+ "ID > 10 or nonintegers will simulate API error conditions", response = Pet.class)
 	@ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"),
 			@ApiResponse(code = 404, message = "Pet not found") })
 	public Response getPetById(
-			@ApiParam(value = "ID of pet that needs to be fetched", allowableValues = "range[1,5]", required = true) @PathParam("petId") String petId)
+			@ApiParam(value = "ID of pet that needs to be fetched", allowableValues = "range[1,10]", required = true) @PathParam("petId") Long petId)
 			throws NotFoundException {
-		Pet pet = petData.getPetbyId(ru.getLong(0, 100000, 0, petId));
+		Pet pet = petData.getPetById(petId);
 		if (null != pet) {
 			return Response.ok().entity(pet).build();
 		} else {

java/java-grails2/src/java/io/swagger/sample/resource/PetStoreResource.java

@@ -29,16 +29,15 @@
 @Produces({"application/json"})
 public class PetStoreResource {
 	static StoreData storeData = new StoreData();
-	static JavaRestResourceUtil ru = new JavaRestResourceUtil();
 
 	@GET
 	@Path("/order/{orderId}")
-	@ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value <= 5 or > 10. "
+	@ApiOperation(value = "Find purchase order by ID", notes = "For valid response try integer IDs with value >= 1 and <= 10. "
 			+ "Other values will generated exceptions", response = Order.class)
 	@ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"),
 			@ApiResponse(code = 404, message = "Order not found") })
 	public Response getOrderById(
-			@ApiParam(value = "ID of pet that needs to be fetched", allowableValues = "range[1,5]", required = true) @PathParam("orderId") Long orderId)
+			@ApiParam(value = "ID of pet that needs to be fetched", allowableValues = "range[1,10]", required = true) @PathParam("orderId") Long orderId)
 			throws NotFoundException {
 		Order order = storeData.findOrderById(orderId);
 		if (null != order) {
@@ -60,13 +59,17 @@ public Response placeOrder(
 
 	@DELETE
 	@Path("/order/{orderId}")
-	@ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with value < 1000. "
-			+ "Anything above 1000 or nonintegers will generate API errors")
+	@ApiOperation(value = "Delete purchase order by ID", notes = "For valid response try integer IDs with positive integer " +
+			"value. Negative or non-integer values will generate API errors")
 	@ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"),
 			@ApiResponse(code = 404, message = "Order not found") })
 	public Response deleteOrder(
-			@ApiParam(value = "ID of the order that needs to be deleted", allowableValues = "range[1,infinity]", required = true) @PathParam("orderId") String orderId) {
-		storeData.deleteOrder(ru.getLong(0, 10000, 0, orderId));
-		return Response.ok().entity("").build();
+			@ApiParam(value = "ID of the order that needs to be deleted", allowableValues = "range[1,infinity]", required = true)
+			@PathParam("orderId") Long orderId) {
+		if (storeData.deleteOrder(orderId)) {
+			return Response.ok().entity("").build();
+		} else {
+			return Response.status(Response.Status.NOT_FOUND).entity("Order not found").build();
+		}
 	}
 }

java/java-grails2/src/java/io/swagger/sample/resource/UserResource.java

@@ -81,8 +81,11 @@ public Response updateUser(
 			@ApiResponse(code = 404, message = "User not found") })
 	public Response deleteUser(
 			@ApiParam(value = "The name that needs to be deleted", required = true) @PathParam("username") String username) {
-		userData.removeUser(username);
-		return Response.ok().entity("").build();
+		if (userData.removeUser(username)) {
+			return Response.ok().entity("").build();
+		} else {
+			return Response.status(Response.Status.NOT_FOUND).entity("User not found").build();
+		}
 	}
 
 	@GET