Fix version string to 1.0.0, diverge StatementsQuery objects between 1.0.x and 0.95 using namespace only, fix Group deserialization, remove old TODO

Author: davidells

.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/Group.java

@@ -43,7 +43,7 @@ public Group() {
     public Group(JsonNode jsonNode) {
         super(jsonNode);
 
-        JsonNode memberNode = jsonNode.path("statements");
+        JsonNode memberNode = jsonNode.path("member");
         if (! memberNode.isMissingNode()) {
             this.members = new ArrayList<Agent>();
             Iterator it = memberNode.elements();

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

@@ -33,7 +33,7 @@
 import com.rusticisoftware.tincan.exceptions.*;
 import com.rusticisoftware.tincan.json.Mapper;
 import com.rusticisoftware.tincan.json.StringOfJSON;
-import com.rusticisoftware.tincan.v095.StatementsQuery_V095;
+import com.rusticisoftware.tincan.v10x.StatementsQuery;
 
 import static org.eclipse.jetty.client.HttpClient.CONNECTOR_SELECT_CHANNEL;
 
@@ -161,7 +161,7 @@ public StatementsResult queryStatements(StatementsQueryInterface query) throws E
         //Setup empty query object if null was passed in
         if (query == null) { 
             query = (this.getVersion() == TCAPIVersion.V095) ? 
-                        new StatementsQuery_V095() :
+                        new com.rusticisoftware.tincan.v095.StatementsQuery() :
                         new StatementsQuery();
         }
 

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

@@ -59,7 +59,6 @@ public Statement(JsonNode jsonNode) throws URISyntaxException {
 
         JsonNode actorNode = jsonNode.path("actor");
         if (! actorNode.isMissingNode()) {
-            // TODO: check for Group (objectType)
             this.setActor(Agent.fromJson(actorNode));
         }
 

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

@@ -19,7 +19,7 @@
  * Description
  */
 public enum TCAPIVersion {
-    V100("1.0"),
+    V100("1.0.0"),
     V095("0.95");
 
     /**

…re/tincan/v095/StatementsQuery_V095.java …oftware/tincan/v095/StatementsQuery.javasrc/main/java/com/rusticisoftware/tincan/v095/StatementsQuery_V095.java renamed to src/main/java/com/rusticisoftware/tincan/v095/StatementsQuery.java src/main/java/com/rusticisoftware/tincan/v095/StatementsQuery_V095.java renamed to src/main/java/com/rusticisoftware/tincan/v095/StatementsQuery.java

@@ -40,7 +40,7 @@
  */
 @Data
 @NoArgsConstructor
-public class StatementsQuery_V095 implements StatementsQueryInterface {
+public class StatementsQuery implements StatementsQueryInterface {
     @Getter private TCAPIVersion version = TCAPIVersion.V095;
 
     private URI verbID;

…ticisoftware/tincan/StatementsQuery.java …oftware/tincan/v10x/StatementsQuery.javasrc/main/java/com/rusticisoftware/tincan/StatementsQuery.java renamed to src/main/java/com/rusticisoftware/tincan/v10x/StatementsQuery.java src/main/java/com/rusticisoftware/tincan/StatementsQuery.java renamed to src/main/java/com/rusticisoftware/tincan/v10x/StatementsQuery.java

@@ -13,7 +13,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-package com.rusticisoftware.tincan;
+package com.rusticisoftware.tincan.v10x;
 
 import lombok.Data;
 import lombok.Getter;
@@ -24,7 +24,9 @@
 import org.joda.time.format.ISODateTimeFormat;
 
 import com.rusticisoftware.tincan.Agent;
+import com.rusticisoftware.tincan.QueryResultFormat;
 import com.rusticisoftware.tincan.QueryableStatementTarget;
+import com.rusticisoftware.tincan.StatementsQueryInterface;
 import com.rusticisoftware.tincan.TCAPIVersion;
 import com.rusticisoftware.tincan.Verb;
 

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

@@ -15,26 +15,24 @@
 */
 package com.rusticisoftware.tincan;
 
-import lombok.extern.java.Log;
-import org.joda.time.DateTime;
-import org.joda.time.Duration;
-import org.joda.time.Period;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.rusticisoftware.tincan.v095.StatementsQuery_V095;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
+import lombok.extern.java.Log;
+
+import org.joda.time.DateTime;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.rusticisoftware.tincan.v10x.StatementsQuery;
+
 @Log
 public class RemoteLRSTest {
     private static final Properties config = new Properties();
@@ -280,7 +278,9 @@ public void testQueryStatementsNull() throws Exception {
     public void testQueryStatements_V095() throws Exception {
         RemoteLRS obj = getLRS(TCAPIVersion.V095);
 
-        StatementsQuery_V095 query = new StatementsQuery_V095();
+        com.rusticisoftware.tincan.v095.StatementsQuery query;
+        query = new com.rusticisoftware.tincan.v095.StatementsQuery();
+        
         query.setSince(new DateTime("2013-03-13T14:17:42.610Z"));
         //query.setLimit(3);
         query.setActor(mockAgent());