Merge pull request #7 from RusticiSoftware/ells/1.0-query-api

* Turn on 1.0.0, and add 1.0 query API support

Author: bscSCORM

.gitignore

@@ -22,3 +22,7 @@ target/javadoc-bundle-options
 target/maven-archiver/
 target/maven-status/maven-compiler-plugin
 target/test-classes/
+
+.classpath
+.project
+.settings/

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

@@ -15,17 +15,18 @@
 */
 package com.rusticisoftware.tincan;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.net.URI;
+import java.net.URISyntaxException;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.rusticisoftware.tincan.json.JSONBase;
 import com.rusticisoftware.tincan.json.Mapper;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-
 /**
  * Activity model class
  */
@@ -35,23 +36,23 @@
 public class Activity extends JSONBase implements QueryableStatementTarget {
     private final String objectType = "Activity";
 
-    private URL id;
+    private URI id;
     private ActivityDefinition definition;
 
-    public Activity(URL id) {
+    public Activity(URI id) {
         this.id = id;
     }
 
-    public Activity(String id) throws MalformedURLException {
-        this(new URL(id));
+    public Activity(String id) throws URISyntaxException {
+        this(new URI(id));
     }
 
-    public Activity(JsonNode jsonNode) throws MalformedURLException {
+    public Activity(JsonNode jsonNode) throws URISyntaxException {
         this();
 
         JsonNode idNode = jsonNode.path("id");
         if (! idNode.isMissingNode()) {
-            this.setId(new URL(idNode.textValue()));
+            this.setId(new URI(idNode.textValue()));
         }
 
         JsonNode definitionNode = jsonNode.path("definition");
@@ -60,7 +61,7 @@ public Activity(JsonNode jsonNode) throws MalformedURLException {
         }
     }
 
-    public Activity(String id, String name, String description) throws MalformedURLException {
+    public Activity(String id, String name, String description) throws URISyntaxException {
         this(id);
 
         this.setDefinition(new ActivityDefinition(name, description));
@@ -81,11 +82,11 @@ public ObjectNode toJSONNode(TCAPIVersion version) {
         return node;
     }
 
-    public void setId(URL id) {
+    public void setId(URI id) {
         this.id = id;
     }
 
-    public void setId(String id) throws MalformedURLException {
-        this.setId(new URL(id));
+    public void setId(String id) throws URISyntaxException {
+        this.setId(new URI(id));
     }
 }

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

@@ -15,20 +15,22 @@
 */
 package com.rusticisoftware.tincan;
 
+import static com.rusticisoftware.tincan.InteractionType.getByString;
+
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 import com.rusticisoftware.tincan.json.JSONBase;
 import com.rusticisoftware.tincan.json.Mapper;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import static com.rusticisoftware.tincan.InteractionType.*;
 
 /**
  * Activity Definition model class
@@ -49,7 +51,7 @@ public class ActivityDefinition extends JSONBase {
     private ArrayList<InteractionComponent> target;
     private ArrayList<InteractionComponent> steps;
 
-    public ActivityDefinition(JsonNode jsonNode) throws MalformedURLException {
+    public ActivityDefinition(JsonNode jsonNode) throws URISyntaxException {
         this();
 
         JsonNode typeNode = jsonNode.path("type");

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

@@ -30,14 +30,25 @@
 @EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 public class Agent extends JSONBase implements QueryableStatementTarget {
-    private final String objectType = "Agent";
+    protected final String objectType = "Agent";
     private String name;
     private String mbox;
     private String mboxSHA1Sum;
     private String openID;
     private AgentAccount account;
 
-    public Agent(JsonNode jsonNode) {
+    public static Agent fromJson(JsonNode jsonNode) {
+        
+        String objectType = "Agent";
+        JsonNode objectTypeNode = jsonNode.path("objectType");
+        if (! objectTypeNode.isMissingNode()) {
+            objectType = objectTypeNode.textValue();
+        }
+        
+        return "Group".equals(objectType) ? new Group(jsonNode) : new Agent(jsonNode);
+    }
+    
+    protected Agent(JsonNode jsonNode) {
         this();
 
         JsonNode nameNode = jsonNode.path("name");

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

@@ -15,15 +15,17 @@
 */
 package com.rusticisoftware.tincan;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.net.URISyntaxException;
+import java.util.UUID;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.rusticisoftware.tincan.json.JSONBase;
 import com.rusticisoftware.tincan.json.Mapper;
-import java.net.MalformedURLException;
-import java.util.UUID;
 
 /**
  * Context Class Description
@@ -42,7 +44,7 @@ public class Context extends JSONBase {
     private SubStatement statement;
     private Extensions extensions;
 
-    public Context(JsonNode jsonNode) throws MalformedURLException {
+    public Context(JsonNode jsonNode) throws URISyntaxException {
         this();
 
         JsonNode registrationNode = jsonNode.path("registration");
@@ -53,12 +55,12 @@ public Context(JsonNode jsonNode) throws MalformedURLException {
         // TODO: check these for Group
         JsonNode instructorNode = jsonNode.path("instructor");
         if (! instructorNode.isMissingNode()) {
-            this.setInstructor(new Agent(instructorNode));
+            this.setInstructor(Agent.fromJson(instructorNode));
         }
 
         JsonNode teamNode = jsonNode.path("team");
         if (! teamNode.isMissingNode()) {
-            this.setTeam(new Agent(teamNode));
+            this.setTeam(Agent.fromJson(teamNode));
         }
 
         JsonNode contextActivitiesNode = jsonNode.path("contextActivities");

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

@@ -15,20 +15,22 @@
 */
 package com.rusticisoftware.tincan;
 
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 import com.rusticisoftware.tincan.exceptions.IncompatibleTCAPIVersion;
 import com.rusticisoftware.tincan.json.JSONBase;
 import com.rusticisoftware.tincan.json.Mapper;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * ContextActivities Model class
@@ -41,7 +43,7 @@ public class ContextActivities extends JSONBase {
     private List<Activity> grouping;
     private List<Activity> other;
 
-    public ContextActivities(JsonNode jsonNode) throws MalformedURLException {
+    public ContextActivities(JsonNode jsonNode) throws URISyntaxException {
         this();
 
         JsonNode parentNode = jsonNode.path("parent");

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

@@ -15,15 +15,17 @@
 */
 package com.rusticisoftware.tincan;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+
 import lombok.NoArgsConstructor;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.rusticisoftware.tincan.json.Mapper;
 import com.rusticisoftware.tincan.json.StringOfJSON;
 
@@ -32,58 +34,58 @@
  */
 @NoArgsConstructor
 public class Extensions {
-    private final HashMap<URL,JsonNode> _map = new HashMap<URL,JsonNode>();
+    private final HashMap<URI,JsonNode> _map = new HashMap<URI,JsonNode>();
 
-    public Extensions(JsonNode jsonNode) throws MalformedURLException {
+    public Extensions(JsonNode jsonNode) throws URISyntaxException {
         Iterator<Map.Entry<String,JsonNode>> items = jsonNode.fields();
         while(items.hasNext()) {
             Map.Entry<String,JsonNode> item = items.next();
 
-            this.put(new URL(item.getKey()), item.getValue());
+            this.put(new URI(item.getKey()), item.getValue());
         }
     }
 
-    public Extensions(StringOfJSON jsonStr) throws IOException {
+    public Extensions(StringOfJSON jsonStr) throws IOException, URISyntaxException {
         this(jsonStr.toJSONNode());
     }
 
     public ObjectNode toJSONNode(TCAPIVersion version) {
         ObjectNode node = Mapper.getInstance().createObjectNode();
 
-        for (Map.Entry<URL,JsonNode> entry : this._map.entrySet()) {
+        for (Map.Entry<URI,JsonNode> entry : this._map.entrySet()) {
             node.put(entry.getKey().toString(), entry.getValue());
         }
 
         return node;
     }
 
-    public Object put(URL key, JsonNode val) {
+    public Object put(URI key, JsonNode val) {
         return this._map.put(key, val);
     }
 
-    public Object put(String key, JsonNode val) throws MalformedURLException {
-        return this.put(new URL(key), val);
+    public Object put(String key, JsonNode val) throws URISyntaxException {
+        return this.put(new URI(key), val);
     }
 
-    public Object put(URL key, Object val) {
+    public Object put(URI key, Object val) {
         JsonNode storeVal = Mapper.getInstance().valueToTree(val);
         return this.put(key, storeVal);
     }
 
-    public Object put(URL key, StringOfJSON val) {
+    public Object put(URI key, StringOfJSON val) {
         JsonNode storeVal = Mapper.getInstance().valueToTree(val);
         return this.put(key, storeVal);
     }
 
-    public Object put(String key, Object val) throws MalformedURLException {
-        return this.put(new URL(key), val);
+    public Object put(String key, Object val) throws URISyntaxException {
+        return this.put(new URI(key), val);
     }
 
-    public JsonNode get(URL key) {
+    public JsonNode get(URI key) {
         return this._map.get(key);
     }
 
-    public JsonNode get(String key) throws MalformedURLException {
-        return this.get(new URL(key));
+    public JsonNode get(String key) throws URISyntaxException {
+        return this.get(new URI(key));
     }
 }

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

@@ -15,6 +15,15 @@
 */
 package com.rusticisoftware.tincan;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.rusticisoftware.tincan.json.Mapper;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -24,5 +33,36 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class Group extends Agent {
-    private final String objectType = "Group";
+    protected final String objectType = "Group";
+    private List<Agent> members;
+    
+    public Group() {
+        super();
+    }
+    
+    public Group(JsonNode jsonNode) {
+        super(jsonNode);
+        
+        JsonNode memberNode = jsonNode.path("member");
+        if (! memberNode.isMissingNode()) {
+            this.members = new ArrayList<Agent>();
+            Iterator it = memberNode.elements();
+            while(it.hasNext()) {
+                this.members.add(Agent.fromJson((JsonNode) it.next()));
+            }
+        }
+    }
+    
+    @Override
+    public ObjectNode toJSONNode(TCAPIVersion version) {
+        ObjectNode node = super.toJSONNode(version);
+        if (this.getMembers() != null) {
+            ArrayNode memberNode = Mapper.getInstance().createArrayNode();
+            for (Agent member : this.getMembers()) {
+                memberNode.add(member.toJSONNode(version));
+            }
+            node.put("member", memberNode);
+        }
+        return node;
+    }
 }

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

@@ -23,7 +23,8 @@
  */
 public interface LRS {
     Statement retrieveStatement(String id) throws Exception;
-    StatementsResult queryStatements(StatementsQuery query) throws Exception;
+    Statement retrieveVoidedStatement(String id) throws Exception;
+    StatementsResult queryStatements(StatementsQueryInterface query) throws Exception;
     StatementsResult moreStatements(String moreURL) throws Exception;
     UUID saveStatement(Statement statement) throws Exception;
     List<String> saveStatements(List<Statement> statements) throws Exception;