svn commit: r1297157 - in /shindig/trunk/java/common/src: main/java/org/apache/shindig/auth/ test/java/org/apache/shindig/auth/

[hsaputra]

Author: hsaputra
Date: Mon Mar  5 18:43:46 2012
New Revision: 1297157

URL: http://svn.apache.org/viewvc?rev=1297157&view=rev
Log:
SHINDIG-1719 Remove throwing UnsupportedOperationException with call to 
BlobCrypterSecurityToken.getActiveUrl and BasicSecurityToken.getActiveUrl. CR: 
https://reviews.apache.org/r/4135.

Modified:
    
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
    
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityToken.java
    
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java
    
shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java

Modified: 
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java?rev=1297157&r1=1297156&r2=1297157&view=diff
==============================================================================
--- 
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
 (original)
+++ 
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
 Mon Mar  5 18:43:46 2012
@@ -48,14 +48,6 @@ public class BasicSecurityToken extends 
     return false;
   }
 
-  public String getActiveUrl() {
-    String activeUrl = super.getActiveUrl();
-    if (activeUrl == null) {
-      throw new UnsupportedOperationException("No active URL available");
-    }
-    return activeUrl;
-  }
-
   /* (non-Javadoc)
    * @see org.apache.shindig.auth.AbstractSecurityToken#getSupportedKeys()
    *

Modified: 
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityToken.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityToken.java?rev=1297157&r1=1297156&r2=1297157&view=diff
==============================================================================
--- 
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityToken.java
 (original)
+++ 
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityToken.java
 Mon Mar  5 18:43:46 2012
@@ -60,14 +60,6 @@ public class BlobCrypterSecurityToken ex
     return false;
   }
 
-  public String getActiveUrl() {
-    String activeUrl = super.getActiveUrl();
-    if (activeUrl == null) {
-      throw new UnsupportedOperationException("No active URL available");
-    }
-    return activeUrl;
-  }
-
   // Legacy value for signed fetch, opensocial 0.8 prefers opensocial_app_url
   @Override
   public String getAppId() {
@@ -79,13 +71,8 @@ public class BlobCrypterSecurityToken ex
   }
 
   public static BlobCrypterSecurityToken fromToken(SecurityToken token) {
-    String activeUrl = null;
-    try {
-      activeUrl = token.getActiveUrl();
-    } catch (UnsupportedOperationException e) {}
-
-    BlobCrypterSecurityToken interpretedToken = new BlobCrypterSecurityToken(
-        token.getContainer(), token.getDomain(), activeUrl, null);
+    BlobCrypterSecurityToken interpretedToken = new 
BlobCrypterSecurityToken(token.getContainer(),
+        token.getDomain(), token.getActiveUrl(), null);
     interpretedToken
         .setAppId(token.getAppId())
         .setAppUrl(token.getAppUrl())

Modified: 
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java?rev=1297157&r1=1297156&r2=1297157&view=diff
==============================================================================
--- 
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java
 (original)
+++ 
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java
 Mon Mar  5 18:43:46 2012
@@ -94,13 +94,12 @@ public interface SecurityToken {
   boolean isAnonymous();
 
   /**
-   * @return the URL being used by the current request
+   * @return the URL being used by the current request and null if not 
specified.
    *
    * The returned URL must contain at least protocol, host, and port.
    *
    * The returned URL may contain path or query parameters.
    *
-   * @throws UnsupportedOperationException if the URL is not available.
    */
   String getActiveUrl();
 }

Modified: 
shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java?rev=1297157&r1=1297156&r2=1297157&view=diff
==============================================================================
--- 
shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java
 (original)
+++ 
shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenTest.java
 Mon Mar  5 18:43:46 2012
@@ -50,7 +50,7 @@ public class BlobCrypterSecurityTokenTes
     crypter.timeSource = timeSource;
   }
 
-  @Test(expected=UnsupportedOperationException.class)
+  @Test
   public void testNullValues() throws Exception {
     BlobCrypterSecurityToken t = new BlobCrypterSecurityToken(CONTAINER, 
DOMAIN, null, null);
     String token = t.getContainer() + ":" + crypter.wrap(t.toMap());
@@ -67,9 +67,7 @@ public class BlobCrypterSecurityTokenTes
     assertNull(t2.getTrustedJson(), t2.getTrustedJson());
     assertNull(t2.getUpdatedToken(), t2.getUpdatedToken());
     assertEquals(CONTAINER, t2.getContainer());
-
-    // expect an exception
-    t2.getActiveUrl();
+    assertNull(t2.getActiveUrl(), t2.getActiveUrl());
   }
 
   @Test