diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java index 12b953d..1783972 100644 --- a/src/main/java/cactusServer/models/Accounts.java +++ b/src/main/java/cactusServer/models/Accounts.java @@ -104,7 +104,7 @@ public Account deleteAccount(String uniqueID) { Account edit = Accounts.getInstance().getAccountByuniqueID(uniqueID); - if(edit == null) { + if (edit == null) { return edit; } userIDSet.remove(edit.getId()); diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java index 0a9bb18..c159f06 100644 --- a/src/main/java/cactusServer/resources/AccountsRest.java +++ b/src/main/java/cactusServer/resources/AccountsRest.java @@ -16,13 +16,12 @@ @PUT @Produces(MediaType.APPLICATION_JSON) - public URIAddressedEntity loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass){ + public URIAddressedEntity loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) { URIAddressedEntity session = Accounts.getInstance().loginAccount(userID, userPass); - if(session != null) { + if (session != null) { return session; - } - else { - //response.setStatus(400); + } else { + // response.setStatus(400); return null; } } @@ -47,17 +46,17 @@ public Account getAccount(@PathParam("uniqueID") String uniqueID) { return Accounts.getInstance().getAccountByuniqueID(uniqueID); } - + @DELETE @Path("/{uniqueID}") @Produces(MediaType.APPLICATION_JSON) public Account deleteAccount(@PathParam("uniqueID") String uniqueID) { return Accounts.getInstance().deleteAccount(uniqueID); } - + @GET @Produces(MediaType.APPLICATION_JSON) - public ArrayList getAccounts(){ + public ArrayList getAccounts() { return Accounts.getInstance().getAccounts(); }