Skip to content

Commit f0de0f6

Browse files
committed
Merge pull request #19 from brianjmiller/master
Correct 'statement' type in Context
2 parents 62591cf + cf92ad7 commit f0de0f6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/main/java/com/rusticisoftware/tincan/Context.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class Context extends JSONBase {
4242
private String revision;
4343
private String platform;
4444
private String language;
45-
private SubStatement statement;
45+
private StatementRef statement;
4646
private Extensions extensions;
4747

4848
public Context(JsonNode jsonNode) throws MalformedURLException, URISyntaxException {
@@ -86,7 +86,7 @@ public Context(JsonNode jsonNode) throws MalformedURLException, URISyntaxExcepti
8686

8787
JsonNode statementNode = jsonNode.path("statement");
8888
if (! statementNode.isMissingNode()) {
89-
this.setStatement(new SubStatement(statementNode));
89+
this.setStatement(new StatementRef(statementNode));
9090
}
9191

9292
JsonNode extensionsNode = jsonNode.path("extensions");

src/test/java/com/rusticisoftware/tincan/ContextTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ public void serializeDeserialize() throws Exception {
4444
ctx.setPlatform("iPhone 5");
4545
ctx.setRegistration(UUID.randomUUID());
4646
ctx.setRevision("1.0.4");
47-
48-
ctx.setStatement(new SubStatement());
49-
ctx.getStatement().setActor(getAgent("Sub", "mbox", "mailto:[email protected]"));
50-
ctx.getStatement().setVerb(new Verb("http://example.com/verb"));
51-
ctx.getStatement().setObject(new Activity("http://example.com/sub-activity"));
52-
47+
48+
StatementRef ref = new StatementRef();
49+
ref.setId(UUID.randomUUID());
50+
51+
ctx.setStatement(ref);
52+
5353
ctx.setTeam(getAgent("Group", "mbox", "mailto:[email protected]"));
5454

5555
assertSerializeDeserialize(ctx);

0 commit comments

Comments
 (0)