crosspost: refactoring

* spring-social
* get tokens via service api

3 files changed, 25 insertions, 14 deletions

diff --git a/juick-core/build.gradle b/juick-core/build.gradle
index 15d35239..34e4b00e 100644
--- a/juick-core/build.gradle
+++ b/juick-core/build.gradle
@@ -8,6 +8,8 @@ dependencies {
     compile "org.apache.commons:commons-text:1.1"
     compile 'org.ocpsoft.prettytime:prettytime:4.0.1.Final'
 
+    compile 'com.google.code.findbugs:jsr305:3.0.2'
+
     testCompile "com.fasterxml.jackson.core:jackson-core:${rootProject.jacksonVersion}"
     testCompile "com.fasterxml.jackson.core:jackson-databind:${rootProject.jacksonVersion}"
     testCompile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${rootProject.jacksonVersion}"
diff --git a/juick-core/src/main/java/com/juick/DeviceRegistration.java b/juick-core/src/main/java/com/juick/ExternalToken.java
index eb9a9ffc..933ecf82 100644
--- a/juick-core/src/main/java/com/juick/DeviceRegistration.java
+++ b/juick-core/src/main/java/com/juick/ExternalToken.java
@@ -23,29 +23,36 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 /**
  * Created by vitalyster on 22.11.2016.
  */
-public class DeviceRegistration {
+public class ExternalToken {
+    private String name;
     private String type;
     private String token;
+    private String secret;
 
     @JsonCreator
-    public DeviceRegistration(@JsonProperty("type") String type, @JsonProperty("token") String token) {
+    public ExternalToken(@JsonProperty("name") String name,
+                         @JsonProperty("type") String type,
+                         @JsonProperty("token") String token,
+                         @JsonProperty("secret") String secret) {
+        this.name = name;
         this.type = type;
         this.token = token;
+        this.secret = secret;
     }
 
     public String getType() {
         return type;
     }
 
-    public void setType(String type) {
-        this.type = type;
-    }
-
     public String getToken() {
         return token;
     }
 
-    public void setToken(String token) {
-        this.token = token;
+    public String getName() {
+        return name;
+    }
+
+    public String getSecret() {
+        return secret;
     }
 }
diff --git a/juick-core/src/main/java/com/juick/User.java b/juick-core/src/main/java/com/juick/User.java
index 1ee8c920..ed5ac021 100644
--- a/juick-core/src/main/java/com/juick/User.java
+++ b/juick-core/src/main/java/com/juick/User.java
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import javax.annotation.Nonnull;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -45,10 +46,10 @@ public class User implements Serializable {
     private boolean banned;
     private String credentials;
     private String lang;
-    private List<DeviceRegistration> devices;
+    private List<ExternalToken> tokens;
 
     public User() {
-        devices = new ArrayList<>();
+        tokens = new ArrayList<>();
     }
 
     @Override
@@ -186,11 +187,12 @@ public class User implements Serializable {
         return false;
     }
 
-    public List<DeviceRegistration> getDevices() {
-        return devices;
+    @Nonnull
+    public List<ExternalToken> getTokens() {
+        return tokens;
     }
 
-    public void setDevices(List<DeviceRegistration> devices) {
-        this.devices = devices;
+    public void setTokens(List<ExternalToken> tokens) {
+        this.tokens = tokens;
     }
 }