diff --git a/build.gradle b/build.gradle index 0fb5642..fe056b0 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,7 @@ dependencies { compile fileTree(dir: './lib/', includes: ['*.jar']) + compile 'com.fasterxml.jackson.core:jackson-databind:2.9.5' compile 'org.glassfish.jersey.containers:jersey-container-servlet:2.+' compile group: 'commons-collections', name: 'commons-collections', version: '3.2' compile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java index 8f4c2f5..8e5e09d 100644 --- a/src/main/java/cactusServer/entities/Account.java +++ b/src/main/java/cactusServer/entities/Account.java @@ -1,12 +1,17 @@ package cactusServer.entities; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import cactusServer.utils.RandomStringGenerator; -import net.arnx.jsonic.*; +import net.arnx.jsonic.JSONHint; public class Account { private String id, name, token; @JSONHint(ignore = true) - private String pass, uniqueID; + private String pass; + @JSONHint(ignore = true) + private String uniqueID; @JSONHint(ignore = true) private boolean login = false; @@ -33,7 +38,7 @@ public void setName(String name) { this.name = name; } - + public String getPass() { return pass; } @@ -41,8 +46,8 @@ public void setPass(String pass) { this.pass = pass; } - - public boolean isLogin() { + + public boolean islogin() { return login; } @@ -58,7 +63,7 @@ token = RandomStringGenerator.generateRandomString(64, RandomStringGenerator.ALPHA_NUMERIC); return token; } - + public String getUniqueID() { return uniqueID; } diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java index d969622..d3834b4 100644 --- a/src/main/java/cactusServer/models/Accounts.java +++ b/src/main/java/cactusServer/models/Accounts.java @@ -28,7 +28,8 @@ } public Session createAcount(String userID, String userName, String userPass) { - if (!userIDSet.add(userID)) return null; + if (!userIDSet.add(userID)) + return null; String uniqueID = RandomStringGenerator.generateUniqueString(12, RandomStringGenerator.ALPHA_NUMERIC, uniqueIDSet); uniqueIDSet.add(uniqueID);