Move attachments from Feed to Item. Fixes #8.

devilgate · Oct 27, 2020 · ad6a0ae · ad6a0ae
1 parent 689c1e9
commit ad6a0ae
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 135 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ plugins {
 }
 
 sourceCompatibility = 1.8
-version = '1.0.4'
+version = '1.0.5'
 
 jar {
     manifest {

diff --git a/pom.xml b/pom.xml
diff --git a/src/main/java/software/tinlion/pertwee/Feed.java b/src/main/java/software/tinlion/pertwee/Feed.java
@@ -114,10 +114,6 @@ public interface Feed {
 
     List<Hub> hubs();
 
-    boolean hasAttachments();
-
-    List<Attachment> attachments();
-
     boolean hasExtensions();
 
     /**

diff --git a/src/main/java/software/tinlion/pertwee/Item.java b/src/main/java/software/tinlion/pertwee/Item.java
@@ -35,4 +35,7 @@ public interface Item {
 
     public List<String> tags();
 
+    boolean hasAttachments();
+
+    List<Attachment> attachments();
 }
diff --git a/src/main/java/software/tinlion/pertwee/feed/DefaultFeed.java b/src/main/java/software/tinlion/pertwee/feed/DefaultFeed.java
@@ -204,24 +204,6 @@ public boolean hasExtensions() {
         return false;
     }
 
-    @Override
-    public boolean hasAttachments() {
-
-        return feedObject.has("attachments") 
-                && feedObject.optJSONArray("attachements") != null
-                && !feedObject.getJSONArray("attachments").isEmpty();
-    }
-
-    @Override
-    public List<Attachment> attachments() {
-
-        if (hasAttachments()) {
-
-            return AnAttachment.parseAttachmentsFromJson(feedObject.getJSONArray("attachments"));
-        }
-        return null;
-    }
-
     public String print() {
 
         StringBuilder output = new StringBuilder();

diff --git a/src/main/java/software/tinlion/pertwee/feed/DefaultItem.java b/src/main/java/software/tinlion/pertwee/feed/DefaultItem.java
@@ -4,6 +4,7 @@
 
 import org.json.JSONObject;
 
+import software.tinlion.pertwee.Attachment;
 import software.tinlion.pertwee.Author;
 import software.tinlion.pertwee.Item;
 import software.tinlion.pertwee.check.GetIfPresent;
@@ -121,4 +122,24 @@ public String toString() {
 
         return itemObject.toString();
     }
+
+    @Override
+    public boolean hasAttachments() {
+
+        return itemObject.has("attachments")
+               && itemObject.optJSONArray("attachements") != null
+               && !itemObject.getJSONArray("attachments").isEmpty();
+    }
+
+    @Override
+    public List<Attachment> attachments() {
+
+        if (hasAttachments()) {
+
+            return AnAttachment.parseAttachmentsFromJson(itemObject.getJSONArray("attachments"));
+        }
+        return null;
+    }
+
+
 }