diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java index 77aea2e..b1468ea 100644 --- a/src/main/java/cactusServer/entities/Account.java +++ b/src/main/java/cactusServer/entities/Account.java @@ -1,9 +1,9 @@ package cactusServer.entities; public class Account { - private String name,pass; + private String name, pass; - public Account(String userName,String userPass) { + public Account(String userName, String userPass) { setName(userName); setPass(userPass); } diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java index da19414..b15060c 100644 --- a/src/main/java/cactusServer/models/Accounts.java +++ b/src/main/java/cactusServer/models/Accounts.java @@ -9,10 +9,10 @@ @Singleton public class Accounts { private static Accounts theInstance = null; - private HashMap accounts = new HashMap<>(); + private HashMap accounts = new HashMap<>(); private Accounts() { - + } public static Accounts getInstance() { @@ -22,10 +22,10 @@ return theInstance; } - public Account createAcount(String userID,String userName,String userPass) { + public Account createAcount(String userID, String userName, String userPass) { System.out.println(userName); - Account newAccount = new Account(userName,userPass); + Account newAccount = new Account(userName, userPass); accounts.put(userID, newAccount); System.out.println(userID); @@ -37,11 +37,10 @@ Account editAccount = accounts.get(userID); return editAccount; } - + public String deleteAccount(String userID) { accounts.remove(userID); return "complated remove account"; } - } diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java index 181513e..a94dc42 100644 --- a/src/main/java/cactusServer/resources/AccountsRest.java +++ b/src/main/java/cactusServer/resources/AccountsRest.java @@ -27,8 +27,7 @@ @Produces(MediaType.APPLICATION_JSON) public Account create(@QueryParam("userID") String userID, @QueryParam("userName") String userName, @QueryParam("userPass") String userPass) { - Accounts.getInstance().createAcount(userID, userName, userPass); - return Accounts.getInstance().getAccount(userID); + return Accounts.getInstance().createAcount(userID, userName, userPass); } @GET