crosspost: refactoring

* spring-social
* get tokens via service api

1 files changed, 8 insertions, 6 deletions

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;
     }
 }