You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ss...@apache.org on 2012/02/27 00:43:33 UTC
svn commit: r1293966 [3/12] - in /shindig/trunk:
extras/src/main/java/org/apache/shindig/extras/
java/common/src/main/java/org/apache/shindig/auth/
java/common/src/main/java/org/apache/shindig/common/
java/common/src/main/java/org/apache/shindig/common...
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java Sun Feb 26 23:43:20 2012
@@ -29,14 +29,14 @@ import org.junit.Ignore;
import org.junit.Test;
public class JasperExpressionsTest extends ExpressionsTest{
-
+
@Before
@Override
public void setUp() {
super.setUp();
expressions = new Expressions(null, null, new JasperTypeConverter(), new JasperProvider());
}
-
+
@Ignore
@Test
public void booleanCoercionOfStringsFails() throws Exception{
@@ -44,12 +44,12 @@ public class JasperExpressionsTest exte
// Test fails because Jasper type conversion routines does not recognize FALSE.
addVariable("bool", "FALSE");
assertFalse(evaluate("${!bool}", Boolean.class));
-
+
// Jasper cannot handle this
addVariable("bool", "booga");
assertFalse(evaluate("${!bool}", Boolean.class));
}
-
+
@Ignore
@Test
public void booleanCoercionOfNumbersFails() throws Exception {
@@ -63,5 +63,5 @@ public class JasperExpressionsTest exte
evaluate("${true && 5}", String.class);
}
-
+
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java Sun Feb 26 23:43:20 2012
@@ -70,7 +70,7 @@ public class DataServiceServletTest exte
ContentTypes.OUTPUT_XML_CONTENT_TYPE).anyTimes();
EasyMock.expect(atomConverter.getContentType()).andReturn(
ContentTypes.OUTPUT_ATOM_CONTENT_TYPE).anyTimes();
-
+
HandlerRegistry registry = new DefaultHandlerRegistry(null, jsonConverter,
new HandlerExecutionListener.NoOpHandler());
registry.addHandlers(Sets.<Object>newHashSet(new TestHandler()));
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/JsonRpcServletTest.java Sun Feb 26 23:43:20 2012
@@ -253,7 +253,7 @@ public class JsonRpcServletTest extends
/**
* Test that "request" field undergoes contentType check, and error is thrown if wrong content
- * type is present.
+ * type is present.
*/
@Test
public void testPostMultipartFormDataRequestFieldIsSubjectedToContentTypeCheck()
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/TestHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/TestHandler.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/TestHandler.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/TestHandler.java Sun Feb 26 23:43:20 2012
@@ -104,7 +104,7 @@ public class TestHandler {
throw new NullPointerException(FAILURE_MESSAGE);
}
}
-
+
@Operation(httpMethods = "GET", path = "/echo")
public String echo(Input input) {
return ECHO_PREFIX + input.value;
@@ -115,7 +115,7 @@ public class TestHandler {
public String value;
public void setValue(String value) { this.value = value; }
}
-
+
@Operation(httpMethods = "")
public String noArg() {
return NO_ARG_RESPONSE;
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterInjectedClassTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterInjectedClassTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterInjectedClassTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterInjectedClassTest.java Sun Feb 26 23:43:20 2012
@@ -28,7 +28,7 @@ import org.junit.Test;
* The Class BeanJsonConverterInjectedClassTest.
*/
public class BeanJsonConverterInjectedClassTest extends Assert {
-
+
/** The bean json converter. */
private BeanJsonConverter beanJsonConverter;
@@ -36,10 +36,10 @@ public class BeanJsonConverterInjectedCl
public void setUp() throws Exception {
this.beanJsonConverter = new BeanJsonConverter(Guice.createInjector(new TestModule()));
}
-
+
/**
* Test json conversion of a TestInterface into a TestObject
- *
+ *
* @throws Exception the exception
*/
@Test
@@ -49,25 +49,25 @@ public class BeanJsonConverterInjectedCl
assertNotNull("expected 'x' field not set after json conversion", object.getX());
assertNotNull("expected 'y' field not set after json conversion", object.getY());
}
-
+
/**
* TestModule that binds TestObject to TestInterface
*/
- private static class TestModule extends AbstractModule {
+ private static class TestModule extends AbstractModule {
/* (non-Javadoc)
* @see com.google.inject.AbstractModule#configure()
*/
@Override
protected void configure() {
bind(TestInterface.class).to(TestObject.class);
- }
+ }
}
-
+
/**
* TestInterface.
*/
- public interface TestInterface {
- String getX();
+ public interface TestInterface {
+ String getX();
void setX(String x);
}
@@ -75,23 +75,23 @@ public class BeanJsonConverterInjectedCl
* TestObject.
*/
public static class TestObject implements TestInterface {
-
- private String x;
+
+ private String x;
private String y;
-
+
public String getX() {
return x;
- }
+ }
public void setX(String x) {
this.x = x;
}
-
+
public String getY() {
return y;
- }
+ }
public void setY(String y) {
this.y = y;
- }
+ }
}
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java Sun Feb 26 23:43:20 2012
@@ -183,7 +183,7 @@ public class BeanJsonConverterTest exten
@Test
public void testEmptyJsonMap() throws Exception {
String emptyMap = "{}";
- Map<String, String> data = beanJsonConverter.convertToObject(emptyMap,
+ Map<String, String> data = beanJsonConverter.convertToObject(emptyMap,
new TypeLiteral<Map<String,String>>(){}.getType());
assertTrue(data.isEmpty());
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParserTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParserTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParserTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParserTest.java Sun Feb 26 23:43:20 2012
@@ -34,20 +34,20 @@ public class DefaultMultipartFormParserT
private static final String REQUEST_FIELDNAME = "request";
private static final String REQUEST_DATA = "{name: 'HelloWorld'}";
-
+
private static final String ALBUM_IMAGE_FIELDNAME = "album-image";
private static final String ALBUM_IMAGE_FILENAME = "album-image.jpg";
private static final String ALBUM_IMAGE_DATA = "album image data";
private static final String ALBUM_IMAGE_TYPE = "image/jpeg";
-
+
private static final String PROFILE_IMAGE_FIELDNAME = "profile-image";
private static final String PROFILE_IMAGE_FILENAME = "profile-image.jpg";
private static final String PROFILE_IMAGE_DATA = "profile image data";
private static final String PROFILE_IMAGE_TYPE = "image/png";
-
+
private MultipartFormParser multipartFormParser;
private HttpServletRequest request;
-
+
@Before
public void setUp() throws Exception {
multipartFormParser = new DefaultMultipartFormParser();
@@ -61,19 +61,19 @@ public class DefaultMultipartFormParserT
public void testIsMultipartContent() {
FakeHttpServletRequest request = new FakeHttpServletRequest();
- request.setMethod("GET");
+ request.setMethod("GET");
assertFalse(multipartFormParser.isMultipartContent(request));
request.setMethod("POST");
assertFalse(multipartFormParser.isMultipartContent(request));
-
+
request.setContentType("multipart/form-data");
- assertTrue(multipartFormParser.isMultipartContent(request));
+ assertTrue(multipartFormParser.isMultipartContent(request));
- request.setMethod("GET");
+ request.setMethod("GET");
assertFalse(multipartFormParser.isMultipartContent(request));
}
-
+
/**
* Helper class to create the multipart/form-data body of the POST request.
*/
@@ -81,26 +81,26 @@ public class DefaultMultipartFormParserT
private final String boundary;
private final StringBuilder packet = new StringBuilder();
private static final String BOUNDARY = "--abcdefgh";
-
+
public MultipartFormBuilder() {
this(BOUNDARY);
}
-
+
public MultipartFormBuilder(String boundary) {
this.boundary = boundary;
}
-
+
public String getContentType() {
return "multipart/form-data; boundary=" + boundary;
}
-
+
public byte[] build() {
write("--");
write(boundary);
write("--");
return packet.toString().getBytes();
}
-
+
public void addFileItem(String fieldName, String fileName, String content,
String contentType) {
writeBoundary();
@@ -144,7 +144,7 @@ public class DefaultMultipartFormParserT
private void setupRequest(byte[] postData, String contentType) throws IOException {
FakeHttpServletRequest fakeReq = new FakeHttpServletRequest("/social/rest", "", "");
- fakeReq.setPostData(postData);
+ fakeReq.setPostData(postData);
fakeReq.setContentType(contentType);
request = fakeReq;
}
@@ -158,14 +158,14 @@ public class DefaultMultipartFormParserT
List<FormDataItem> formItems =
Lists.newArrayList(multipartFormParser.parse(request));
-
+
assertEquals(1, formItems.size());
FormDataItem formItem = formItems.get(0);
assertFalse(formItem.isFormField());
assertEquals(ALBUM_IMAGE_FIELDNAME, formItem.getFieldName());
assertEquals(ALBUM_IMAGE_FILENAME, formItem.getName());
assertEquals(ALBUM_IMAGE_TYPE, formItem.getContentType());
- assertEquals(ALBUM_IMAGE_DATA, new String(formItem.get()));
+ assertEquals(ALBUM_IMAGE_DATA, new String(formItem.get()));
}
@Test
@@ -176,7 +176,7 @@ public class DefaultMultipartFormParserT
List<FormDataItem> formItems =
Lists.newArrayList(multipartFormParser.parse(request));
-
+
assertEquals(1, formItems.size());
FormDataItem formItem = formItems.get(0);
assertTrue(formItem.isFormField());
@@ -194,14 +194,14 @@ public class DefaultMultipartFormParserT
List<FormDataItem> formItems =
Lists.newArrayList(multipartFormParser.parse(request));
-
+
assertEquals(2, formItems.size());
FormDataItem formItem = formItems.get(0);
assertFalse(formItem.isFormField());
assertEquals(ALBUM_IMAGE_FIELDNAME, formItem.getFieldName());
assertEquals(ALBUM_IMAGE_FILENAME, formItem.getName());
assertEquals(ALBUM_IMAGE_TYPE, formItem.getContentType());
- assertEquals(ALBUM_IMAGE_DATA, new String(formItem.get()));
+ assertEquals(ALBUM_IMAGE_DATA, new String(formItem.get()));
formItem = formItems.get(1);
assertTrue(formItem.isFormField());
@@ -221,25 +221,25 @@ public class DefaultMultipartFormParserT
List<FormDataItem> formItems =
Lists.newArrayList(multipartFormParser.parse(request));
-
+
assertEquals(3, formItems.size());
FormDataItem formItem = formItems.get(0);
assertFalse(formItem.isFormField());
assertEquals(ALBUM_IMAGE_FIELDNAME, formItem.getFieldName());
assertEquals(ALBUM_IMAGE_FILENAME, formItem.getName());
assertEquals(ALBUM_IMAGE_TYPE, formItem.getContentType());
- assertEquals(ALBUM_IMAGE_DATA, new String(formItem.get()));
+ assertEquals(ALBUM_IMAGE_DATA, new String(formItem.get()));
formItem = formItems.get(1);
assertTrue(formItem.isFormField());
assertEquals(REQUEST_FIELDNAME, formItem.getFieldName());
assertEquals(REQUEST_DATA, new String(formItem.get()));
-
+
formItem = formItems.get(2);
assertFalse(formItem.isFormField());
assertEquals(PROFILE_IMAGE_FIELDNAME, formItem.getFieldName());
assertEquals(PROFILE_IMAGE_FILENAME, formItem.getName());
assertEquals(PROFILE_IMAGE_TYPE, formItem.getContentType());
- assertEquals(PROFILE_IMAGE_DATA, new String(formItem.get()));
+ assertEquals(PROFILE_IMAGE_DATA, new String(formItem.get()));
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractSpecFactory.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractSpecFactory.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractSpecFactory.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractSpecFactory.java Sun Feb 26 23:43:20 2012
@@ -133,7 +133,7 @@ public abstract class AbstractSpecFactor
if (response.getHttpStatusCode() != HttpResponse.SC_OK) {
int retcode = response.getHttpStatusCode();
if (retcode == HttpResponse.SC_INTERNAL_SERVER_ERROR) {
- // Convert external "internal error" to gateway error:
+ // Convert external "internal error" to gateway error:
retcode = HttpResponse.SC_BAD_GATEWAY;
}
throw new GadgetException(GadgetException.Code.FAILED_TO_RETRIEVE_CONTENT,
@@ -232,7 +232,7 @@ public abstract class AbstractSpecFactor
}
}
}
-
+
protected static class SpecRetrievalFailedException extends GadgetException {
SpecRetrievalFailedException(Uri specUri, int code) {
super(GadgetException.Code.FAILED_TO_RETRIEVE_CONTENT,
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java Sun Feb 26 23:43:20 2012
@@ -62,7 +62,7 @@ public class DefaultGadgetSpecFactory ex
// Set URI to a fixed, safe value (localhost), preventing a gadget rendered
// via raw XML (eg. via POST) to be rendered on a locked domain of any other
// gadget whose spec is hosted non-locally.
- try
+ try
{
Uri uri = RAW_GADGET_URI;
return new GadgetSpec(uri, XmlUtil.parse(rawxml), rawxml);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java Sun Feb 26 23:43:20 2012
@@ -29,7 +29,7 @@ public interface FeedProcessor {
/**
* Converts feed XML to JSON.
- *
+ *
* @param feedUrl
* The url that the feed was retrieved from.
* @param feedXml
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java Sun Feb 26 23:43:20 2012
@@ -169,28 +169,28 @@ public class Gadget {
}
}
}
-
+
public void addFeature(String name) {
initializeFeatureDeps();
directFeatureDeps.add(name);
}
-
+
public void removeFeature(String name) {
initializeFeatureDeps();
directFeatureDeps.remove(name);
}
-
+
public Set<String> getDirectFeatureDeps() {
initializeFeatureDeps();
return Collections.unmodifiableSet(directFeatureDeps);
}
-
+
/**
* Convenience method that returns Map of features to load for gadget's current view
- *
+ *
* @return a map of ModuleSpec/Require and ModuleSpec/Optional elements to Feature
*/
- public Map<String, Feature> getViewFeatures() {
+ public Map<String, Feature> getViewFeatures() {
View view = getCurrentView();
String name = (view == null) ? GadgetSpec.DEFAULT_VIEW : view.getName();
@@ -206,7 +206,7 @@ public class Gadget {
getCurrentView().getType() == View.ContentType.HTML_SANITIZED) ||
"1".equals(getContext().getParameter(UriCommon.Param.SANITIZE.getKey()));
}
-
+
/**
* True if the gadget opts into caja or the container forces caja
*/
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetELResolver.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetELResolver.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetELResolver.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetELResolver.java Sun Feb 26 23:43:20 2012
@@ -40,7 +40,7 @@ import com.google.common.collect.Immutab
public class GadgetELResolver extends ELResolver {
public static final String USER_PREFS_PROPERTY = "UserPrefs";
public static final String VIEW_PARAMS_PROPERTY = "ViewParams";
-
+
private final GadgetContext gadgetContext;
public GadgetELResolver(GadgetContext context) {
@@ -52,7 +52,7 @@ public class GadgetELResolver extends EL
if (base == null) {
return String.class;
}
-
+
return null;
}
@@ -73,7 +73,7 @@ public class GadgetELResolver extends EL
return Map.class;
}
}
-
+
return null;
}
@@ -101,7 +101,7 @@ public class GadgetELResolver extends EL
return gadgetContext.getUserPrefs().getPrefs();
}
}
-
+
return null;
}
@@ -109,10 +109,10 @@ public class GadgetELResolver extends EL
public boolean isReadOnly(ELContext context, Object base, Object property) {
if ((base == null) &&
(VIEW_PARAMS_PROPERTY.equals(property)
- || USER_PREFS_PROPERTY.equals(property))) {
+ || USER_PREFS_PROPERTY.equals(property))) {
context.setPropertyResolved(true);
}
-
+
return true;
}
@@ -120,7 +120,7 @@ public class GadgetELResolver extends EL
public void setValue(ELContext context, Object base, Object property, Object value) {
if ((base == null) &&
(VIEW_PARAMS_PROPERTY.equals(property)
- || USER_PREFS_PROPERTY.equals(property))) {
+ || USER_PREFS_PROPERTY.equals(property))) {
throw new PropertyNotWritableException("Cannot override " + property);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigContributorModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigContributorModule.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigContributorModule.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigContributorModule.java Sun Feb 26 23:43:20 2012
@@ -39,5 +39,5 @@ public class DefaultConfigContributorMod
configBinder.addBinding("shindig.auth").to(ShindigAuthConfigContributor.class);
configBinder.addBinding("shindig.xhrwrapper").to(XhrwrapperConfigContributor.class);
}
-
+
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigProcessor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/DefaultConfigProcessor.java Sun Feb 26 23:43:20 2012
@@ -35,7 +35,7 @@ public class DefaultConfigProcessor impl
private final Map<String, ConfigContributor> featureContributors;
private final List<ConfigContributor> globalContributors;
private final ContainerConfig containerConfig;
-
+
@Inject
public DefaultConfigProcessor(
Map<String, ConfigContributor> featureContributors,
@@ -44,12 +44,12 @@ public class DefaultConfigProcessor impl
this.globalContributors = Lists.newLinkedList();
this.containerConfig = containerConfig;
}
-
+
@Inject(optional = true)
public void setGlobalContributors(List<ConfigContributor> globalContribs) {
globalContributors.addAll(globalContribs);
}
-
+
public Map<String, Object> getConfig(String container, List<String> features, String host,
Gadget gadget) {
Map<String, Object> config = Maps.newHashMap();
@@ -58,10 +58,10 @@ public class DefaultConfigProcessor impl
for (ConfigContributor contrib : globalContributors) {
contribute(contrib, config, container, host, gadget);
}
-
+
// Append some container specific things
Map<String, Object> featureConfig = containerConfig.getMap(container, GADGETS_FEATURES_KEY);
-
+
if (featureConfig != null) {
// Discard what we don't care about.
for (String name : features) {
@@ -75,7 +75,7 @@ public class DefaultConfigProcessor impl
}
return config;
}
-
+
private void contribute(ConfigContributor contrib, Map<String, Object> config, String container,
String host, Gadget gadget) {
if (contrib != null) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/XhrwrapperConfigContributor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/XhrwrapperConfigContributor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/XhrwrapperConfigContributor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/XhrwrapperConfigContributor.java Sun Feb 26 23:43:20 2012
@@ -32,7 +32,7 @@ import java.util.Map;
/**
* Provides config support for the xhrwrapper feature.
- *
+ *
* @since 2.0.0
*/
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java Sun Feb 26 23:43:20 2012
@@ -31,7 +31,7 @@ import com.ibm.icu.text.CharsetMatch;
*/
public final class EncodingDetector {
private EncodingDetector() {}
-
+
public static class FallbackEncodingDetector {
public Charset detectEncoding(byte[] input) {
// Fall back to the incredibly slow ICU. It might be better to just skip this entirely.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/ApiDirective.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/ApiDirective.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/ApiDirective.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/ApiDirective.java Sun Feb 26 23:43:20 2012
@@ -26,13 +26,13 @@ public class ApiDirective {
public enum Type {
JS("js"),
RPC("rpc");
-
+
private final String code;
-
+
private Type(String code) {
this.code = code;
}
-
+
public static Type fromCode(String code) {
for (Type value : Type.values()) {
if (value.code.equals(code)) {
@@ -42,29 +42,29 @@ public class ApiDirective {
return null;
}
}
-
+
private final Type type;
private final String value;
private final boolean isUses;
-
+
ApiDirective(String type, String value, boolean isUses) {
this.type = Type.fromCode(type);
this.value = value;
this.isUses = isUses;
}
-
+
public Type getType() {
return type;
}
-
+
public String getValue() {
return value;
}
-
+
public boolean isUses() {
return isUses;
}
-
+
public boolean isExports() {
return !isUses;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java Sun Feb 26 23:43:20 2012
@@ -51,7 +51,7 @@ class FeatureParser {
List<String> deps = Lists.newArrayList();
List<ParsedFeature.Bundle> bundles = Lists.newArrayList();
boolean supportDefer = false;
-
+
NodeList children = doc.getChildNodes();
for (int i = 0, j = children.getLength(); i < j; ++i) {
Node child = children.item(i);
@@ -107,10 +107,10 @@ class FeatureParser {
}
}
}
-
+
return new ParsedFeature(name, deps, bundles);
}
-
+
private Map<String, String> getAttribs(Element element) {
ImmutableMap.Builder<String, String> attribs = ImmutableMap.builder();
NamedNodeMap attribNodes = element.getAttributes();
@@ -122,30 +122,30 @@ class FeatureParser {
}
return attribs.build();
}
-
+
static final class ParsedFeature {
private final String name;
private final List<String> deps;
private final List<Bundle> bundles;
-
+
private ParsedFeature(String name, List<String> deps, List<Bundle> bundles) {
this.name = name;
this.deps = ImmutableList.copyOf(deps);
this.bundles = ImmutableList.copyOf(bundles);
}
-
+
public String getName() {
return name;
}
-
+
public List<String> getDeps() {
return deps;
}
-
+
public List<Bundle> getBundles() {
return bundles;
}
-
+
public final static class Bundle {
private final String name;
private final String type;
@@ -153,7 +153,7 @@ class FeatureParser {
private final List<Resource> resources;
private final List<ApiDirective> apiDirectives;
private final boolean supportDefer;
-
+
private Bundle(String name, String type, Map<String, String> attribs,
List<Resource> resources, List<ApiDirective> apiDirectives, boolean supportDefer) {
this.name = name;
@@ -163,11 +163,11 @@ class FeatureParser {
this.apiDirectives = apiDirectives;
this.supportDefer = supportDefer;
}
-
+
public String getName() {
return name;
}
-
+
public String getType() {
return type;
}
@@ -175,39 +175,39 @@ class FeatureParser {
public Map<String, String> getAttribs() {
return attribs;
}
-
+
public List<Resource> getResources() {
return resources;
}
-
+
public List<ApiDirective> getApis() {
return apiDirectives;
}
-
+
public boolean isSupportDefer() {
return supportDefer;
}
}
-
+
static final class Resource {
private final Uri source;
private final String content;
private final Map<String, String> attribs;
-
+
private Resource(Uri source, String content, Map<String, String> attribs) {
this.source = source;
this.content = content;
this.attribs = ImmutableMap.copyOf(attribs);
}
-
+
public Uri getSource() {
return source;
}
-
+
public String getContent() {
return content;
}
-
+
public Map<String, String> getAttribs() {
return attribs;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java Sun Feb 26 23:43:20 2012
@@ -587,7 +587,7 @@ public class FeatureRegistry {
public List<ApiDirective> getApis() {
return bundle.getApis();
}
-
+
public boolean isSupportDefer() {
return bundle.isSupportDefer();
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResource.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResource.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResource.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResource.java Sun Feb 26 23:43:20 2012
@@ -29,32 +29,32 @@ public interface FeatureResource {
* @return "Normal"-mode content for the feature, eg. optimized/obfuscated JS.
*/
String getContent();
-
+
/**
* @return Debug-mode content for the feature.
*/
String getDebugContent();
-
+
/**
* @return True if the content is actually a URL to be included via <script src>
*/
boolean isExternal();
-
+
/**
* @return True if the JS can be cached by intermediary proxies or not.
*/
boolean isProxyCacheable();
-
+
/**
* @return A descriptive name used to reference the JS in various debug and stats contexts.
*/
String getName();
-
+
/**
* @return XML-defined attributes associated with this for resource selection/inclusion.
*/
Map<String, String> getAttribs();
-
+
/**
* Helper base class to avoid having to implement rarely-overridden isExternal/isProxyCacheable
* functionality in FeatureResource.
@@ -67,12 +67,12 @@ public interface FeatureResource {
public boolean isProxyCacheable() {
return true;
}
-
+
public Map<String, String> getAttribs() {
return ImmutableMap.of();
}
}
-
+
public abstract class Attribute extends Default {
private final Map<String, String> attribs;
@@ -85,12 +85,12 @@ public interface FeatureResource {
return attribs;
}
}
-
- public class Simple extends Default {
+
+ public class Simple extends Default {
private final String content;
private final String debugContent;
private final String name;
-
+
public Simple(String content, String debugContent, String name) {
this.content = content;
this.debugContent = debugContent;
@@ -104,7 +104,7 @@ public interface FeatureResource {
public String getDebugContent() {
return debugContent;
}
-
+
public String getName() {
return name;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java Sun Feb 26 23:43:20 2012
@@ -66,8 +66,8 @@ import org.apache.shindig.gadgets.uri.Ur
* shouldRefetch() = false when time < date + 3000ms
* shouldRefetch() = true when time >= date + 3000ms
*
- * Note that error cases are handled differently. (Even for strict no cache)
- *
+ * Note that error cases are handled differently. (Even for strict no cache)
+ *
* Implementations that override this are discouraged from using custom cache keys unless there is
* actually customization in the request object itself. It is highly recommended that you still
* use {@link #createKey} in the base class and append any custom data to the end of the key instead
@@ -80,7 +80,7 @@ public abstract class AbstractHttpCache
private static final String NO_EXPAND = UriCommon.Param.NO_EXPAND.getKey();
// Amount of time after which the entry in cache should be considered for a refetch for a
- // non-userfacing internal fetch when the response is strict-no-cache.
+ // non-userfacing internal fetch when the response is strict-no-cache.
@Inject(optional = true) @Named("shindig.cache.http.strict-no-cache-resource.refetch-after-ms")
public static long REFETCH_STRICT_NO_CACHE_AFTER_MS_DEFAULT = -1L;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java Sun Feb 26 23:43:20 2012
@@ -111,11 +111,11 @@ public class BasicHttpFetcher implements
// mutable fields must be volatile
private volatile int maxObjSize;
private volatile long slowResponseWarning;
-
+
//class name for logging purpose
private static final String classname = BasicHttpFetcher.class.getName();
private static final Logger LOG = Logger.getLogger(classname,MessageKeys.MESSAGES);
-
+
private final Set<Class<?>> TIMEOUT_EXCEPTIONS = ImmutableSet.<Class<?>>of(ConnectionPoolTimeoutException.class,
SocketTimeoutException.class, SocketException.class, HttpHostConnectException.class, NoHttpResponseException.class,
InterruptedException.class, UnknownHostException.class);
@@ -222,7 +222,7 @@ public class BasicHttpFetcher implements
client.setHttpRequestRetryHandler(new DefaultHttpRequestRetryHandler() );
// Disable automatic storage and sending of cookies (see SHINDIG-1382)
- client.removeRequestInterceptorByClass(RequestAddCookies.class);
+ client.removeRequestInterceptorByClass(RequestAddCookies.class);
client.removeResponseInterceptorByClass(ResponseProcessCookies.class);
// Use Java's built-in proxy logic in case no proxy set via guice.
@@ -376,9 +376,9 @@ public class BasicHttpFetcher implements
if (TIMEOUT_EXCEPTIONS.contains(e.getClass())) {
if (LOG.isLoggable(Level.INFO)) {
LOG.logp(Level.INFO, classname, "fetch", MessageKeys.TIMEOUT_EXCEPTION, new Object[] {request.getUri(),classname,e.getMessage(),now-started});
- }
+ }
return HttpResponse.timeout();
- }
+ }
if (LOG.isLoggable(Level.INFO)) {
LOG.logp(Level.INFO, classname, "fetch", MessageKeys.EXCEPTION_OCCURRED, new Object[] {request.getUri(),now-started});
LOG.logp(Level.INFO, classname, "fetch", "", e);
@@ -407,7 +407,7 @@ public class BasicHttpFetcher implements
protected void slowResponseWarning(HttpRequest request, long started, long finished) {
if (LOG.isLoggable(Level.WARNING)) {
LOG.logp(Level.WARNING, classname, "slowResponseWarning", MessageKeys.SLOW_RESPONSE, new Object[] {request.getUri(),finished-started});
- }
+ }
}
/**
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpCache.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpCache.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpCache.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpCache.java Sun Feb 26 23:43:20 2012
@@ -31,18 +31,18 @@ public interface HttpCache {
/**
* Add a request/response pair to the cache.
- *
+ *
* @return true if the response was cached, false if the response was not cached.
*/
boolean addResponse(HttpRequest request, HttpResponse response);
HttpResponse removeResponse(HttpRequest key);
-
+
/**
* Create a string representation of the cache key. If two requests are cache equivalent (a
* response to one request can be used to respond to the other request), their keys are
* guaranteed to be identical.
- *
+ *
* Identical keys do not guarantee that two requests are cache equivalent.
*/
String createKey(HttpRequest request);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java Sun Feb 26 23:43:20 2012
@@ -43,7 +43,7 @@ public class HttpResponseMetadataHelper
//class name for logging purpose
private static final String classname = HttpResponseMetadataHelper.class.getName();
private static final Logger LOG = Logger.getLogger(classname,MessageKeys.MESSAGES);
-
+
/**
* Return a copy of input response with additional metadata values.
* @param response source response
@@ -56,7 +56,7 @@ public class HttpResponseMetadataHelper
for (Map.Entry<String, String> val : values.entrySet()) {
metadata.put(val.getKey(), val.getValue());
}
- return new HttpResponseBuilder(response).setMetadata(metadata).create();
+ return new HttpResponseBuilder(response).setMetadata(metadata).create();
}
/**
@@ -73,11 +73,11 @@ public class HttpResponseMetadataHelper
// Should not happen
if (LOG.isLoggable(Level.INFO)) {
LOG.logp(Level.INFO, classname, "getHash", MessageKeys.ERROR_GETTING_MD5);
- }
+ }
}
return null;
}
-
+
public static HttpResponse updateHash(HttpResponse response, HttpResponseMetadataHelper helper) {
if (helper != null) {
String hash = helper.getHash(response);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcher.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcher.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcher.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/MultipleResourceHttpFetcher.java Sun Feb 26 23:43:20 2012
@@ -27,7 +27,7 @@ import org.apache.shindig.gadgets.Gadget
import java.util.concurrent.Callable;
import java.util.concurrent.Executor;
-import java.util.concurrent.FutureTask;
+import java.util.concurrent.FutureTask;
import java.util.List;
import java.util.Map;
@@ -76,11 +76,11 @@ public class MultipleResourceHttpFetcher
futureTasks.put(uri, createHttpFetcher(request));
}
}
-
+
return futureTasks;
}
- // Fetch the content of the requested uri.
+ // Fetch the content of the requested uri.
private FutureTask<RequestContext> createHttpFetcher(HttpRequest request) {
// Fetch the content of the requested uri.
FutureTask<RequestContext> httpFetcher =
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/NoOpInvalidationService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/NoOpInvalidationService.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/NoOpInvalidationService.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/NoOpInvalidationService.java Sun Feb 26 23:43:20 2012
@@ -26,7 +26,7 @@ import java.util.Set;
* No-Op implementation of the invalidation service
*/
public class NoOpInvalidationService implements InvalidationService {
-
+
public void invalidateApplicationResources(Set<Uri> uris, SecurityToken token) {
// No op
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/RequestPipeline.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/RequestPipeline.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/RequestPipeline.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/RequestPipeline.java Sun Feb 26 23:43:20 2012
@@ -28,7 +28,7 @@ import com.google.inject.ImplementedBy;
*
* NOTE: When using cache, please ensure that you are checking response.isStrictNoCache() before
* serving out. Because cache may have private contents, even though marked stale.
- * @see {AbstractHttpCache} for details.
+ * @see {AbstractHttpCache} for details.
*/
@ImplementedBy(DefaultRequestPipeline.class)
public interface RequestPipeline {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java Sun Feb 26 23:43:20 2012
@@ -33,7 +33,7 @@ import java.util.List;
/**
* Injects a global ___jsl variable with information about the JS request.
- *
+ *
* Used when loading embedded JS configuration in core.config/config.js.
*/
public class AddJslInfoVariableProcessor implements JsProcessor {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java Sun Feb 26 23:43:20 2012
@@ -49,7 +49,7 @@ public class AddOnloadFunctionProcessor
"window[nm]();" +
'}' +
"})();";
-
+
@VisibleForTesting
static final String JSL_CALLBACK_JS = "(function(){" +
"var j=window['___jsl'];" +
@@ -80,7 +80,7 @@ public class AddOnloadFunctionProcessor
}
return true;
}
-
+
@VisibleForTesting
protected String createOnloadScript(String function) {
return String.format(ONLOAD_JS_TPL, StringEscapeUtils.escapeEcmaScript(function));
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/BaseSurfaceJsProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/BaseSurfaceJsProcessor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/BaseSurfaceJsProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/BaseSurfaceJsProcessor.java Sun Feb 26 23:43:20 2012
@@ -47,7 +47,7 @@ public abstract class BaseSurfaceJsProce
this.featureRegistryProvider = featureRegistryProvider;
this.context = context;
}
-
+
protected final FeatureRegistry getFeatureRegistry(JsUri jsUri) throws JsException {
try {
return featureRegistryProvider.get(jsUri.getRepository());
@@ -55,7 +55,7 @@ public abstract class BaseSurfaceJsProce
throw new JsException(e.getHttpStatusCode(), e.getMessage());
}
}
-
+
protected final List<String> getExports(FeatureBundle bundle, JsUri jsUri) {
// Add exports of bundle, regardless.
if (jsUri.getCompileMode() == JsCompileMode.CONCAT_COMPILE_EXPORT_ALL) {
@@ -67,7 +67,7 @@ public abstract class BaseSurfaceJsProce
return bundle.getApis(ApiDirective.Type.JS, true);
}
}
-
+
return Lists.newArrayList();
}
@@ -115,7 +115,7 @@ public abstract class BaseSurfaceJsProce
}
return result;
}
-
+
/**
* Return the namespace for symbol (before last dot). If symbol is global,
* return null, to indicate "window" namespace.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java Sun Feb 26 23:43:20 2012
@@ -93,7 +93,7 @@ public class ConfigInjectionProcessor im
}
return true;
}
-
+
protected void injectBaseConfig(String configJson, JsResponseBuilder builder) {
builder.prependJs(String.format(CONFIG_INJECT_CODE, configJson), CONFIG_INIT_ID);
builder.appendJs(String.format(CONFIG_INIT_TPL, configJson), CONFIG_INIT_ID);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsServingPipeline.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsServingPipeline.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsServingPipeline.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DefaultJsServingPipeline.java Sun Feb 26 23:43:20 2012
@@ -37,7 +37,7 @@ public class DefaultJsServingPipeline im
}
public JsResponse execute(JsRequest jsRequest) throws JsException {
- JsResponseBuilder resp = new JsResponseBuilder();
+ JsResponseBuilder resp = new JsResponseBuilder();
jsProcessorRegistry.process(jsRequest, resp);
return resp.build();
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java Sun Feb 26 23:43:20 2012
@@ -58,9 +58,9 @@ public class DeferJsProcessor extends Ba
needDefers |= appendDeferJsStatements(resp, jsRequest.getJsUri(), bundle);
}
}
-
+
// TODO: Instead of clearing, do a replacement of feature impl with defer stubs.
- // Clearing has an effect of ignoring previous processors work.
+ // Clearing has an effect of ignoring previous processors work.
if (needDefers) {
builder.appendAllJs(getSurfaceJsContents(featureRegistry, FEATURE_NAME));
}
@@ -82,7 +82,7 @@ public class DeferJsProcessor extends Ba
}
return false;
}
-
+
private String toDeferStatement(Input input) {
StringBuilder result = new StringBuilder();
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java Sun Feb 26 23:43:20 2012
@@ -64,7 +64,7 @@ public class ExportJsProcessor extends B
needExports |= appendExportJsStatements(resp, jsUri, last);
}
}
-
+
builder.clearJs();
if (needExports) {
builder.appendAllJs(getSurfaceJsContents(featureRegistry, FEATURE_NAME));
@@ -87,7 +87,7 @@ public class ExportJsProcessor extends B
}
return false;
}
-
+
private String toExportStatement(Input input) {
StringBuilder result = new StringBuilder();
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsContent.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsContent.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsContent.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsContent.java Sun Feb 26 23:43:20 2012
@@ -30,7 +30,7 @@ public class JsContent {
private final String source;
private final FeatureBundle bundle;
private final FeatureResource resource;
-
+
public static JsContent fromText(String content, String source) {
return new JsContent(content, source, null, null);
}
@@ -39,7 +39,7 @@ public class JsContent {
FeatureBundle bundle, FeatureResource resource) {
return new JsContent(content, source, bundle, resource);
}
-
+
private JsContent(String content, String source,
FeatureBundle bundle, FeatureResource resource) {
this.content = content;
@@ -59,7 +59,7 @@ public class JsContent {
public FeatureBundle getFeatureBundle() {
return bundle;
}
-
+
public FeatureResource getFeatureResource() {
return resource;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsException.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsException.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsException.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsException.java Sun Feb 26 23:43:20 2012
@@ -29,7 +29,7 @@ public class JsException extends Excepti
super(msg);
this.statusCode = statusCode;
}
-
+
public int getStatusCode() {
return statusCode;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsLoadProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsLoadProcessor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsLoadProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsLoadProcessor.java Sun Feb 26 23:43:20 2012
@@ -43,7 +43,7 @@ public class JsLoadProcessor implements
public static final String JSLOAD_JS_TPL = "(function() {" +
"document.write('<scr' + 'ipt type=\"text/javascript\" src=\"%s\"></scr' + 'ipt>');" +
"})();"; // Concatenated to avoid some browsers do dynamic script injection.
-
+
@VisibleForTesting
public static final String ASYNC_JSLOAD_JS_TPL = "(function() {" +
"var s=document.createElement('script');" +
@@ -66,7 +66,7 @@ public class JsLoadProcessor implements
this.requireOnload = requireOnload;
this.template = JSLOAD_JS_TPL;
}
-
+
@Inject(optional = true)
public void setUseAsync(@Named("shindig.jsload.async-mode") Boolean jsloadAsync) {
if (jsloadAsync) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessor.java Sun Feb 26 23:43:20 2012
@@ -25,7 +25,7 @@ public interface JsProcessor {
/**
* Populates or modifies the Javascript response.
- *
+ *
* @param jsRequest The JS request that originated this execution.
* @param builder The response builder to work on.
* @return Whether processing should continue after this processor.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessorRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessorRegistry.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessorRegistry.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsProcessorRegistry.java Sun Feb 26 23:43:20 2012
@@ -22,7 +22,7 @@ import com.google.inject.ImplementedBy;
/**
* A class to run a series of processing steps on a JS response.
- *
+ *
* The way the processing steps are registered is implementation-dependent.
*/
@ImplementedBy(DefaultJsProcessorRegistry.class)
@@ -30,7 +30,7 @@ public interface JsProcessorRegistry {
/**
* Executes the processing steps.
- *
+ *
* @param jsRequest The JS request that originated this execution.
* @param response A builder for the JS response.
* @throws JsException If any of the steps resulted in an error.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java Sun Feb 26 23:43:20 2012
@@ -29,7 +29,7 @@ import java.util.List;
/**
* Data about a JavaScript request.
- *
+ *
* This class is instantiated via {@link JsRequestBuilder}.
*/
public class JsRequest {
@@ -48,7 +48,7 @@ public class JsRequest {
this.inCache = inCache;
this.registry = registry;
}
-
+
/**
* @return this request's {@link JsUri}.
*/
@@ -69,7 +69,7 @@ public class JsRequest {
public boolean isInCache() {
return inCache;
}
-
+
/**
* @return All features encapsulated by this request, including deps, in dep order.
*/
@@ -77,15 +77,15 @@ public class JsRequest {
initFeaturesLists();
return allFeatures;
}
-
+
/**
* @return Features to be newly returned by this request (all - loaded), in dep order.
*/
public List<String> getNewFeatures() {
initFeaturesLists();
- return newFeatures;
+ return newFeatures;
}
-
+
/**
* @return Full list of all features previously loaded before this request, in dep order.
*/
@@ -93,7 +93,7 @@ public class JsRequest {
initFeaturesLists();
return loadedFeatures;
}
-
+
private void initFeaturesLists() {
if (allFeatures == null) {
// Lazy-initialize these, to avoid computation where not needed.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequestBuilder.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequestBuilder.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequestBuilder.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequestBuilder.java Sun Feb 26 23:43:20 2012
@@ -39,13 +39,13 @@ public class JsRequestBuilder {
@Inject
public JsRequestBuilder(JsUriManager jsUriManager,
FeatureRegistry registry) {
- this.jsUriManager = jsUriManager;
+ this.jsUriManager = jsUriManager;
this.registry = registry;
}
-
+
/**
* Builds a {@link JsRequest} instance from the given request object.
- *
+ *
* @param request The originating HTTP request object.
* @return The corresponding JsRequest object.
* @throws GadgetException If there was a problem parsing the URI.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponse.java Sun Feb 26 23:43:20 2012
@@ -101,7 +101,7 @@ public class JsResponse {
public List<String> getErrors() {
return errors;
}
-
+
/**
* Returns a string of all error messages associated with this response.
*/
@@ -115,7 +115,7 @@ public class JsResponse {
}
return errorString;
}
-
+
/**
* Returns a string of generated externs.
*/
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java Sun Feb 26 23:43:20 2012
@@ -40,7 +40,7 @@ public class JsResponseBuilder {
private boolean proxyCacheable;
private final StringBuilder rawExterns;
private final List<String> externs;
-
+
public JsResponseBuilder() {
jsCode = Lists.newLinkedList();
statusCode = HttpServletResponse.SC_OK;
@@ -261,7 +261,7 @@ public class JsResponseBuilder {
}
return result;
}
-
+
private boolean canAddContent(JsContent jsContent) {
return jsContent.get().length() > 0;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipeline.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipeline.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipeline.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsServingPipeline.java Sun Feb 26 23:43:20 2012
@@ -22,16 +22,16 @@ import com.google.inject.ImplementedBy;
/**
* A pipeline to process Javascript requests.
- *
+ *
* These requests go through several processing steps that may provide features
- * like compilation, cajoling, etc.
+ * like compilation, cajoling, etc.
*/
@ImplementedBy(DefaultJsServingPipeline.class)
public interface JsServingPipeline {
/**
* Executes the steps in the pipeline and returns the resulting response.
- *
+ *
* @param jsRequest The JS request.
* @return The JavaScript response generated by the pipeline.
* @throws JsException If any of the steps resulted in an error.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/AccessorInfo.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/AccessorInfo.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/AccessorInfo.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/AccessorInfo.java Sun Feb 26 23:43:20 2012
@@ -25,7 +25,7 @@ import org.apache.shindig.gadgets.oauth.
* OAuth related data accessor
*/
public class AccessorInfo {
-
+
public static enum HttpMethod {
GET,
POST
@@ -36,14 +36,14 @@ public class AccessorInfo {
POST_BODY,
URI_QUERY
}
-
+
private final OAuthAccessor accessor;
private final ConsumerInfo consumer;
private final HttpMethod httpMethod;
private final OAuthParamLocation paramLocation;
private String sessionHandle;
private long tokenExpireMillis;
-
+
public AccessorInfo(OAuthAccessor accessor, ConsumerInfo consumer, HttpMethod httpMethod,
OAuthParamLocation paramLocation, String sessionHandle, long tokenExpireMillis) {
this.accessor = accessor;
@@ -61,7 +61,7 @@ public class AccessorInfo {
public OAuthAccessor getAccessor() {
return accessor;
}
-
+
public ConsumerInfo getConsumer() {
return consumer;
}
@@ -73,7 +73,7 @@ public class AccessorInfo {
public String getSessionHandle() {
return sessionHandle;
}
-
+
public void setSessionHandle(String sessionHandle) {
this.sessionHandle = sessionHandle;
}
@@ -81,7 +81,7 @@ public class AccessorInfo {
public long getTokenExpireMillis() {
return tokenExpireMillis;
}
-
+
public void setTokenExpireMillis(long tokenExpireMillis) {
this.tokenExpireMillis = tokenExpireMillis;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java Sun Feb 26 23:43:20 2012
@@ -70,12 +70,12 @@ public class BasicOAuthStore implements
* Key to use when no other key is found.
*/
private BasicOAuthStoreConsumerKeyAndSecret defaultKey;
-
+
/**
* Callback to use when no per-key callback URL is found.
*/
private String defaultCallbackUrl;
-
+
/** Number of times we looked up a consumer key */
private int consumerKeyLookupCount = 0;
@@ -87,7 +87,7 @@ public class BasicOAuthStore implements
/** Number of times we removed an access token */
private int accessTokenRemoveCount = 0;
-
+
private Authority authority;
public BasicOAuthStore() {
@@ -154,7 +154,7 @@ public class BasicOAuthStore implements
public void setDefaultKey(BasicOAuthStoreConsumerKeyAndSecret defaultKey) {
this.defaultKey = defaultKey;
}
-
+
public void setDefaultCallbackUrl(String defaultCallbackUrl) {
this.defaultCallbackUrl = defaultCallbackUrl;
}
@@ -163,7 +163,7 @@ public class BasicOAuthStore implements
BasicOAuthStoreConsumerIndex providerKey, BasicOAuthStoreConsumerKeyAndSecret keyAndSecret) {
consumerInfos.put(providerKey, keyAndSecret);
}
-
+
public void setAuthority(Authority authority) {
this.authority = authority;
}
@@ -196,11 +196,11 @@ public class BasicOAuthStore implements
consumer.setProperty(OAuth.OAUTH_SIGNATURE_METHOD, OAuth.HMAC_SHA1);
}
String callback = (cks.getCallbackUrl() != null ? cks.getCallbackUrl() : defaultCallbackUrl);
-
+
if (authority != null) {
callback = callback.replace("%authority%", authority.getAuthority());
}
-
+
return new ConsumerInfo(consumer, cks.getKeyName(), callback);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerKeyAndSecret.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerKeyAndSecret.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerKeyAndSecret.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerKeyAndSecret.java Sun Feb 26 23:43:20 2012
@@ -36,7 +36,7 @@ public class BasicOAuthStoreConsumerKeyA
/** Name of public key to use with xoauth_public_key parameter. May be null */
private final String keyName;
-
+
/** Callback URL associated with this consumer key */
private final String callbackUrl;
@@ -48,23 +48,23 @@ public class BasicOAuthStoreConsumerKeyA
keyName = name;
this.callbackUrl = callbackUrl;
}
-
+
public String getConsumerKey() {
return consumerKey;
}
-
+
public String getConsumerSecret() {
return consumerSecret;
}
-
+
public KeyType getKeyType() {
return keyType;
}
-
+
public String getKeyName() {
return keyName;
}
-
+
public String getCallbackUrl() {
return callbackUrl;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java Sun Feb 26 23:43:20 2012
@@ -94,7 +94,7 @@ public class GadgetOAuthCallbackGenerato
this.oauthUriManager = oauthUriManager;
this.stateCrypter = stateCrypter;
}
-
+
public String generateCallback(OAuthFetcherConfig fetcherConfig, String baseCallback,
HttpRequest request, OAuthResponseParams responseParams) throws OAuthRequestException {
Uri activeUrl = checkGadgetCanRender(request.getSecurityToken(),
@@ -138,7 +138,7 @@ public class GadgetOAuthCallbackGenerato
}
return gadgetCallback.toString();
}
-
+
private String generateCallbackForProvider(
OAuthResponseParams responseParams, String callbackForProvider, String gadgetDomainCallback)
throws OAuthRequestException {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java Sun Feb 26 23:43:20 2012
@@ -45,7 +45,7 @@ public class OAuthArguments {
private static final String SIGN_OWNER_PARAM = "signOwner";
private static final String SIGN_VIEWER_PARAM = "signViewer";
private static final String RECEIVED_CALLBACK_PARAM = "OAUTH_RECEIVED_CALLBACK";
-
+
// Experimental support for configuring OAuth without special parameters in the spec XML.
public static final String PROGRAMMATIC_CONFIG_PARAM = "OAUTH_PROGRAMMATIC_CONFIG";
public static final String REQUEST_METHOD_PARAM = "OAUTH_REQUEST_METHOD";
@@ -92,16 +92,16 @@ public class OAuthArguments {
/** Include information about the viewer? */
private boolean signViewer = false;
-
+
/** Arbitrary name/value pairs associated with the request */
private final Map<String, String> requestOptions = new TreeMap<String,String>(String.CASE_INSENSITIVE_ORDER);
/** Whether the request is one for proxied content */
private boolean proxiedContentRequest = false;
-
+
/** Callback URL returned from service provider */
private String receivedCallbackUrl = null;
-
+
/**
* Parse OAuthArguments from parameters to the makeRequest servlet.
*
@@ -321,40 +321,40 @@ public class OAuthArguments {
public void setSignViewer(boolean signViewer) {
this.signViewer = signViewer;
}
-
+
public void setRequestOption(String name, String value) {
requestOptions.put(name, value);
}
-
+
public void removeRequestOption(String name) {
requestOptions.remove(name);
}
-
+
public String getRequestOption(String name) {
return requestOptions.get(name);
}
-
+
public String getRequestOption(String name, String def) {
String val = requestOptions.get(name);
return (val != null ? val : def);
}
-
+
public boolean isProxiedContentRequest() {
return proxiedContentRequest;
}
-
+
public void setProxiedContentRequest(boolean proxiedContentRequest) {
this.proxiedContentRequest = proxiedContentRequest;
}
-
+
public boolean programmaticConfig() {
return Boolean.parseBoolean(requestOptions.get(PROGRAMMATIC_CONFIG_PARAM));
}
-
+
public String getReceivedCallbackUrl() {
return receivedCallbackUrl;
}
-
+
public void setReceivedCallbackUrl(String receivedCallbackUrl) {
this.receivedCallbackUrl = receivedCallbackUrl;
}
@@ -371,7 +371,7 @@ public class OAuthArguments {
public boolean equals(Object obj) {
if (this == obj)
return true;
-
+
if (!(obj instanceof OAuthArguments)) {
return false;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackGenerator.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackGenerator.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackGenerator.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackGenerator.java Sun Feb 26 23:43:20 2012
@@ -26,7 +26,7 @@ import org.apache.shindig.gadgets.http.H
* Figures out the OAuth callback URL to send service providers.
*/
@ImplementedBy(GadgetOAuthCallbackGenerator.class)
-public interface OAuthCallbackGenerator {
+public interface OAuthCallbackGenerator {
String generateCallback(OAuthFetcherConfig fetcherConfig, String baseCallback,
HttpRequest request, OAuthResponseParams responseParams) throws OAuthRequestException;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthError.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthError.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthError.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthError.java Sun Feb 26 23:43:20 2012
@@ -27,7 +27,7 @@ public enum OAuthError {
BAD_OAUTH_CONFIGURATION("%s"),
/**
- * The request cannot be completed because the gadget didn't specify
+ * The request cannot be completed because the gadget didn't specify
* an endpoint required for redirection-based authorization.
*/
BAD_OAUTH_TOKEN_URL("No %s URL specified"),
@@ -80,7 +80,7 @@ public enum OAuthError {
+ " must start with oauth, xoauth, or opensocial"),
UNKNOWN_PARAMETER_LOCATION("Unknown parameter location: %s"),
-
+
/**
* The request cannot be completed because the request options were invalid.
* Generic message.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthGadgetContext.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthGadgetContext.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthGadgetContext.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthGadgetContext.java Sun Feb 26 23:43:20 2012
@@ -38,7 +38,7 @@ public class OAuthGadgetContext extends
this.appUrl = Uri.parse(securityToken.getAppUrl());
this.bypassSpecCache = arguments.getBypassSpecCache();
}
-
+
@Override
public String getContainer() {
return container;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java Sun Feb 26 23:43:20 2012
@@ -49,7 +49,7 @@ public class OAuthModule extends Abstrac
//class name for logging purpose
private static final String classname = OAuthModule.class.getName();
private static final Logger LOG = Logger.getLogger(classname, MessageKeys.MESSAGES);
-
+
private static final String OAUTH_CONFIG = "config/oauth.json";
private static final String OAUTH_SIGNING_KEY_FILE = "shindig.signing.key-file";
@@ -80,7 +80,7 @@ public class OAuthModule extends Abstrac
LOG.info("Using random key for OAuth client-side state encryption");
if (LOG.isLoggable(Level.INFO)) {
LOG.logp(Level.INFO, classname, "OAuthCrypterProvider constructor", MessageKeys.USING_RANDOM_KEY);
- }
+ }
crypter = new BasicBlobCrypter(Crypto.getRandomBytes(BasicBlobCrypter.MASTER_KEY_MIN_LEN));
} else {
if (LOG.isLoggable(Level.INFO)) {
@@ -113,7 +113,7 @@ public class OAuthModule extends Abstrac
@Singleton
public static class OAuthStoreProvider implements Provider<OAuthStore> {
- private final BasicOAuthStore store;
+ private final BasicOAuthStore store;
@Inject
public OAuthStoreProvider(
@@ -151,7 +151,7 @@ public class OAuthModule extends Abstrac
} else {
if (LOG.isLoggable(Level.WARNING)) {
LOG.logp(Level.WARNING, classname, "loadDefaultKey", MessageKeys.COULD_NOT_LOAD_SIGN_KEY, new Object[] {OAUTH_SIGNING_KEY_FILE,OAUTH_SIGNING_KEY_NAME});
- }
+ }
}
}
@@ -163,7 +163,7 @@ public class OAuthModule extends Abstrac
if (LOG.isLoggable(Level.WARNING)) {
LOG.logp(Level.WARNING, classname, "loadConsumers", MessageKeys.FAILED_TO_INIT, new Object[] {OAUTH_CONFIG});
LOG.log(Level.WARNING, "", t);
- }
+ }
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthProtocolException.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthProtocolException.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthProtocolException.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthProtocolException.java Sun Feb 26 23:43:20 2012
@@ -31,18 +31,18 @@ import java.util.Set;
* Implements the
* <a href="http://wiki.oauth.net/ProblemReporting">
* OAuth problem reporting extension</a>
- *
+ *
* We divide problems into three categories:
* - problems that cause us to abort the protocol. For example, if we don't
* have a consumer key that the service provider accepts, we give up.
- *
+ *
* - problems that cause us to ask for the user's permission again. For
* example, if the service provider reports that an access token has been
* revoked, we throw away the token and start over.
- *
+ *
* - problems that require us to refresh our access token per the OAuth
* session extension protocol
- *
+ *
* By default we assume most service provider errors fall into the second
* category: we should ask for the user's permission again.
*/
@@ -63,7 +63,7 @@ class OAuthProtocolException extends Exc
* Problems that should force us to abort the protocol right away,
* but we can still try to use the access token again later.
*/
- private static Set<String> temporaryProblems =
+ private static Set<String> temporaryProblems =
ImmutableSet.of("consumer_key_refused");
/**
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java Sun Feb 26 23:43:20 2012
@@ -74,7 +74,7 @@ public class OAuthRequest {
//class name for logging purpose
private static final String classname = OAuthRequest.class.getName();
-
+
// Maximum number of attempts at the protocol before giving up.
private static final int MAX_ATTEMPTS = 2;
@@ -218,7 +218,7 @@ public class OAuthRequest {
// OK, got some data back, annotate it as necessary.
if (response.getHttpStatusCode() >= 400) {
responseParams.logDetailedWarning(classname,"fetchNoThrow",MessageKeys.OAUTH_FETCH_FATAL_ERROR);
-
+
responseParams.setSendTraceToClient(true);
} else if (responseParams.getAznUrl() != null && responseParams.sawErrorResponse()) {
responseParams.logDetailedWarning(classname,"fetchNoThrow",MessageKeys.OAUTH_FETCH_ERROR_REPROMPT);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java Sun Feb 26 23:43:20 2012
@@ -42,7 +42,7 @@ public class OAuthRequestException exten
public OAuthRequestException (OAuthError error) {
this(error.name(), error.toString());
}
-
+
/**
* Create an exception and record information about the exception to be returned to the gadget.
@@ -60,9 +60,9 @@ public class OAuthRequestException exten
* @param cause
*/
public OAuthRequestException(OAuthError error, String errorText, Throwable cause) {
- this(error.name(), String.format(error.toString(), errorText), cause);
+ this(error.name(), String.format(error.toString(), errorText), cause);
}
-
+
/**
* Create an exception and record information about the exception to be returned to the gadget.
@@ -74,7 +74,7 @@ public class OAuthRequestException exten
this.error = Preconditions.checkNotNull(error);
this.errorText = Preconditions.checkNotNull(errorText);
}
-
+
/**
* Create an exception and record information about the exception to be returned to the gadget.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthStore.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthStore.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthStore.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthStore.java Sun Feb 26 23:43:20 2012
@@ -53,7 +53,7 @@ public interface OAuthStore {
private final OAuthConsumer consumer;
private final String keyName;
private final String callbackUrl;
-
+
/**
* @param consumer the OAuth consumer
* @param keyName the name of the key to use for this consumer (passed on query parameters to
@@ -66,20 +66,20 @@ public interface OAuthStore {
this.keyName = keyName;
this.callbackUrl = callbackUrl;
}
-
+
public OAuthConsumer getConsumer() {
return consumer;
}
-
+
public String getKeyName() {
return keyName;
}
-
+
public String getCallbackUrl() {
return callbackUrl;
}
}
-
+
/**
* Information about an access token.
*/
@@ -88,7 +88,7 @@ public interface OAuthStore {
private final String tokenSecret;
private final String sessionHandle;
private final long tokenExpireMillis;
-
+
/**
* @param accessToken the token
* @param tokenSecret the secret for the token
@@ -120,11 +120,11 @@ public interface OAuthStore {
/**
* Retrieve OAuth consumer to use for requests. The returned consumer is ready to use for signed
* fetch requests.
- *
+ *
* @param securityToken token for user/gadget making request.
* @param serviceName gadget's nickname for the service being accessed.
* @param provider OAuth service provider info to be inserted into the returned consumer.
- *
+ *
* @throws GadgetException if no OAuth consumer can be found (e.g. no consumer key can be used.)
*/
ConsumerInfo getConsumerKeyAndSecret(SecurityToken securityToken, String serviceName,
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Accessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Accessor.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Accessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Accessor.java Sun Feb 26 23:43:20 2012
@@ -21,7 +21,7 @@ import com.google.common.collect.Maps;
import java.util.Map;
/**
- *
+ *
* see {@link OAuth2Accessor}
*/
public class BasicOAuth2Accessor implements OAuth2Accessor {