Merge remote-tracking branch 'origin/master'

3 files changed, 4 insertions, 32 deletions

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