From de2cc2db73a5de42d9bfaeb92604f28abe2a328a Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Tue, 24 Oct 2017 17:18:29 +0300 Subject: crosspost: refactoring * spring-social * get tokens via service api --- .../main/java/com/juick/DeviceRegistration.java | 51 ------------------- .../src/main/java/com/juick/ExternalToken.java | 58 ++++++++++++++++++++++ juick-core/src/main/java/com/juick/User.java | 14 +++--- 3 files changed, 66 insertions(+), 57 deletions(-) delete mode 100644 juick-core/src/main/java/com/juick/DeviceRegistration.java create mode 100644 juick-core/src/main/java/com/juick/ExternalToken.java (limited to 'juick-core/src') diff --git a/juick-core/src/main/java/com/juick/DeviceRegistration.java b/juick-core/src/main/java/com/juick/DeviceRegistration.java deleted file mode 100644 index eb9a9ffc..00000000 --- a/juick-core/src/main/java/com/juick/DeviceRegistration.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2008-2017, Juick - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package com.juick; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Created by vitalyster on 22.11.2016. - */ -public class DeviceRegistration { - private String type; - private String token; - - @JsonCreator - public DeviceRegistration(@JsonProperty("type") String type, @JsonProperty("token") String token) { - this.type = type; - this.token = token; - } - - 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; - } -} diff --git a/juick-core/src/main/java/com/juick/ExternalToken.java b/juick-core/src/main/java/com/juick/ExternalToken.java new file mode 100644 index 00000000..933ecf82 --- /dev/null +++ b/juick-core/src/main/java/com/juick/ExternalToken.java @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2008-2017, Juick + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +package com.juick; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Created by vitalyster on 22.11.2016. + */ +public class ExternalToken { + private String name; + private String type; + private String token; + private String secret; + + @JsonCreator + 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 String getToken() { + return 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 devices; + private List tokens; public User() { - devices = new ArrayList<>(); + tokens = new ArrayList<>(); } @Override @@ -186,11 +187,12 @@ public class User implements Serializable { return false; } - public List getDevices() { - return devices; + @Nonnull + public List getTokens() { + return tokens; } - public void setDevices(List devices) { - this.devices = devices; + public void setTokens(List tokens) { + this.tokens = tokens; } } -- cgit v1.2.3