Skip to content

Commit 016ecd4

Browse files
brianjmillerbrianjmiller
committed
Whitespace only
1 parent 9c8ba97 commit 016ecd4

File tree

4 files changed

+69
-68
lines changed

4 files changed

+69
-68
lines changed

‎src/main/java/com/rusticisoftware/tincan/LanguageMap.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ private class LanguageMapIterator implements Iterator<Map.Entry<String, String>>
4141
public LanguageMapIterator() {
4242
iterator = _map.entrySet().iterator();
4343
}
44+
4445
@Override
4546
public boolean hasNext() {
4647
return iterator.hasNext();
@@ -54,7 +55,8 @@ public Entry<String, String> next() {
5455
@Override
5556
public void remove() throws UnsupportedOperationException {
5657
throw new UnsupportedOperationException(
57-
"LanguageMap iterator does not implement the remove method");
58+
"LanguageMap iterator does not implement the remove method"
59+
);
5860
}
5961
}
6062
public LanguageMap(JsonNode jsonNode) {
@@ -81,7 +83,7 @@ public ObjectNode toJSONNode(TCAPIVersion version) {
8183
public String put(String key, String val) {
8284
return this._map.put(key, val);
8385
}
84-
86+
8587
public String put(Map.Entry<String, String> entry) {
8688
return this.put(entry.getKey(), entry.getValue());
8789
}
@@ -110,13 +112,13 @@ public Map.Entry<String, String> findFirstValue(String value) {
110112
}
111113
return retVal;
112114
}
113-
115+
114116
public void populateWithAvailableLanguages(List<String> list) {
115-
Iterator<Map.Entry<String, String>> it = this.iterator();
116-
while (it.hasNext()) {
117-
Map.Entry<String, String> n = it.next();
118-
list.add(n.getKey());
119-
}
117+
Iterator<Map.Entry<String, String>> it = this.iterator();
118+
while (it.hasNext()) {
119+
Map.Entry<String, String> n = it.next();
120+
list.add(n.getKey());
121+
}
120122
}
121123

122124
@Override

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -698,24 +698,24 @@ public LRSResponse clearState(Activity activity, Agent agent, UUID registration)
698698

699699
@Override
700700
public ActivityProfileLRSResponse retrieveActivity(Activity activity) {
701-
HashMap<String, String> queryParams = new HashMap<String, String>();
702-
queryParams.put("activityId", activity.getId().toString());
703-
ActivityProfileDocument profileDocument = new ActivityProfileDocument();
704-
profileDocument.setActivity(activity);
705-
profileDocument.setId(null);
706-
707-
LRSResponse lrsResp = getDocument("activities", queryParams, profileDocument);
708-
701+
HashMap<String, String> queryParams = new HashMap<String, String>();
702+
queryParams.put("activityId", activity.getId().toString());
703+
ActivityProfileDocument profileDocument = new ActivityProfileDocument();
704+
profileDocument.setActivity(activity);
705+
profileDocument.setId(null);
706+
707+
LRSResponse lrsResp = getDocument("activities", queryParams, profileDocument);
708+
709709
ActivityProfileLRSResponse lrsResponse = new ActivityProfileLRSResponse(lrsResp.getRequest(), lrsResp.getResponse());
710710
lrsResponse.setSuccess(lrsResp.getSuccess());
711711

712712
if (lrsResponse.getResponse().getStatus() == 200) {
713713
lrsResponse.setContent(profileDocument);
714714
}
715715

716-
return lrsResponse;
716+
return lrsResponse;
717717
}
718-
718+
719719
@Override
720720
public ProfileKeysLRSResponse retrieveActivityProfileIds(Activity activity) {
721721
HashMap<String, String> queryParams = new HashMap<String, String>();
@@ -777,24 +777,24 @@ public LRSResponse deleteActivityProfile(ActivityProfileDocument profile) {
777777

778778
@Override
779779
public AgentProfileLRSResponse retrievePerson(Agent agent) {
780-
HashMap<String, String> queryParams = new HashMap<String, String>();
781-
queryParams.put("agent", agent.toJSON(TCAPIVersion.V100));
782-
AgentProfileDocument profileDocument = new AgentProfileDocument();
783-
profileDocument.setAgent(agent);
784-
profileDocument.setId(null);
785-
786-
LRSResponse lrsResp = getDocument("agents", queryParams, profileDocument);
787-
780+
HashMap<String, String> queryParams = new HashMap<String, String>();
781+
queryParams.put("agent", agent.toJSON(TCAPIVersion.V100));
782+
AgentProfileDocument profileDocument = new AgentProfileDocument();
783+
profileDocument.setAgent(agent);
784+
profileDocument.setId(null);
785+
786+
LRSResponse lrsResp = getDocument("agents", queryParams, profileDocument);
787+
788788
AgentProfileLRSResponse lrsResponse = new AgentProfileLRSResponse(lrsResp.getRequest(), lrsResp.getResponse());
789789
lrsResponse.setSuccess(lrsResp.getSuccess());
790790

791791
if (lrsResponse.getResponse().getStatus() == 200) {
792792
lrsResponse.setContent(profileDocument);
793793
}
794794

795-
return lrsResponse;
795+
return lrsResponse;
796796
}
797-
797+
798798
@Override
799799
public ProfileKeysLRSResponse retrieveAgentProfileIds(Agent agent) {
800800
HashMap<String, String> queryParams = new HashMap<String, String>();

‎src/test/java/com/rusticisoftware/tincan/LanguageMapTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* Description
3232
*/
3333
public class LanguageMapTest {
34-
34+
3535
@Test
3636
public void serializeDeserialize() throws Exception {
3737
LanguageMap lm = new LanguageMap();
@@ -53,7 +53,6 @@ public void fillAndIterate() {
5353
}
5454

5555
String lmContent = lm.toJSON();
56-
5756
String lmCopyContent = lmCopy.toJSON();
5857

5958
assertEquals(lmContent, lmCopyContent);
@@ -74,8 +73,8 @@ public void fillAndIterate() {
7473
assertEquals(arrayOfLangs.size(), 3);
7574
assertEquals(linkedListOfLangs.size(), 3);
7675
assertEquals(vectorOfLangs.size(), 3);
77-
for(String s : linkedListOfLangs) {
78-
assertTrue(lm.containsKey(s));
76+
for (String s : linkedListOfLangs) {
77+
assertTrue(lm.containsKey(s));
7978
}
8079
}
8180
}

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

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -525,26 +525,26 @@ public void testClearState() throws Exception {
525525
@Test
526526
public void testRetrieveActivity() throws Exception {
527527
ActivityProfileLRSResponse lrsResponse = lrs.retrieveActivity(activity);
528-
Assert.assertTrue(lrsResponse.getSuccess());
529-
530-
ActivityProfileDocument returnedDoc = lrsResponse.getContent();
531-
Assert.assertNull(returnedDoc.getId()); // Retrieving the full Activity does not return a profile ID
532-
Activity returnedActivity = returnedDoc.getActivity();
533-
Assert.assertTrue(activity.getId().toString().equals(returnedActivity.getId().toString()));
534-
535-
// Test for non-existent activity
536-
Activity noActivity = new Activity();
537-
noActivity.setId("https://brindlewaye.com/xAPITerms/Activity/NeverGonnaHappen/");
538-
528+
Assert.assertTrue(lrsResponse.getSuccess());
529+
530+
ActivityProfileDocument returnedDoc = lrsResponse.getContent();
531+
Assert.assertNull(returnedDoc.getId()); // Retrieving the full Activity does not return a profile ID
532+
Activity returnedActivity = returnedDoc.getActivity();
533+
Assert.assertTrue(activity.getId().toString().equals(returnedActivity.getId().toString()));
534+
535+
// Test for non-existent activity
536+
Activity noActivity = new Activity();
537+
noActivity.setId("https://brindlewaye.com/xAPITerms/Activity/NeverGonnaHappen/");
538+
539539
ActivityProfileLRSResponse lrsResponse2 = lrs.retrieveActivity(noActivity);
540540
// Report success even though response status was 404
541-
Assert.assertTrue(lrsResponse2.getSuccess());
542-
Assert.assertTrue(lrsResponse2.getResponse().getStatus() == 404);
541+
Assert.assertTrue(lrsResponse2.getSuccess());
542+
Assert.assertTrue(lrsResponse2.getResponse().getStatus() == 404);
543543

544-
ActivityProfileDocument returnedDoc2 = lrsResponse2.getContent();
545-
Assert.assertNull(returnedDoc2);
544+
ActivityProfileDocument returnedDoc2 = lrsResponse2.getContent();
545+
Assert.assertNull(returnedDoc2);
546546
}
547-
547+
548548
@Test
549549
public void testRetrieveActivityProfileIds() throws Exception {
550550
ProfileKeysLRSResponse lrsRes = lrs.retrieveActivityProfileIds(activity);
@@ -697,27 +697,27 @@ public void testDeleteActivityProfile() throws Exception {
697697
@Test
698698
public void testRetrievePerson() throws Exception {
699699
AgentProfileLRSResponse lrsResponse = lrs.retrievePerson(agent);
700-
Assert.assertTrue(lrsResponse.getSuccess());
701-
702-
AgentProfileDocument returnedDoc = lrsResponse.getContent();
703-
Assert.assertNull(returnedDoc.getId()); // Retrieving the full Agent does not return a profile ID
704-
Agent returnedAgent = returnedDoc.getAgent();
705-
Assert.assertTrue(agent.getName().equals(returnedAgent.getName()));
706-
707-
// Test for non-existent agent
708-
Agent noAgent = new Agent();
709-
noAgent.setMbox("mailto:[email protected]");
710-
noAgent.setName("No One");
711-
700+
Assert.assertTrue(lrsResponse.getSuccess());
701+
702+
AgentProfileDocument returnedDoc = lrsResponse.getContent();
703+
Assert.assertNull(returnedDoc.getId()); // Retrieving the full Agent does not return a profile ID
704+
Agent returnedAgent = returnedDoc.getAgent();
705+
Assert.assertTrue(agent.getName().equals(returnedAgent.getName()));
706+
707+
// Test for non-existent agent
708+
Agent noAgent = new Agent();
709+
noAgent.setMbox("mailto:[email protected]");
710+
noAgent.setName("No One");
711+
712712
AgentProfileLRSResponse lrsResponse2 = lrs.retrievePerson(noAgent);
713-
Assert.assertTrue(lrsResponse2.getSuccess());
714-
Assert.assertTrue(lrsResponse2.getResponse().getStatus() == 200);
715-
716-
Agent returnedAgent2 = lrsResponse2.getContent().getAgent();
717-
// 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
718-
Assert.assertTrue(returnedAgent2.equals(noAgent));
719-
}
720-
713+
Assert.assertTrue(lrsResponse2.getSuccess());
714+
Assert.assertTrue(lrsResponse2.getResponse().getStatus() == 200);
715+
716+
Agent returnedAgent2 = lrsResponse2.getContent().getAgent();
717+
// 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
718+
Assert.assertTrue(returnedAgent2.equals(noAgent));
719+
}
720+
721721
@Test
722722
public void testRetrieveAgentProfileIds() throws Exception {
723723
ProfileKeysLRSResponse lrsRes = lrs.retrieveAgentProfileIds(agent);

0 commit comments

Comments
 (0)