Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use produces application/json for better formatting #47

Merged
merged 1 commit into from
Dec 1, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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