diff --git a/src/main/java/com/rusticisoftware/tincan/LanguageMap.java b/src/main/java/com/rusticisoftware/tincan/LanguageMap.java index e890cd5..ec2c6a7 100644 --- a/src/main/java/com/rusticisoftware/tincan/LanguageMap.java +++ b/src/main/java/com/rusticisoftware/tincan/LanguageMap.java @@ -41,6 +41,7 @@ private class LanguageMapIterator implements Iterator> public LanguageMapIterator() { iterator = _map.entrySet().iterator(); } + @Override public boolean hasNext() { return iterator.hasNext(); @@ -54,7 +55,8 @@ public Entry next() { @Override public void remove() throws UnsupportedOperationException { throw new UnsupportedOperationException( - "LanguageMap iterator does not implement the remove method"); + "LanguageMap iterator does not implement the remove method" + ); } } public LanguageMap(JsonNode jsonNode) { @@ -81,7 +83,7 @@ public ObjectNode toJSONNode(TCAPIVersion version) { public String put(String key, String val) { return this._map.put(key, val); } - + public String put(Map.Entry entry) { return this.put(entry.getKey(), entry.getValue()); } @@ -110,13 +112,13 @@ public Map.Entry findFirstValue(String value) { } return retVal; } - + public void populateWithAvailableLanguages(List list) { - Iterator> it = this.iterator(); - while (it.hasNext()) { - Map.Entry n = it.next(); - list.add(n.getKey()); - } + Iterator> it = this.iterator(); + while (it.hasNext()) { + Map.Entry n = it.next(); + list.add(n.getKey()); + } } @Override diff --git a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java index c260038..9dac0a1 100644 --- a/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java +++ b/src/main/java/com/rusticisoftware/tincan/RemoteLRS.java @@ -698,14 +698,14 @@ public LRSResponse clearState(Activity activity, Agent agent, UUID registration) @Override public ActivityProfileLRSResponse retrieveActivity(Activity activity) { - HashMap queryParams = new HashMap(); - queryParams.put("activityId", activity.getId().toString()); - ActivityProfileDocument profileDocument = new ActivityProfileDocument(); - profileDocument.setActivity(activity); - profileDocument.setId(null); - - LRSResponse lrsResp = getDocument("activities", queryParams, profileDocument); - + HashMap queryParams = new HashMap(); + queryParams.put("activityId", activity.getId().toString()); + ActivityProfileDocument profileDocument = new ActivityProfileDocument(); + profileDocument.setActivity(activity); + profileDocument.setId(null); + + LRSResponse lrsResp = getDocument("activities", queryParams, profileDocument); + ActivityProfileLRSResponse lrsResponse = new ActivityProfileLRSResponse(lrsResp.getRequest(), lrsResp.getResponse()); lrsResponse.setSuccess(lrsResp.getSuccess()); @@ -713,9 +713,9 @@ public ActivityProfileLRSResponse retrieveActivity(Activity activity) { lrsResponse.setContent(profileDocument); } - return lrsResponse; + return lrsResponse; } - + @Override public ProfileKeysLRSResponse retrieveActivityProfileIds(Activity activity) { HashMap queryParams = new HashMap(); @@ -777,14 +777,14 @@ public LRSResponse deleteActivityProfile(ActivityProfileDocument profile) { @Override public AgentProfileLRSResponse retrievePerson(Agent agent) { - HashMap queryParams = new HashMap(); - queryParams.put("agent", agent.toJSON(TCAPIVersion.V100)); - AgentProfileDocument profileDocument = new AgentProfileDocument(); - profileDocument.setAgent(agent); - profileDocument.setId(null); - - LRSResponse lrsResp = getDocument("agents", queryParams, profileDocument); - + HashMap queryParams = new HashMap(); + queryParams.put("agent", agent.toJSON(TCAPIVersion.V100)); + AgentProfileDocument profileDocument = new AgentProfileDocument(); + profileDocument.setAgent(agent); + profileDocument.setId(null); + + LRSResponse lrsResp = getDocument("agents", queryParams, profileDocument); + AgentProfileLRSResponse lrsResponse = new AgentProfileLRSResponse(lrsResp.getRequest(), lrsResp.getResponse()); lrsResponse.setSuccess(lrsResp.getSuccess()); @@ -792,9 +792,9 @@ public AgentProfileLRSResponse retrievePerson(Agent agent) { lrsResponse.setContent(profileDocument); } - return lrsResponse; + return lrsResponse; } - + @Override public ProfileKeysLRSResponse retrieveAgentProfileIds(Agent agent) { HashMap queryParams = new HashMap(); diff --git a/src/test/java/com/rusticisoftware/tincan/LanguageMapTest.java b/src/test/java/com/rusticisoftware/tincan/LanguageMapTest.java index e1ab453..f75d1e2 100644 --- a/src/test/java/com/rusticisoftware/tincan/LanguageMapTest.java +++ b/src/test/java/com/rusticisoftware/tincan/LanguageMapTest.java @@ -31,7 +31,7 @@ * Description */ public class LanguageMapTest { - + @Test public void serializeDeserialize() throws Exception { LanguageMap lm = new LanguageMap(); @@ -53,7 +53,6 @@ public void fillAndIterate() { } String lmContent = lm.toJSON(); - String lmCopyContent = lmCopy.toJSON(); assertEquals(lmContent, lmCopyContent); @@ -74,8 +73,8 @@ public void fillAndIterate() { assertEquals(arrayOfLangs.size(), 3); assertEquals(linkedListOfLangs.size(), 3); assertEquals(vectorOfLangs.size(), 3); - for(String s : linkedListOfLangs) { - assertTrue(lm.containsKey(s)); + for (String s : linkedListOfLangs) { + assertTrue(lm.containsKey(s)); } } } diff --git a/src/test/java/com/rusticisoftware/tincan/RemoteLRSTest.java b/src/test/java/com/rusticisoftware/tincan/RemoteLRSTest.java index b3dabb5..0375b22 100644 --- a/src/test/java/com/rusticisoftware/tincan/RemoteLRSTest.java +++ b/src/test/java/com/rusticisoftware/tincan/RemoteLRSTest.java @@ -525,26 +525,26 @@ public void testClearState() throws Exception { @Test public void testRetrieveActivity() throws Exception { ActivityProfileLRSResponse lrsResponse = lrs.retrieveActivity(activity); - Assert.assertTrue(lrsResponse.getSuccess()); - - ActivityProfileDocument returnedDoc = lrsResponse.getContent(); - Assert.assertNull(returnedDoc.getId()); // Retrieving the full Activity does not return a profile ID - Activity returnedActivity = returnedDoc.getActivity(); - Assert.assertTrue(activity.getId().toString().equals(returnedActivity.getId().toString())); - - // Test for non-existent activity - Activity noActivity = new Activity(); - noActivity.setId("https://brindlewaye.com/xAPITerms/Activity/NeverGonnaHappen/"); - + Assert.assertTrue(lrsResponse.getSuccess()); + + ActivityProfileDocument returnedDoc = lrsResponse.getContent(); + Assert.assertNull(returnedDoc.getId()); // Retrieving the full Activity does not return a profile ID + Activity returnedActivity = returnedDoc.getActivity(); + Assert.assertTrue(activity.getId().toString().equals(returnedActivity.getId().toString())); + + // Test for non-existent activity + Activity noActivity = new Activity(); + noActivity.setId("https://brindlewaye.com/xAPITerms/Activity/NeverGonnaHappen/"); + ActivityProfileLRSResponse lrsResponse2 = lrs.retrieveActivity(noActivity); // Report success even though response status was 404 - Assert.assertTrue(lrsResponse2.getSuccess()); - Assert.assertTrue(lrsResponse2.getResponse().getStatus() == 404); + Assert.assertTrue(lrsResponse2.getSuccess()); + Assert.assertTrue(lrsResponse2.getResponse().getStatus() == 404); - ActivityProfileDocument returnedDoc2 = lrsResponse2.getContent(); - Assert.assertNull(returnedDoc2); + ActivityProfileDocument returnedDoc2 = lrsResponse2.getContent(); + Assert.assertNull(returnedDoc2); } - + @Test public void testRetrieveActivityProfileIds() throws Exception { ProfileKeysLRSResponse lrsRes = lrs.retrieveActivityProfileIds(activity); @@ -697,27 +697,27 @@ public void testDeleteActivityProfile() throws Exception { @Test public void testRetrievePerson() throws Exception { AgentProfileLRSResponse lrsResponse = lrs.retrievePerson(agent); - Assert.assertTrue(lrsResponse.getSuccess()); - - AgentProfileDocument returnedDoc = lrsResponse.getContent(); - Assert.assertNull(returnedDoc.getId()); // Retrieving the full Agent does not return a profile ID - Agent returnedAgent = returnedDoc.getAgent(); - Assert.assertTrue(agent.getName().equals(returnedAgent.getName())); - - // Test for non-existent agent - Agent noAgent = new Agent(); - noAgent.setMbox("mailto:noone@example.com"); - noAgent.setName("No One"); - + Assert.assertTrue(lrsResponse.getSuccess()); + + AgentProfileDocument returnedDoc = lrsResponse.getContent(); + Assert.assertNull(returnedDoc.getId()); // Retrieving the full Agent does not return a profile ID + Agent returnedAgent = returnedDoc.getAgent(); + Assert.assertTrue(agent.getName().equals(returnedAgent.getName())); + + // Test for non-existent agent + Agent noAgent = new Agent(); + noAgent.setMbox("mailto:noone@example.com"); + noAgent.setName("No One"); + AgentProfileLRSResponse lrsResponse2 = lrs.retrievePerson(noAgent); - Assert.assertTrue(lrsResponse2.getSuccess()); - Assert.assertTrue(lrsResponse2.getResponse().getStatus() == 200); - - Agent returnedAgent2 = lrsResponse2.getContent().getAgent(); - // The spec says that this call will return an object built from the information provided in the parameter Agent if it finds nothing matching at the endpoint - Assert.assertTrue(returnedAgent2.equals(noAgent)); - } - + Assert.assertTrue(lrsResponse2.getSuccess()); + Assert.assertTrue(lrsResponse2.getResponse().getStatus() == 200); + + Agent returnedAgent2 = lrsResponse2.getContent().getAgent(); + // The spec says that this call will return an object built from the information provided in the parameter Agent if it finds nothing matching at the endpoint + Assert.assertTrue(returnedAgent2.equals(noAgent)); + } + @Test public void testRetrieveAgentProfileIds() throws Exception { ProfileKeysLRSResponse lrsRes = lrs.retrieveAgentProfileIds(agent);