References to objects in array documents and object documents

core/src/main/java/moe/banana/jsonapi2/ArrayDocument.java

@@ -31,6 +31,19 @@ public boolean remove(Object o) {
         return false;
     }
 
+    @Override
+    public <T extends Resource> T find(ResourceIdentifier resourceIdentifier) {
+        for (DATA resource : data) {
+            if (resource.getId().equals(resourceIdentifier.getId()) &&
+                    resource.getType().equals(resourceIdentifier.getType())) {
+                //noinspection unchecked
+                return (T) resource;
+            }
+        }
+
+        return super.find(resourceIdentifier);
+    }
+
     @Override
     public boolean containsAll(Collection<?> c) {
         return data.containsAll(c);

core/src/main/java/moe/banana/jsonapi2/ObjectDocument.java

@@ -46,6 +46,18 @@ public boolean hasData() {
         return hasData;
     }
 
+    @Override
+    public <T extends Resource> T find(ResourceIdentifier resourceIdentifier) {
+        if (data != null &&
+                data.getId().equals(resourceIdentifier.getId()) &&
+                data.getType().equals(resourceIdentifier.getType())) {
+            //noinspection unchecked
+            return (T) data;
+        }
+
+        return super.find(resourceIdentifier);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

core/src/test/java/moe/banana/jsonapi2/DocumentTest.java

@@ -40,6 +40,14 @@ public void deserialize_object() throws Exception {
         assertOnArticle1(document.<Article>asObjectDocument().get());
     }
 
+    @Test
+    public void find_in_object_document_data() throws Exception {
+        ObjectDocument document = (ObjectDocument) getDocumentAdapter(Article.class)
+                .fromJson(TestUtil.fromResource("/single.json"));
+
+        assertOnArticle1((Article) document.find(new ResourceIdentifier("articles", "1")));
+    }
+
     @Test
     public void deserialize_object_null() throws Exception {
         Document document = getDocumentAdapter(Article.class)
@@ -203,6 +211,15 @@ public void deserialize_array_to_array_typed_document() throws Exception {
         assertOnArticle1(arrayDocument.get(0));
     }
 
+    @Test
+    public void deserialize_refences_to_data_objects_in_array_document() throws Exception {
+        Moshi moshi = TestUtil.moshi(Article.class, Comment.class);
+        JsonAdapter<?> adapter = moshi.adapter(Types.newParameterizedType(ArrayDocument.class, Article.class));
+        ArrayDocument<Article> arrayDocument = ((ArrayDocument<Article>) adapter.fromJson(TestUtil.fromResource("/multiple_compound.json")));
+
+        assertOnArticle1((Article) arrayDocument.find(new ResourceIdentifier("articles", "1")));
+    }
+
     @Test
     public void serialize_null() {
         ObjectDocument document = new ObjectDocument();

core/src/test/java/moe/banana/jsonapi2/model/Comment.java

@@ -8,6 +8,7 @@
 public class Comment extends Resource {
     private String body;
     private HasOne<Person> author;
+    private HasOne<Article> article;
 
     public String getBody() {
         return body;
@@ -24,4 +25,12 @@ public HasOne<Person> getAuthor() {
     public void setAuthor(HasOne<Person> author) {
         this.author = author;
     }
+
+    public HasOne<Article> getArticle() {
+        return this.article;
+    }
+
+    public void setArticle(HasOne<Article> article) {
+        this.article = article;
+    }
 }

core/src/test/resources/multiple_compound.json

@@ -97,4 +97,4 @@
       "cache_hit": true
     }
   }]
-}
+}