Added relationship container

Author: mattupstate

spring-social-instagram/src/main/java/org/springframework/social/instagram/api/impl/RelationshipContainer.java

@@ -0,0 +1,19 @@
+package org.springframework.social.instagram.api.impl;
+
+import org.codehaus.jackson.map.annotate.JsonDeserialize;
+import org.springframework.social.instagram.api.Relationship;
+
+@JsonDeserialize(using=RelationshipContainerDeserializer.class)
+public class RelationshipContainer {
+    
+    private Relationship relationship;
+    
+    public RelationshipContainer(Relationship relationship) {
+        this.relationship = relationship;
+    }
+    
+    public Relationship getRelationship() {
+        return relationship;
+    }
+
+}

spring-social-instagram/src/main/java/org/springframework/social/instagram/api/impl/RelationshipContainerDeserializer.java

@@ -0,0 +1,16 @@
+package org.springframework.social.instagram.api.impl;
+
+import java.io.IOException;
+
+import org.codehaus.jackson.JsonParser;
+import org.codehaus.jackson.JsonProcessingException;
+import org.codehaus.jackson.map.DeserializationContext;
+import org.springframework.social.instagram.api.Relationship;
+
+public class RelationshipContainerDeserializer extends AbstractInstagramDeserializer<RelationshipContainer> {
+    
+    @Override public RelationshipContainer deserialize(JsonParser jp, DeserializationContext ctxt) 
+            throws IOException, JsonProcessingException {
+        return deserializeResponseObject(jp, RelationshipContainer.class, Relationship.class);
+    }
+}

spring-social-instagram/src/main/java/org/springframework/social/instagram/api/impl/UserTemplate.java

@@ -74,7 +74,7 @@ public List<InstagramProfile> getRequestedBy() {
 
 	public Relationship getRelationship(long userId) {
 		requireUserAuthorization();
-		return get(buildUri(USERS_ENDPOINT + Long.toString(userId) + "/relationship/"), Relationship.class);
+		return get(buildUri(USERS_ENDPOINT + Long.toString(userId) + "/relationship/"), RelationshipContainer.class).getRelationship();
 	}
 
 	public void followUser(long userId) {

spring-social-instagram/src/test/java/org/springframework/social/instagram/api/impl/UserTemplateTest.java

@@ -1,6 +1,8 @@
 package org.springframework.social.instagram.api.impl;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.springframework.http.HttpMethod.GET;
 import static org.springframework.http.HttpMethod.POST;
 import static org.springframework.social.test.client.RequestMatchers.body;
@@ -16,7 +18,6 @@
 import org.springframework.social.instagram.api.PagedMediaList;
 import org.springframework.social.instagram.api.Relationship;
 
-@SuppressWarnings("unused")
 public class UserTemplateTest extends AbstractInstagramApiTest {
 
 	@Test
@@ -70,6 +71,7 @@ public void getFollowedBy() {
 			.andRespond(withResponse(new ClassPathResource("testdata/user-list.json", getClass()), responseHeaders));
 
 		List<InstagramProfile> follows = instagram.userOperations().getFollowedBy(12345);
+		assertTrue(follows.size() > 0);
 		mockServer.verify();
 	}
 
@@ -80,6 +82,7 @@ public void getFollows() {
 			.andRespond(withResponse(new ClassPathResource("testdata/user-list.json", getClass()), responseHeaders));
 
 		List<InstagramProfile> follows = instagram.userOperations().getFollows(12345);
+		assertTrue(follows.size() > 0);
 		mockServer.verify();
 	}
 
@@ -90,6 +93,7 @@ public void getRequestedBy() {
 			.andRespond(withResponse(new ClassPathResource("testdata/user-list.json", getClass()), responseHeaders));
 
 		List<InstagramProfile> follows = instagram.userOperations().getRequestedBy();
+		assertTrue(follows.size() > 0);
 		mockServer.verify();
 	}
 
@@ -100,6 +104,8 @@ public void getRelationship() {
 			.andRespond(withResponse(new ClassPathResource("testdata/relationship.json", getClass()), responseHeaders));
 
 		Relationship relationship = instagram.userOperations().getRelationship(12345);
+		assertNotNull(relationship.getIncomingStatus());
+		assertNotNull(relationship.getOutgoingStatus());
 		mockServer.verify();
 	}