diff options
Diffstat (limited to 'src')
3 files changed, 9 insertions, 10 deletions
diff --git a/src/main/java/com/juick/server/api/activity/model/Context.java b/src/main/java/com/juick/server/api/activity/model/Context.java index d617f99b..687848cc 100644 --- a/src/main/java/com/juick/server/api/activity/model/Context.java +++ b/src/main/java/com/juick/server/api/activity/model/Context.java @@ -60,6 +60,10 @@ public abstract class Context { this.id = id; } + public String getType() { + return getClass().getSimpleName(); + } + @JsonProperty("@context") @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY) public List<Object> getContext() { diff --git a/src/main/java/com/juick/server/api/activity/model/objects/Person.java b/src/main/java/com/juick/server/api/activity/model/objects/Person.java index a6fd9a76..2d3a45d7 100644 --- a/src/main/java/com/juick/server/api/activity/model/objects/Person.java +++ b/src/main/java/com/juick/server/api/activity/model/objects/Person.java @@ -14,6 +14,11 @@ public class Person extends Context { private String followers; private Key publicKey; + @Override + public String getType() { + return "Person"; + } + public String getName() { return name; } diff --git a/src/test/java/com/juick/server/tests/ServerTests.java b/src/test/java/com/juick/server/tests/ServerTests.java index 53fbbf1d..de742447 100644 --- a/src/test/java/com/juick/server/tests/ServerTests.java +++ b/src/test/java/com/juick/server/tests/ServerTests.java @@ -37,7 +37,6 @@ import com.juick.server.*; import com.juick.server.api.activity.Profile; import com.juick.server.api.activity.model.Context; import com.juick.server.api.activity.model.activities.*; -import com.juick.server.api.activity.model.objects.Mention; import com.juick.server.api.activity.model.objects.Note; import com.juick.server.api.activity.model.objects.Person; import com.juick.server.api.webfinger.model.Account; @@ -2154,13 +2153,4 @@ public class ServerTests { .orElseThrow(); assertThat(htmlPM, is(getSnapshot(testPrivateHtmlEmail))); } - @Test - public void mentionShouldNotDuplicateType() throws Exception { - Mention mention = new Mention("http://localhost/u/ugnich", "ugnich"); - String mentionStr = jsonMapper.writeValueAsString(mention); - Context mentionFromString = jsonMapper.readValue(mentionStr, Context.class); - assertThat(mention, is(samePropertyValuesAs(mentionFromString))); - JsonNode mentionNode = jsonMapper.readTree(mentionStr); - assertThat(mentionNode.findValues("type").size(), is(1)); - } } |