4 files changed, 58 insertions, 72 deletions
diff --git a/src/main/java/com/juick/www/api/activity/model/Context.java b/src/main/java/com/juick/www/api/activity/model/Context.java
index edfa89b1..f5d95d24 100644
--- a/src/main/java/com/juick/www/api/activity/model/Context.java
+++ b/src/main/java/com/juick/www/api/activity/model/Context.java
@@ -58,11 +58,9 @@ import java.util.Map;
 public class Context {
 
     private List<Object> context;
-
     private String id;
-
     private String name;
-
+    private Image icon;
     private Instant published;
 
     @JsonDeserialize(using = LinkValueDeserializer.class)
@@ -150,4 +148,13 @@ public class Context {
     public void setName(String name) {
         this.name = name;
     }
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
+    public Image getIcon() {
+        return icon;
+    }
+
+    public void setIcon(Image icon) {
+        this.icon = icon;
+    }
 }
diff --git a/src/main/java/com/juick/www/api/activity/model/objects/SecurityObject.java b/src/main/java/com/juick/www/api/activity/model/objects/Actor.java
index 8d17aa29..f8bd63e0 100644
--- a/src/main/java/com/juick/www/api/activity/model/objects/SecurityObject.java
+++ b/src/main/java/com/juick/www/api/activity/model/objects/Actor.java
@@ -20,7 +20,13 @@ package com.juick.www.api.activity.model.objects;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.juick.www.api.activity.model.Context;
 
-public class SecurityObject extends Context {
+public class Actor extends Context {
+
+    private String preferredUsername;
+    private String inbox;
+    private String outbox;
+    private String following;
+    private String followers;
 
     private Key publicKey;
 
@@ -33,4 +39,43 @@ public class SecurityObject extends Context {
         this.publicKey = publicKey;
     }
     
+    public String getOutbox() {
+        return outbox;
+    }
+
+    public void setOutbox(String outbox) {
+        this.outbox = outbox;
+    }
+
+    public String getInbox() {
+        return inbox;
+    }
+
+    public void setInbox(String inbox) {
+        this.inbox = inbox;
+    }
+
+    public String getFollowing() {
+        return following;
+    }
+
+    public void setFollowing(String following) {
+        this.following = following;
+    }
+
+    public String getFollowers() {
+        return followers;
+    }
+
+    public void setFollowers(String followers) {
+        this.followers = followers;
+    }
+
+    public String getPreferredUsername() {
+        return preferredUsername;
+    }
+
+    public void setPreferredUsername(String preferredUsername) {
+        this.preferredUsername = preferredUsername;
+    }
 }
diff --git a/src/main/java/com/juick/www/api/activity/model/objects/Application.java b/src/main/java/com/juick/www/api/activity/model/objects/Application.java
index 29361b33..d30d36c9 100644
--- a/src/main/java/com/juick/www/api/activity/model/objects/Application.java
+++ b/src/main/java/com/juick/www/api/activity/model/objects/Application.java
@@ -17,5 +17,5 @@
 
 package com.juick.www.api.activity.model.objects;
 
-public class Application extends SecurityObject {
+public class Application extends Actor {
 }
diff --git a/src/main/java/com/juick/www/api/activity/model/objects/Person.java b/src/main/java/com/juick/www/api/activity/model/objects/Person.java
index 84844510..e59c793a 100644
--- a/src/main/java/com/juick/www/api/activity/model/objects/Person.java
+++ b/src/main/java/com/juick/www/api/activity/model/objects/Person.java
@@ -17,72 +17,6 @@
 
 package com.juick.www.api.activity.model.objects;
 
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
+public class Person extends Actor {
 
-public class Person extends SecurityObject {
-
-    private String name;
-    private String preferredUsername;
-    private Image icon;
-    private String inbox;
-    private String outbox;
-    private String following;
-    private String followers;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
-    public Image getIcon() {
-        return icon;
-    }
-
-    public void setIcon(Image icon) {
-        this.icon = icon;
-    }
-
-    public String getOutbox() {
-        return outbox;
-    }
-
-    public void setOutbox(String outbox) {
-        this.outbox = outbox;
-    }
-
-    public String getInbox() {
-        return inbox;
-    }
-
-    public void setInbox(String inbox) {
-        this.inbox = inbox;
-    }
-
-    public String getFollowing() {
-        return following;
-    }
-
-    public void setFollowing(String following) {
-        this.following = following;
-    }
-
-    public String getFollowers() {
-        return followers;
-    }
-
-    public void setFollowers(String followers) {
-        this.followers = followers;
-    }
-
-    public String getPreferredUsername() {
-        return preferredUsername;
-    }
-
-    public void setPreferredUsername(String preferredUsername) {
-        this.preferredUsername = preferredUsername;
-    }
 }