From e8866029cf8fffb1f4c897fe56eb536dc76fa405 Mon Sep 17 00:00:00 2001 From: dIsoVi Date: Mon, 10 Aug 2015 11:52:41 +0300 Subject: [PATCH] getter and setter for instagram --- .../social/vkontakte/api/VKontakteProfile.java | 8 ++++++++ .../vkontakte/api/impl/json/VKontakteProfileMixin.java | 1 - .../social/vkontakte/api/impl/UsersTemplateTest.java | 3 +-- .../social/vkontakte/api/impl/UtilsTemplateTest.java | 2 -- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/spring-social-vkontakte/src/main/java/org/springframework/social/vkontakte/api/VKontakteProfile.java b/spring-social-vkontakte/src/main/java/org/springframework/social/vkontakte/api/VKontakteProfile.java index 3717616..c61343f 100644 --- a/spring-social-vkontakte/src/main/java/org/springframework/social/vkontakte/api/VKontakteProfile.java +++ b/spring-social-vkontakte/src/main/java/org/springframework/social/vkontakte/api/VKontakteProfile.java @@ -93,6 +93,14 @@ public VKontakteProfile() { private LastSeen lastSeen; private Counters counters; + public String getInstagram() { + return instagram; + } + + public void setInstagram(String instagram) { + this.instagram = instagram; + } + public Counters getCounters() { return counters; } diff --git a/spring-social-vkontakte/src/main/java/org/springframework/social/vkontakte/api/impl/json/VKontakteProfileMixin.java b/spring-social-vkontakte/src/main/java/org/springframework/social/vkontakte/api/impl/json/VKontakteProfileMixin.java index 803c701..5fd497c 100644 --- a/spring-social-vkontakte/src/main/java/org/springframework/social/vkontakte/api/impl/json/VKontakteProfileMixin.java +++ b/spring-social-vkontakte/src/main/java/org/springframework/social/vkontakte/api/impl/json/VKontakteProfileMixin.java @@ -21,7 +21,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.springframework.social.vkontakte.api.*; diff --git a/spring-social-vkontakte/src/test/java/org/springframework/social/vkontakte/api/impl/UsersTemplateTest.java b/spring-social-vkontakte/src/test/java/org/springframework/social/vkontakte/api/impl/UsersTemplateTest.java index 1b5be1e..a1553e6 100644 --- a/spring-social-vkontakte/src/test/java/org/springframework/social/vkontakte/api/impl/UsersTemplateTest.java +++ b/spring-social-vkontakte/src/test/java/org/springframework/social/vkontakte/api/impl/UsersTemplateTest.java @@ -20,12 +20,10 @@ import org.springframework.social.vkontakte.api.VKontakteErrorException; import org.springframework.social.vkontakte.api.VKontakteProfile; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import static org.junit.Assert.assertEquals; -import static org.springframework.http.HttpMethod.GET; import static org.springframework.http.HttpMethod.POST; import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.springframework.test.web.client.match.MockRestRequestMatchers.method; @@ -51,6 +49,7 @@ public void getUser_currentUser() { assertEquals("Дуров", profile.getLastName()); assertEquals(705, profile.getCounters().getFriends()); assertEquals(12, profile.getCounters().getUserPhotos()); + assertEquals("durov", profile.getInstagram()); } @Test diff --git a/spring-social-vkontakte/src/test/java/org/springframework/social/vkontakte/api/impl/UtilsTemplateTest.java b/spring-social-vkontakte/src/test/java/org/springframework/social/vkontakte/api/impl/UtilsTemplateTest.java index f44f1ad..7acbbb2 100644 --- a/spring-social-vkontakte/src/test/java/org/springframework/social/vkontakte/api/impl/UtilsTemplateTest.java +++ b/spring-social-vkontakte/src/test/java/org/springframework/social/vkontakte/api/impl/UtilsTemplateTest.java @@ -15,8 +15,6 @@ */ package org.springframework.social.vkontakte.api.impl; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; import org.junit.Test; import org.springframework.social.vkontakte.api.VKGenericResponse; import org.springframework.social.vkontakte.api.VKObject;