Skip to content

Commit

Permalink
Merge pull request #47 from OpenLiberty/produces-json
Browse files Browse the repository at this point in the history
use produces application/json for better formatting
  • Loading branch information
mswatosh authored Dec 1, 2023
2 parents 6650361 + 5aa6865 commit 479cbdb
Showing 1 changed file with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public void remove(@PathParam("id") int id) {
}

@GET
@Produces(MediaType.APPLICATION_JSON)
public String retrieve() {

Iterable<CrewMember> crewMembersIterable = crewMembers.findAll()::iterator;
Expand All @@ -73,6 +74,7 @@ public String retrieve() {

@GET
@Path("/rank/{rank}")
@Produces(MediaType.APPLICATION_JSON)
public String retrieveByRank(@PathParam("rank") String rank) {

List<CrewMember> crewMembersList = crewMembers.findByRank(Rank.fromString(rank));
Expand All @@ -82,16 +84,17 @@ public String retrieveByRank(@PathParam("rank") String rank) {

@GET
@Path("/rank/{rank}/page/{pageNum}")
@Produces(MediaType.APPLICATION_JSON)
public String retrieveByRank(@PathParam("rank") String rank,
@PathParam("pageNum") long pageNum) {

Pageable pageRequest = Pageable.ofSize(5)
.page(pageNum)
.sortBy(Sort.asc("name"), Sort.asc("id"));

Page<CrewMember> crewMembersPage = crewMembers.findByRank(Rank.fromString(rank), pageRequest);
Page<CrewMember> page = crewMembers.findByRank(Rank.fromString(rank), pageRequest);

return crewMembersToJsonArray(crewMembersPage);
return crewMembersToJsonArray(page);
}

@DELETE
Expand Down

0 comments on commit 479cbdb

Please sign in to comment.