svn commit: r674907 - in /incubator/shindig/trunk/java/social-api/src: main/java/org/apache/shindig/social/canonical/JsonDbOpensocialService.java test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java

[lr...@apache.org]

Author: lryan
Date: Tue Jul  8 11:11:03 2008
New Revision: 674907

URL: http://svn.apache.org/viewvc?rev=674907&view=rev
Log:
Renamed version of troubled files

Added:
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonDbOpensocialService.java
      - copied, changed from r674702, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonOpensocialService.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java
      - copied, changed from r674702, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonOpensocialServiceTest.java

Copied: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonDbOpensocialService.java (from r674702, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonOpensocialService.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonDbOpensocialService.java?p2=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonDbOpensocialService.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonOpensocialService.java&r1=674702&r2=674907&rev=674907&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonOpensocialService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/canonical/JsonDbOpensocialService.java Tue Jul  8 11:11:03 2008
@@ -51,7 +51,7 @@
 /**
  * Implementation of supported services backed by a JSON DB
  */
-public class JsonOpensocialService implements ActivityService, PersonService, AppDataService {
+public class JsonDbOpensocialService implements ActivityService, PersonService, AppDataService {
 
   /**
    * The DB
@@ -84,7 +84,7 @@
   private static final String FRIEND_LINK_TABLE = "friendLinks";
 
   @Inject
-  public JsonOpensocialService(@Named("canonical.json.db")String jsonLocation,
+  public JsonDbOpensocialService(@Named("canonical.json.db")String jsonLocation,
       BeanConverter converter) throws Exception {
     String content = IOUtils.toString(ResourceLoader.openResource(jsonLocation), "UTF-8");
     this.db = new JSONObject(content);
@@ -353,4 +353,4 @@
     }
     return converter.convertToObject(object.toString(), Person.class);
   }
-}
+}
\ No newline at end of file

Copied: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java (from r674702, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonOpensocialServiceTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonOpensocialServiceTest.java&r1=674702&r2=674907&rev=674907&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonOpensocialServiceTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java Tue Jul  8 11:11:03 2008
@@ -40,9 +40,9 @@
 /**
  * Test the JSONOpensocialService
  */
-public class JsonOpensocialServiceTest extends TestCase {
+public class JsonDbOpensocialServiceTest extends TestCase {
 
-  private JsonOpensocialService db;
+  private JsonDbOpensocialService db;
 
   private static final UserId CANON_USER = new UserId(UserId.Type.userId, "canonical");
   private static final GroupId SELF_GROUP = new GroupId(GroupId.Type.self, null);
@@ -56,7 +56,7 @@
   protected void setUp() throws Exception {
     BeanJsonConverter beanJsonConverter = new BeanJsonConverter(
         Guice.createInjector(new SocialApiTestsGuiceModule()));
-    db = new JsonOpensocialService(
+    db = new JsonDbOpensocialService(
         "sampledata/canonicaldb.json",
         beanJsonConverter);
   }
@@ -92,7 +92,7 @@
   public void testGetExpectedActivities() throws Exception {
     ResponseItem<RestfulCollection<Activity>> responseItem = db.getActivities(
         CANON_USER, SELF_GROUP, APP_ID, null, new FakeGadgetToken());
-    assertTrue(responseItem.getResponse().getTotalResults() == 2);    
+    assertTrue(responseItem.getResponse().getTotalResults() == 2);
   }
 
   public void testGetExpectedActivity() throws Exception {
@@ -161,4 +161,4 @@
     assertTrue(
         responseItem.getResponse().getEntry().get(CANONICAL_USER_ID).get("newvalue").equals("20"));
   }
-}
+}
\ No newline at end of file