Skip to content
This repository was archived by the owner on Oct 30, 2023. It is now read-only.

Commit 7246bc6

Browse files
webronwebron
committed
Merge pull request #18 from lugaru1234/issue1458-java-jersey-jaxrs
Fixes swagger-api/swagger-core#1458: java-jersey-jaxrs sample has been modified
2 parents 5809a49 + f47f072 commit 7246bc6

File tree

6 files changed

+40
-26
lines changed

6 files changed

+40
-26
lines changed

‎java/java-jersey-jaxrs/src/main/java/io/swagger/sample/data/PetData.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class PetData {
5757
"url1", "url2" }, new String[] { "tag3", "tag4" }, "available"));
5858
}
5959

60-
public Pet getPetbyId(long petId) {
60+
public Pet getPetById(long petId) {
6161
for (Pet pet : pets) {
6262
if (pet.getId() == petId) {
6363
return pet;
@@ -66,15 +66,17 @@ public Pet getPetbyId(long petId) {
6666
return null;
6767
}
6868

69-
public void deletePet(long petId) {
69+
public boolean deletePet(long petId) {
7070
if(pets.size() > 0) {
7171
for (int i = pets.size() - 1; i >= 0; i--) {
7272
Pet pet = pets.get(i);
7373
if(pet.getId() == petId) {
7474
pets.remove(i);
75+
return true;
7576
}
7677
}
7778
}
79+
return false;
7880
}
7981

8082
public List<Pet> findPetByStatus(String status) {

‎java/java-jersey-jaxrs/src/main/java/io/swagger/sample/data/StoreData.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ public class StoreData {
3131
orders.add(createOrder(3, 2, 2, new Date(), "placed"));
3232
orders.add(createOrder(4, 2, 2, new Date(), "delivered"));
3333
orders.add(createOrder(5, 3, 2, new Date(), "placed"));
34-
orders.add(createOrder(11, 3, 2, new Date(), "placed"));
35-
orders.add(createOrder(12, 3, 2, new Date(), "placed"));
36-
orders.add(createOrder(13, 3, 2, new Date(), "placed"));
37-
orders.add(createOrder(14, 3, 2, new Date(), "placed"));
38-
orders.add(createOrder(15, 3, 2, new Date(), "placed"));
34+
orders.add(createOrder(6, 3, 2, new Date(), "placed"));
35+
orders.add(createOrder(7, 3, 2, new Date(), "placed"));
36+
orders.add(createOrder(8, 3, 2, new Date(), "placed"));
37+
orders.add(createOrder(9, 3, 2, new Date(), "placed"));
38+
orders.add(createOrder(10, 3, 2, new Date(), "placed"));
3939
}
4040

4141
public Order findOrderById(long orderId) {
@@ -59,14 +59,16 @@ public Order placeOrder(Order order) {
5959
return order;
6060
}
6161

62-
public void deleteOrder(long orderId) {
62+
public boolean deleteOrder(long orderId) {
6363
if (orders.size() > 0) {
6464
for (int i = orders.size() - 1; i >= 0; i--) {
6565
if (orders.get(i).getId() == orderId) {
6666
orders.remove(i);
67+
return true;
6768
}
6869
}
6970
}
71+
return false;
7072
}
7173

7274
private static Order createOrder(long id, long petId, int quantity,

‎java/java-jersey-jaxrs/src/main/java/io/swagger/sample/data/UserData.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,16 @@ public void addUser(User user) {
7272
users.add(user);
7373
}
7474

75-
public void removeUser(String username) {
75+
public boolean removeUser(String username) {
7676
if (users.size() > 0) {
7777
for (int i = users.size() - 1; i >= 0; i--) {
7878
if (users.get(i).getUsername().equals(username)) {
7979
users.remove(i);
80+
return true;
8081
}
8182
}
8283
}
84+
return false;
8385
}
8486

8587
private static User createUser(long id, String username, String firstName,

‎java/java-jersey-jaxrs/src/main/java/io/swagger/sample/resource/PetResource.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
public class PetResource {
5252
private Logger LOGGER = LoggerFactory.getLogger(PetResource.class);
5353
static PetData petData = new PetData();
54-
static JavaRestResourceUtil ru = new JavaRestResourceUtil();
5554

5655
@GET
5756
@Path("/{petId}")
@@ -65,7 +64,7 @@ public class PetResource {
6564
public Response getPetById(
6665
@ApiParam(value = "ID of pet to return") @PathParam("petId") Long petId)
6766
throws NotFoundException {
68-
Pet pet = petData.getPetbyId(petId);
67+
Pet pet = petData.getPetById(petId);
6968
if (null != pet)
7069
return Response.ok().entity(pet).build();
7170
else
@@ -75,12 +74,16 @@ public Response getPetById(
7574
@DELETE
7675
@Path("/{petId}")
7776
@ApiOperation(value = "Deletes a pet")
78-
@ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid pet value")})
77+
@ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"),
78+
@ApiResponse(code = 404, message = "Pet not found") })
7979
public Response deletePet(
8080
@ApiParam() @HeaderParam("api_key") String apiKey,
8181
@ApiParam(value = "Pet id to delete", required = true)@PathParam("petId") Long petId) {
82-
petData.deletePet(petId);
83-
return Response.ok().build();
82+
if (petData.deletePet(petId)) {
83+
return Response.ok().build();
84+
} else {
85+
return Response.status(Response.Status.NOT_FOUND).build();
86+
}
8487
}
8588

8689
@POST
@@ -168,9 +171,7 @@ public Response updatePetWithForm (
168171
@ApiParam(value = "ID of pet that needs to be updated", required = true)@PathParam("petId") Long petId,
169172
@ApiParam(value = "Updated name of the pet", required = false)@FormParam("name") String name,
170173
@ApiParam(value = "Updated status of the pet", required = false)@FormParam("status") String status) {
171-
System.out.println(name);
172-
System.out.println(status);
173-
Pet pet = petData.getPetbyId(petId);
174+
Pet pet = petData.getPetById(petId);
174175
if(pet != null) {
175176
if(name != null && !"".equals(name))
176177
pet.setName(name);

‎java/java-jersey-jaxrs/src/main/java/io/swagger/sample/resource/PetStoreResource.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
public class PetStoreResource {
3333
static StoreData storeData = new StoreData();
3434
static PetData petData = new PetData();
35-
static JavaRestResourceUtil ru = new JavaRestResourceUtil();
3635

3736
@GET
3837
@Path("/inventory")
@@ -50,12 +49,13 @@ public java.util.Map<String, Integer> getInventory() {
5049
@GET
5150
@Path("/order/{orderId}")
5251
@ApiOperation(value = "Find purchase order by ID",
53-
notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
52+
notes = "For valid response try integer IDs with value >= 1 and <= 10. Other values will generated exceptions",
5453
response = Order.class)
5554
@ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"),
5655
@ApiResponse(code = 404, message = "Order not found") })
5756
public Response getOrderById(
58-
@ApiParam(value = "ID of pet that needs to be fetched", allowableValues = "range[1,5]", required = true) @PathParam("orderId") Long orderId)
57+
@ApiParam(value = "ID of pet that needs to be fetched", allowableValues = "range[1,10]", required = true)
58+
@PathParam("orderId") Long orderId)
5959
throws NotFoundException {
6060
Order order = storeData.findOrderById(orderId);
6161
if (null != order) {
@@ -79,12 +79,16 @@ public Order placeOrder(
7979
@DELETE
8080
@Path("/order/{orderId}")
8181
@ApiOperation(value = "Delete purchase order by ID",
82-
notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors")
82+
notes = "For valid response try integer IDs with positive integer value. Negative or non-integer values will generate API errors")
8383
@ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"),
8484
@ApiResponse(code = 404, message = "Order not found") })
8585
public Response deleteOrder(
86-
@ApiParam(value = "ID of the order that needs to be deleted", allowableValues = "range[1,infinity]", required = true) @PathParam("orderId") String orderId) {
87-
storeData.deleteOrder(ru.getLong(0, 10000, 0, orderId));
88-
return Response.ok().entity("").build();
86+
@ApiParam(value = "ID of the order that needs to be deleted", allowableValues = "range[1,infinity]", required = true)
87+
@PathParam("orderId") Long orderId) {
88+
if (storeData.deleteOrder(orderId)) {
89+
return Response.ok().entity("").build();
90+
} else {
91+
return Response.status(Response.Status.NOT_FOUND).entity("Order not found").build();
92+
}
8993
}
9094
}

‎java/java-jersey-jaxrs/src/main/java/io/swagger/sample/resource/UserResource.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,11 @@ public Response updateUser(
9090
@ApiResponse(code = 404, message = "User not found") })
9191
public Response deleteUser(
9292
@ApiParam(value = "The name that needs to be deleted", required = true) @PathParam("username") String username) {
93-
userData.removeUser(username);
94-
return Response.ok().entity("").build();
93+
if (userData.removeUser(username)) {
94+
return Response.ok().entity("").build();
95+
} else {
96+
return Response.status(Response.Status.NOT_FOUND).build();
97+
}
9598
}
9699

97100
@GET

0 commit comments

Comments
 (0)