svn commit: r659582 - in /incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera: AbstractSocialEntityCollectionAdapter.java ActivityAdapter.java PersonAdapter.java

[doll]

Author: doll
Date: Fri May 23 09:18:18 2008
New Revision: 659582

URL: http://svn.apache.org/viewvc?rev=659582&view=rev
Log:
Refactored out a new static getUrlTemplate method that removes some duplicate 
code. This should probably be pulled into a utility class at some point. 


Modified:
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/AbstractSocialEntityCollectionAdapter.java
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivityAdapter.java
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/PersonAdapter.java

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/AbstractSocialEntityCollectionAdapter.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/AbstractSocialEntityCollectionAdapter.java?rev=659582&r1=659581&r2=659582&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/AbstractSocialEntityCollectionAdapter.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/AbstractSocialEntityCollectionAdapter.java
 Fri May 23 09:18:18 2008
@@ -200,7 +200,7 @@
    * @param request Abdera's RequestContext
    * @return The Route object that matched the request.
    */
-  public Route getRoute(RequestContext request) {
+  public static Route getRoute(RequestContext request) {
     Object matcher = request.getTarget().getMatcher();
     if (matcher instanceof Route) {
       return (Route) matcher;
@@ -209,6 +209,12 @@
     }
   }
 
+  // TODO: We should probably move the static methods here into a helper class
+  public static RequestUrlTemplate getUrlTemplate(RequestContext request) {
+    String routeName = getRoute(request).getName();
+    return RequestUrlTemplate.getValue(routeName);
+  }
+
   @Override
   public Object getContent(T entity, RequestContext request)
       throws ResponseContextException {

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivityAdapter.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivityAdapter.java?rev=659582&r1=659581&r2=659582&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivityAdapter.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivityAdapter.java
 Fri May 23 09:18:18 2008
@@ -170,9 +170,8 @@
   public Iterable<Activity> getEntries(RequestContext request)
       throws ResponseContextException {
     String uid = request.getTarget().getParameter("uid");
-    String routeName = getRoute(request).getName();
     List<String> ids = new ArrayList<String>();
-    switch (RequestUrlTemplate.getValue(routeName)) {
+    switch (getUrlTemplate(request)) {
       case ACTIVITIES_OF_USER :
         ids.add(uid);
         break;

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/PersonAdapter.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/PersonAdapter.java?rev=659582&r1=659581&r2=659582&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/PersonAdapter.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/PersonAdapter.java
 Fri May 23 09:18:18 2008
@@ -27,7 +27,6 @@
 import org.apache.abdera.protocol.server.RequestContext;
 import org.apache.abdera.protocol.server.context.ResponseContextException;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -68,8 +67,7 @@
    */
   @Override
   protected String getResourceName(RequestContext request) {
-    String routeName = getRoute(request).getName();
-    switch (RequestUrlTemplate.getValue(routeName)) {
+    switch (getUrlTemplate(request)) {
       case PROFILE_OF_CONNECTION_OF_USER:
         // TODO: Improve the service apis so we can get rid of relational code.
         for (String cid : getConnectionIds(request, request.getTarget()
@@ -185,9 +183,8 @@
   public Iterable<Person> getEntries(RequestContext request)
       throws ResponseContextException {
     String uid = request.getTarget().getParameter("uid");
-    String routeName = getRoute(request).getName();
-    List<String> ids = new ArrayList<String>();
-    switch (RequestUrlTemplate.getValue(routeName)) {
+    List<String> ids;
+    switch (getUrlTemplate(request)) {
       case PROFILES_OF_CONNECTIONS_OF_USER :
         ids = getConnectionIds(request, uid);
         break;