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

Commit 1711edd

Browse files
lugaru1234lugaru1234
committed
java-mule has been modified
1 parent 5809a49 commit 1711edd

6 files changed

Lines changed: 39 additions & 25 deletions

File tree

‎java/java-mule/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(); 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-mule/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-mule/src/main/java/io/swagger/sample/data/UserData.java‎

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

73-
public void removeUser(String username) {
73+
public boolean removeUser(String username) {
7474
if (users.size() > 0) {
7575
for (int i = users.size() - 1; i >= 0; i--) {
7676
if (users.get(i).getUsername().equals(username)) {
7777
users.remove(i);
78+
return true;
7879
}
7980
}
8081
}
82+
return false;
8183
}
8284

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

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
3939
public class PetResource {
4040
static PetData petData = new PetData();
41-
static JavaRestResourceUtil ru = new JavaRestResourceUtil();
4241

4342
@GET
4443
@Path("/{petId}")
@@ -52,7 +51,7 @@ public class PetResource {
5251
public Response getPetById(
5352
@ApiParam(value = "ID of pet that needs to be fetched", allowableValues = "range[1,5]", required = true) @PathParam("petId") Long petId)
5453
throws NotFoundException {
55-
Pet pet = petData.getPetbyId(petId);
54+
Pet pet = petData.getPetById(petId);
5655
if (null != pet) {
5756
return Response.ok().entity(pet).build();
5857
} else {
@@ -63,12 +62,16 @@ public Response getPetById(
6362
@DELETE
6463
@Path("/{petId}")
6564
@ApiOperation(value = "Deletes a pet")
66-
@ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid pet value")})
65+
@ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"),
66+
@ApiResponse(code = 404, message = "Pet not found")})
6767
public Response deletePet(
6868
@ApiParam() @HeaderParam("api_key") String apiKey,
6969
@ApiParam(value = "Pet id to delete", required = true)@PathParam("petId") Long petId) {
70-
petData.deletePet(petId);
71-
return Response.ok().build();
70+
if (petData.deletePet(petId)) {
71+
return Response.ok().build();
72+
} else {
73+
return Response.status(Response.Status.NOT_FOUND).build();
74+
}
7275
}
7376

7477
@POST
@@ -132,7 +135,7 @@ public Response updatePetWithForm (
132135
@ApiParam(value = "Updated status of the pet", required = false)@FormParam("status") String status) {
133136
System.out.println(name);
134137
System.out.println(status);
135-
Pet pet = petData.getPetbyId(petId);
138+
Pet pet = petData.getPetById(petId);
136139
if(pet != null) {
137140
if(name != null && !"".equals(name))
138141
pet.setName(name);

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

Lines changed: 10 additions & 8 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,13 +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)
59-
throws NotFoundException {
57+
@ApiParam(value = "ID of pet that needs to be fetched", allowableValues = "range[1,10]", required = true)
58+
@PathParam("orderId") Long orderId) throws NotFoundException {
6059
Order order = storeData.findOrderById(orderId);
6160
if (null != order) {
6261
return Response.ok().entity(order).build();
@@ -79,12 +78,15 @@ public Order placeOrder(
7978
@DELETE
8079
@Path("/order/{orderId}")
8180
@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")
81+
notes = "For valid response try integer IDs with positive integer value. Negative or non-integer values will generate API errors")
8382
@ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid ID supplied"),
8483
@ApiResponse(code = 404, message = "Order not found") })
8584
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();
85+
@ApiParam(value = "ID of the order that needs to be deleted", allowableValues = "range[1,infinity]", required = true) @PathParam("orderId") Long orderId) {
86+
if (storeData.deleteOrder(orderId)) {
87+
return Response.ok().entity("").build();
88+
} else {
89+
return Response.status(Response.Status.NOT_FOUND).entity("Order not found").build();
90+
}
8991
}
9092
}

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

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

9598
@GET

0 commit comments

Comments
 (0)