One more rename for methods retrieveActivity and retrievePerson

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

@@ -41,14 +41,14 @@ public interface LRS {
     LRSResponse deleteState(StateDocument state);
     LRSResponse clearState(Activity activity, Agent agent, UUID registration);
 
-    ActivityProfileLRSResponse retrieveFullActivity(Activity activity);
+    ActivityProfileLRSResponse retrieveActivity(Activity activity);
     ProfileKeysLRSResponse retrieveActivityProfileIds(Activity activity);
     ActivityProfileLRSResponse retrieveActivityProfile(String id, Activity activity);
     LRSResponse saveActivityProfile(ActivityProfileDocument profile);
     LRSResponse updateActivityProfile(ActivityProfileDocument profile);
     LRSResponse deleteActivityProfile(ActivityProfileDocument profile);
 
-    AgentProfileLRSResponse retrieveCombinedPerson(Agent agent);
+    AgentProfileLRSResponse retrievePerson(Agent agent);
     ProfileKeysLRSResponse retrieveAgentProfileIds(Agent agent);
     AgentProfileLRSResponse retrieveAgentProfile(String id, Agent agent);
     LRSResponse saveAgentProfile(AgentProfileDocument profile);

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

@@ -697,7 +697,7 @@ public LRSResponse clearState(Activity activity, Agent agent, UUID registration)
     }
 
     @Override
-    public ActivityProfileLRSResponse retrieveFullActivity(Activity activity) {
+    public ActivityProfileLRSResponse retrieveActivity(Activity activity) {
     	HashMap<String, String> queryParams = new HashMap<String, String>();
     	queryParams.put("activityId", activity.getId().toString());
     	ActivityProfileDocument profileDocument = new ActivityProfileDocument();
@@ -776,7 +776,7 @@ public LRSResponse deleteActivityProfile(ActivityProfileDocument profile) {
     }
 
     @Override
-    public AgentProfileLRSResponse retrieveCombinedPerson(Agent agent) {
+    public AgentProfileLRSResponse retrievePerson(Agent agent) {
     	HashMap<String, String> queryParams = new HashMap<String, String>();
     	queryParams.put("agent", agent.toJSON(TCAPIVersion.V100));
     	AgentProfileDocument profileDocument = new AgentProfileDocument();

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

@@ -523,8 +523,8 @@ public void testClearState() throws Exception {
     }
 
     @Test
-    public void testRetrieveFullActivity() throws Exception {
-        ActivityProfileLRSResponse lrsResponse = lrs.retrieveFullActivity(activity);
+    public void testRetrieveActivity() throws Exception {
+        ActivityProfileLRSResponse lrsResponse = lrs.retrieveActivity(activity);
     	Assert.assertTrue(lrsResponse.getSuccess());
 
     	ActivityProfileDocument returnedDoc = lrsResponse.getContent();
@@ -536,7 +536,7 @@ public void testRetrieveFullActivity() throws Exception {
     	Activity noActivity = new Activity();
     	noActivity.setId("https://brindlewaye.com/xAPITerms/Activity/NeverGonnaHappen/");
 
-        ActivityProfileLRSResponse lrsResponse2 = lrs.retrieveFullActivity(noActivity);
+        ActivityProfileLRSResponse lrsResponse2 = lrs.retrieveActivity(noActivity);
         // Report success even though response status was 404
     	Assert.assertTrue(lrsResponse2.getSuccess());
     	Assert.assertTrue(lrsResponse2.getResponse().getStatus() == 404);
@@ -695,8 +695,8 @@ public void testDeleteActivityProfile() throws Exception {
     }
 
     @Test
-    public void testRetrieveCombinedPerson() throws Exception {
-        AgentProfileLRSResponse lrsResponse = lrs.retrieveCombinedPerson(agent);
+    public void testRetrievePerson() throws Exception {
+        AgentProfileLRSResponse lrsResponse = lrs.retrievePerson(agent);
     	Assert.assertTrue(lrsResponse.getSuccess());
 
     	AgentProfileDocument returnedDoc = lrsResponse.getContent();
@@ -709,7 +709,7 @@ public void testRetrieveCombinedPerson() throws Exception {
     	noAgent.setMbox("mailto:[email protected]");
     	noAgent.setName("No One");
 
-        AgentProfileLRSResponse lrsResponse2 = lrs.retrieveCombinedPerson(noAgent);
+        AgentProfileLRSResponse lrsResponse2 = lrs.retrievePerson(noAgent);
     	Assert.assertTrue(lrsResponse2.getSuccess());
     	Assert.assertTrue(lrsResponse2.getResponse().getStatus() == 200);