diff --git a/build.gradle b/build.gradle
index 91ee045..b2392bd 100644
--- 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
deleted file mode 100644
index 1bc57b0..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
- 4.0.0
-
- software.tinlion
-
- pertwee
-
- 1.0.3-SNAPSHOT
-
- Pertwee
-
- A JSON Feed parser written in Java
-
-
- 1.8
- 1.8
- UTF-8
-
-
-
-
-
- org.json
- json
- 20200518
-
-
-
- junit
- junit
- 4.13.1
- test
-
-
-
-
-
- scm:git:https://github.com/devilgate/pertwee.git
- pertwee-1.0.0
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 2.2
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
- 2.2-beta-4
-
-
-
- jar-with-dependencies
-
-
-
- software.tinlion.pertwee.Runner
-
-
-
-
-
-
- package
-
- single
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 2.4
-
-
- attach-sources
-
- jar
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-release-plugin
- 2.5.3
-
-
-
-
-
-
-
-
- local-file
- Local file-based repo
- file:/Users/martin/Dropbox/programming/repository/
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/java/software/tinlion/pertwee/Feed.java b/src/main/java/software/tinlion/pertwee/Feed.java
index 2c49934..ec351e2 100644
--- 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 hubs();
- boolean hasAttachments();
-
- List attachments();
-
boolean hasExtensions();
/**
diff --git a/src/main/java/software/tinlion/pertwee/Item.java b/src/main/java/software/tinlion/pertwee/Item.java
index 9f78d61..b8dbf19 100644
--- 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 tags();
+ boolean hasAttachments();
+
+ List attachments();
}
diff --git a/src/main/java/software/tinlion/pertwee/feed/DefaultFeed.java b/src/main/java/software/tinlion/pertwee/feed/DefaultFeed.java
index d8694a0..8a38829 100644
--- 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 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
index cfac4cf..513a412 100644
--- 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 attachments() {
+
+ if (hasAttachments()) {
+
+ return AnAttachment.parseAttachmentsFromJson(itemObject.getJSONArray("attachments"));
+ }
+ return null;
+ }
+
+
}