diff options
author | 2019-03-16 23:56:27 +0300 | |
---|---|---|
committer | 2019-03-16 23:56:27 +0300 | |
commit | 06105f76dbfa3b65e63ed06f9c4d5107bd49ed88 (patch) | |
tree | 5702c01cec9688039d891f4a711878706101c1c5 /src/main/java/com/juick/model | |
parent | 3ea4cd1942fa4e763034da11c5fa429407b67829 (diff) | |
parent | a49105285d0d7719d7f222a507af2d5ac5b4bdb1 (diff) |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/java/com/juick/model')
-rw-r--r-- | src/main/java/com/juick/model/UserInfo.java | 60 | ||||
-rw-r--r-- | src/main/java/com/juick/model/facebook/User.java | 70 | ||||
-rw-r--r-- | src/main/java/com/juick/model/twitter/User.java | 4 | ||||
-rw-r--r-- | src/main/java/com/juick/model/vk/Token.java | 14 | ||||
-rw-r--r-- | src/main/java/com/juick/model/vk/User.java | 18 | ||||
-rw-r--r-- | src/main/java/com/juick/model/vk/UsersResponse.java | 4 |
6 files changed, 4 insertions, 166 deletions
diff --git a/src/main/java/com/juick/model/UserInfo.java b/src/main/java/com/juick/model/UserInfo.java deleted file mode 100644 index ca5d75e0..00000000 --- a/src/main/java/com/juick/model/UserInfo.java +++ /dev/null @@ -1,60 +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 <http://www.gnu.org/licenses/>. - */ - -package com.juick.model; - -/** - * Created by vt on 03/09/16. - */ -public class UserInfo { - private String fullName; - private String country; - private String url; - private String description; - - public String getFullName() { - return fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public String getCountry() { - return country; - } - - public void setCountry(String country) { - this.country = country; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } -} diff --git a/src/main/java/com/juick/model/facebook/User.java b/src/main/java/com/juick/model/facebook/User.java index 80838de6..a9288fe4 100644 --- a/src/main/java/com/juick/model/facebook/User.java +++ b/src/main/java/com/juick/model/facebook/User.java @@ -27,98 +27,28 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class User { private String id; private String name; - private String link; - private boolean verified; private String firstName; private String lastName; - private String gender; - private String locale; - private String timezone; - private String updatedTime; private String email; public String getId() { return id; } - public void setId(String id) { - this.id = id; - } - public String getName() { return name; } - public void setName(String name) { - this.name = name; - } - - public String getLink() { - return link; - } - - public void setLink(String link) { - this.link = link; - } - - public boolean getVerified() { - return verified; - } - - public void setVerified(boolean verified) { - this.verified = verified; - } - @JsonProperty("first_name") public String getFirstName() { return firstName; } - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getGender() { - return gender; - } - - public void setGender(String gender) { - this.gender = gender; - } @JsonProperty("last_name") public String getLastName() { return lastName; } - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public String getLocale() { - return locale; - } - - public void setLocale(String locale) { - this.locale = locale; - } - - public String getTimezone() { - return timezone; - } - - public void setTimezone(String timezone) { - this.timezone = timezone; - } - - @JsonProperty("updated_time") - public String getUpdatedTime() { - return updatedTime; - } - - public void setUpdatedTime(String updatedTime) { - this.updatedTime = updatedTime; - } - public String getEmail() { return email; } diff --git a/src/main/java/com/juick/model/twitter/User.java b/src/main/java/com/juick/model/twitter/User.java index 3c80eff4..22f44cf6 100644 --- a/src/main/java/com/juick/model/twitter/User.java +++ b/src/main/java/com/juick/model/twitter/User.java @@ -31,8 +31,4 @@ public class User { public String getScreenName() { return screenName; } - - public void setScreenName(String screenName) { - this.screenName = screenName; - } } diff --git a/src/main/java/com/juick/model/vk/Token.java b/src/main/java/com/juick/model/vk/Token.java index ed93a3ab..15645f99 100644 --- a/src/main/java/com/juick/model/vk/Token.java +++ b/src/main/java/com/juick/model/vk/Token.java @@ -17,11 +17,13 @@ package com.juick.model.vk; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** * Created by vitalyster on 28.11.2016. */ +@JsonIgnoreProperties(ignoreUnknown = true) public class Token { private Long userId; private String accessToken; @@ -32,25 +34,13 @@ public class Token { return userId; } - public void setUserId(Long userId) { - this.userId = userId; - } - @JsonProperty("access_token") public String getAccessToken() { return accessToken; } - public void setAccessToken(String accessToken) { - this.accessToken = accessToken; - } - @JsonProperty("expires_in") public String getExpiresIn() { return expiresIn; } - - public void setExpiresIn(String expiresIn) { - this.expiresIn = expiresIn; - } } diff --git a/src/main/java/com/juick/model/vk/User.java b/src/main/java/com/juick/model/vk/User.java index aeb18285..7eb03182 100644 --- a/src/main/java/com/juick/model/vk/User.java +++ b/src/main/java/com/juick/model/vk/User.java @@ -17,11 +17,13 @@ package com.juick.model.vk; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** * Created by vitalyster on 28.11.2016. */ +@JsonIgnoreProperties(ignoreUnknown = true) public class User { private String id; private String firstName; @@ -33,33 +35,17 @@ public class User { return firstName; } - public void setFirstName(String firstName) { - this.firstName = firstName; - } - @JsonProperty("last_name") public String getLastName() { return lastName; } - public void setLastName(String lastName) { - this.lastName = lastName; - } - @JsonProperty("screen_name") public String getScreenName() { return screenName; } - public void setScreenName(String screenName) { - this.screenName = screenName; - } - public String getId() { return id; } - - public void setId(String id) { - this.id = id; - } } diff --git a/src/main/java/com/juick/model/vk/UsersResponse.java b/src/main/java/com/juick/model/vk/UsersResponse.java index 67505703..d82b0c4b 100644 --- a/src/main/java/com/juick/model/vk/UsersResponse.java +++ b/src/main/java/com/juick/model/vk/UsersResponse.java @@ -31,8 +31,4 @@ public class UsersResponse { public List<User> getUsers() { return users; } - - public void setUsers(List<User> users) { - this.users = users; - } } |