svn commit: r1514560 - in /shindig/branches/2.5.0-updateX/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence: MapCache.java sample/JSONOAuth2Persister.java

[rbaxter85]

Author: rbaxter85
Date: Fri Aug 16 02:01:42 2013
New Revision: 1514560

URL: http://svn.apache.org/r1514560
Log:
Adjust scope of methods to make them easier to extend

Modified:
    
shindig/branches/2.5.0-updateX/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/MapCache.java
    
shindig/branches/2.5.0-updateX/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java

Modified: 
shindig/branches/2.5.0-updateX/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/MapCache.java
URL: 
http://svn.apache.org/viewvc/shindig/branches/2.5.0-updateX/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/MapCache.java?rev=1514560&r1=1514559&r2=1514560&view=diff
==============================================================================
--- 
shindig/branches/2.5.0-updateX/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/MapCache.java
 (original)
+++ 
shindig/branches/2.5.0-updateX/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/MapCache.java
 Fri Aug 16 02:01:42 2013
@@ -167,18 +167,13 @@ public abstract class MapCache implement
             state.getScope());
   }
 
-  private String getAccessorKey(final String gadgetUri, final String 
serviceName,
+  protected String getAccessorKey(final String gadgetUri, final String 
serviceName,
           final String user, final String scope) {
     if (gadgetUri == null || serviceName == null || user == null) {
       return null;
     }
 
-    final String s;
-    if (scope == null) {
-      s = "";
-    } else {
-      s = scope;
-    }
+    final String s = scope == null ? "" : scope;
 
     final StringBuilder buf = new StringBuilder(gadgetUri.length() + 
serviceName.length()
             + user.length() + s.length() + 3);

Modified: 
shindig/branches/2.5.0-updateX/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java
URL: 
http://svn.apache.org/viewvc/shindig/branches/2.5.0-updateX/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java?rev=1514560&r1=1514559&r2=1514560&view=diff
==============================================================================
--- 
shindig/branches/2.5.0-updateX/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java
 (original)
+++ 
shindig/branches/2.5.0-updateX/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java
 Fri Aug 16 02:01:42 2013
@@ -250,7 +250,7 @@ public class JSONOAuth2Persister impleme
     return ret;
   }
 
-  private Map<String, OAuth2GadgetBinding> loadGadgetBindings() throws 
OAuth2PersistenceException {
+  protected Map<String, OAuth2GadgetBinding> loadGadgetBindings() throws 
OAuth2PersistenceException {
     final Map<String, OAuth2GadgetBinding> ret = Maps.newHashMap();
 
     try {
@@ -291,7 +291,7 @@ public class JSONOAuth2Persister impleme
     return ret;
   }
 
-  private Map<String, OAuth2Provider> loadProviders() throws 
OAuth2PersistenceException {
+  protected Map<String, OAuth2Provider> loadProviders() throws 
OAuth2PersistenceException {
     final Map<String, OAuth2Provider> ret = Maps.newHashMap();
 
     try {