You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by dd...@apache.org on 2013/01/31 15:57:21 UTC
svn commit: r1441000 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/
main/java/org/apache/shindig/gadgets/servlet/
main/java/org/apache/shindig/gadgets/variables/
test/java/org/apache/shindig/gadgets/variables/
Author: ddumont
Date: Thu Jan 31 14:57:21 2013
New Revision: 1441000
URL: http://svn.apache.org/viewvc?rev=1441000&view=rev
Log:
SHINDIG-1897 - GadgetContext and SecurityToken have different definitions of module ID
Committed for Marshall Shi
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/ModuleSubstituter.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/ModuleSubstituterTest.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java?rev=1441000&r1=1440999&r2=1441000&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java Thu Jan 31 14:57:21 2013
@@ -60,7 +60,7 @@ public class GadgetContext {
/**
* @return The module id for this request.
*/
- public int getModuleId() {
+ public long getModuleId() {
return delegate == null ? 0 : delegate.getModuleId();
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java?rev=1441000&r1=1440999&r2=1441000&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java Thu Jan 31 14:57:21 2013
@@ -495,7 +495,7 @@ public class GadgetsHandlerService {
}
@Override
- public int getModuleId() {
+ public long getModuleId() {
return 1;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java?rev=1441000&r1=1440999&r2=1441000&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java Thu Jan 31 14:57:21 2013
@@ -113,7 +113,7 @@ public class HttpGadgetContext extends G
}
@Override
- public int getModuleId() {
+ public long getModuleId() {
return moduleId == null ? super.getModuleId() : moduleId;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java?rev=1441000&r1=1440999&r2=1441000&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java Thu Jan 31 14:57:21 2013
@@ -43,7 +43,7 @@ public class JsonRpcGadgetContext extend
private final Boolean debug;
private final Boolean ignoreCache;
private final Locale locale;
- private final Integer moduleId;
+ private final Long moduleId;
private final Uri url;
private final UserPrefs userPrefs;
private final String view;
@@ -91,7 +91,7 @@ public class JsonRpcGadgetContext extend
return locale == null ? super.getLocale() : locale;
}
@Override
- public int getModuleId() {
+ public long getModuleId() {
return moduleId == null ? super.getModuleId() : moduleId;
}
@@ -132,9 +132,9 @@ public class JsonRpcGadgetContext extend
* @return module id from the request, or null if not present
* @throws JSONException
*/
- private static Integer getModuleId(JSONObject json) throws JSONException {
+ private static Long getModuleId(JSONObject json) throws JSONException {
if (json.has("moduleId")) {
- return Integer.valueOf(json.getInt("moduleId"));
+ return Long.valueOf(json.getLong("moduleId"));
}
return null;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/ModuleSubstituter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/ModuleSubstituter.java?rev=1441000&r1=1440999&r2=1441000&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/ModuleSubstituter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/ModuleSubstituter.java Thu Jan 31 14:57:21 2013
@@ -30,6 +30,6 @@ import org.apache.shindig.gadgets.spec.G
public class ModuleSubstituter implements Substituter {
public void addSubstitutions(Substitutions substituter, GadgetContext context, GadgetSpec spec)
throws GadgetException {
- substituter.addSubstitution(Substitutions.Type.MODULE, "ID", Integer.toString(context.getModuleId()));
+ substituter.addSubstitution(Substitutions.Type.MODULE, "ID", Long.toString(context.getModuleId()));
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/ModuleSubstituterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/ModuleSubstituterTest.java?rev=1441000&r1=1440999&r2=1441000&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/ModuleSubstituterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/ModuleSubstituterTest.java Thu Jan 31 14:57:21 2013
@@ -46,17 +46,17 @@ public class ModuleSubstituterTest exten
@Test
public void testSpecific() throws Exception {
- final int moduleId = 12345678;
+ final long moduleId = 12345678L;
ModuleSubstituter substituter = new ModuleSubstituter();
substituter.addSubstitutions(substitutions, new GadgetContext() {
@Override
- public int getModuleId() {
+ public long getModuleId() {
return moduleId;
}
}, spec);
- assertEquals(Integer.toString(moduleId),
+ assertEquals(Long.toString(moduleId),
substitutions.getSubstitution(Type.MODULE, "ID"));
}
}