Author: lindner
Date: Mon Jan 24 13:37:47 2011
New Revision: 1062771
URL: http://svn.apache.org/viewvc?rev=1062771&view=rev
Log:
lots of misc java cleanups
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanFilterTest.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlSerializer.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizerTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java
Mon Jan 24 13:37:47 2011
@@ -18,7 +18,10 @@
*/
package org.apache.shindig.common.crypto;
+import com.google.common.base.CharMatcher;
import com.google.common.base.Charsets;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
import com.google.common.base.Preconditions;
@@ -38,6 +41,7 @@ import java.io.UnsupportedEncodingExcept
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.security.GeneralSecurityException;
+import java.util.Iterator;
import java.util.Map;
/**
@@ -207,7 +211,7 @@ public class BasicBlobCrypter implements
}
private Map<String, String> deserialize(byte[] plain)
- throws UnsupportedEncodingException {
+ throws UnsupportedEncodingException {
String base = new String(plain, UTF8);
// replaces [&=] regex
String[] items = StringUtils.splitPreserveAllTokens(base, "&=");
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java
Mon Jan 24 13:37:47 2011
@@ -24,6 +24,7 @@ import com.google.common.collect.Immutab
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import java.lang.reflect.InvocationHandler;
@@ -62,7 +63,7 @@ public class BeanDelegator {
* Convert field names to common name - no underscore and lower case
*/
public static String normalizeName(String name) {
- return name.replaceAll("_", "").toLowerCase();
+ return StringUtils.remove(name, '_').toLowerCase();
}
/**
@@ -318,10 +319,7 @@ public class BeanDelegator {
// Primitive types
if (dataType == interfaceType) {
- if (!PRIMITIVE_TYPE_CLASSES.contains(dataType) && !((Class<?>)
dataType).isPrimitive()) {
- return false;
- }
- return true;
+ return !(!PRIMITIVE_TYPE_CLASSES.contains(dataType) && !((Class<?>)
dataType).isPrimitive());
}
// Check all enum values are accounted for
Modified:
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java
(original)
+++
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java
Mon Jan 24 13:37:47 2011
@@ -21,6 +21,7 @@ package org.apache.shindig.common.util;
import static org.junit.Assert.assertEquals;
+import org.apache.commons.lang.ArrayUtils;
import org.junit.Test;
import junitx.framework.ArrayAssert;
@@ -33,7 +34,7 @@ public class CharsetUtilTest {
@Test
public void testGetUtf8String() {
ArrayAssert.assertEquals(new byte[] { 0x69, 0x6e },
CharsetUtil.getUtf8Bytes("in"));
- ArrayAssert.assertEquals(new byte[] {}, CharsetUtil.getUtf8Bytes(null));
+ ArrayAssert.assertEquals(ArrayUtils.EMPTY_BYTE_ARRAY,
CharsetUtil.getUtf8Bytes(null));
testStringOfLength(0);
testStringOfLength(10);
testStringOfLength(100);
Modified:
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java
(original)
+++
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java
Mon Jan 24 13:37:47 2011
@@ -50,7 +50,7 @@ public class BeanDelegatorTest extends A
public String getPrivateData(); // delegated class method is private
// Test enum
- public enum Style { A, B; }
+ public enum Style { A, B }
public Style getStyle();
// Test of required
@@ -90,7 +90,8 @@ public class BeanDelegatorTest extends A
private String getPrivateData() { return "this is private"; }
// Enum data:
- public enum RealStyle { R_A, R_B; }
+ public enum RealStyle { R_A, R_B
+ }
RealStyle style;
public RealStyle getStyle() { return style; }
public SimpleBean setStyle(RealStyle style) { this.style = style; return
this; }
Modified:
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanFilterTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanFilterTest.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanFilterTest.java
(original)
+++
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanFilterTest.java
Mon Jan 24 13:37:47 2011
@@ -101,7 +101,7 @@ public class BeanFilterTest extends Asse
@Test
public void testMap() throws Exception {
- List<String> list = ImmutableList.<String>of("test");
+ List<String> list = ImmutableList.of("test");
SimpleBean data = new SimpleBean().setS("Main").setBeanMap(
ImmutableMap.<String, SimpleBean>of( "s1", new
SimpleBean().setS("sub1").setList(list),
"s2", new SimpleBean().setS("sub2").setList(list).setBeanMap(
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
Mon Jan 24 13:37:47 2011
@@ -214,7 +214,7 @@ public class BrowserSpecificFeatureResou
return false;
}
- private static final VersionNumber num(String str) {
+ private static VersionNumber num(String str) {
return new VersionNumber(str);
}
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=1062771&r1=1062770&r2=1062771&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
Mon Jan 24 13:37:47 2011
@@ -199,12 +199,9 @@ public class FeatureRegistry {
return cache.get(cacheKey);
}
- List<FeatureNode> featureNodes = null;
- if (transitive) {
- featureNodes = getTransitiveDeps(needed, unsupported);
- } else {
- featureNodes = getRequestedNodes(needed, unsupported);
- }
+ List<FeatureNode> featureNodes = transitive ?
+ getTransitiveDeps(needed, unsupported) : getRequestedNodes(needed,
unsupported);
+
String targetBundleType = ctx.getRenderingContext().getFeatureBundleTag();
ImmutableList.Builder<FeatureBundle> bundlesBuilder =
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=1062771&r1=1062770&r2=1062771&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
Mon Jan 24 13:37:47 2011
@@ -25,6 +25,7 @@ import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
+import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.http.Header;
import org.apache.http.HeaderElement;
@@ -178,7 +179,7 @@ public class BasicHttpFetcher implements
// Set proxy if set via guice.
if (!Strings.isNullOrEmpty(basicHttpFetcherProxy)) {
- String[] splits = basicHttpFetcherProxy.split(":");
+ String[] splits = StringUtils.split(basicHttpFetcherProxy, ':');
ConnRouteParams.setDefaultProxy(
client.getParams(), new HttpHost(splits[0],
Integer.parseInt(splits[1]), "http"));
}
@@ -500,7 +501,7 @@ public class BasicHttpFetcher implements
InputStream instream = entity.getContent();
if (instream == null) {
- return new byte[] {};
+ return ArrayUtils.EMPTY_BYTE_ARRAY;
}
Preconditions.checkArgument(entity.getContentLength() < Integer.MAX_VALUE,
"HTTP entity too large to be buffered in memory");
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
Mon Jan 24 13:37:47 2011
@@ -65,7 +65,7 @@ public class DefaultHtmlSerializer imple
break;
}
case Node.DOCUMENT_NODE: {
- NodeList children = ((Document)n).getChildNodes();
+ NodeList children = n.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
serialize(children.item(i), output, xmlMode);
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
Mon Jan 24 13:37:47 2011
@@ -18,7 +18,6 @@
package org.apache.shindig.gadgets.parse;
import com.google.common.collect.Lists;
-import com.google.inject.ImplementedBy;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -27,7 +26,6 @@ import org.apache.shindig.common.cache.C
import org.apache.shindig.common.logging.i18n.MessageKeys;
import org.apache.shindig.common.util.HashUtil;
import org.apache.shindig.gadgets.GadgetException;
-import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
import org.w3c.dom.DOMImplementation;
@@ -45,7 +43,7 @@ import java.util.logging.Logger;
/**
* Parser for arbitrary HTML content
*/
-@ImplementedBy(NekoSimplifiedHtmlParser.class)
+
public abstract class GadgetHtmlParser {
//class name for logging purpose
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
Mon Jan 24 13:37:47 2011
@@ -191,7 +191,7 @@ public class CajaCssSanitizer {
private static String rewriteUri(ProxyUriManager proxyUriManager, String
input,
final Uri context, GadgetContext
gadgetContext) {
- Uri inboundUri = null;
+ Uri inboundUri;
try {
inboundUri = Uri.parse(input);
} catch (IllegalArgumentException e) {
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlSerializer.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlSerializer.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlSerializer.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlSerializer.java
Mon Jan 24 13:37:47 2011
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.gadgets.parse.caja;
+import com.google.caja.reporting.MarkupRenderMode;
import org.apache.shindig.gadgets.parse.HtmlSerialization;
import org.apache.shindig.gadgets.parse.HtmlSerializer;
import org.w3c.dom.Document;
@@ -36,6 +37,8 @@ import java.io.StringWriter;
public class CajaHtmlSerializer implements HtmlSerializer {
public String serialize(Document doc) {
StringWriter sw = HtmlSerialization.createWriter(doc);
- return Nodes.render(doc, new RenderContext(new Concatenator(sw,
null)).asXml());
+ return Nodes.render(doc,
+ new RenderContext(new Concatenator(sw, null)).asXml() ?
MarkupRenderMode.XML : MarkupRenderMode.HTML
+ );
}
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/VanillaCajaHtmlSerializer.java
Mon Jan 24 13:37:47 2011
@@ -19,6 +19,7 @@ package org.apache.shindig.gadgets.parse
import com.google.caja.parser.html.Nodes;
import com.google.caja.render.Concatenator;
+import com.google.caja.reporting.MarkupRenderMode;
import com.google.caja.reporting.RenderContext;
import org.apache.shindig.gadgets.parse.HtmlSerialization;
import org.apache.shindig.gadgets.parse.HtmlSerializer;
@@ -37,7 +38,8 @@ public class VanillaCajaHtmlSerializer i
if (doc.getDoctype() != null) {
HtmlSerialization.outputDocType(doc.getDoctype(), sw);
}
- sw.append(Nodes.render(doc, new RenderContext(new Concatenator(sw,
null)).asXml()));
+ sw.append(Nodes.render(doc,
+ new RenderContext(new Concatenator(sw, null)).asXml() ?
MarkupRenderMode.XML : MarkupRenderMode.HTML));
return sw.toString();
} catch (IOException e) {
return null;
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
Mon Jan 24 13:37:47 2011
@@ -97,14 +97,18 @@ public class OpenSocialI18NGadgetRewrite
try {
attemptToLoadDateConstants(language);
localeName = language;
- } catch (IOException e) { }
+ } catch (IOException e) {
+ // ignore
+ }
}
if (!country.equalsIgnoreCase("ALL")) {
try {
attemptToLoadDateConstants(localeName + '_' + country);
localeName += '_' + country;
- } catch (IOException e) { }
+ } catch (IOException e) {
+ // ignore
+ }
}
return localeName;
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
Mon Jan 24 13:37:47 2011
@@ -23,6 +23,7 @@ import com.google.inject.Inject;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.uri.ProxyUriManager;
@@ -132,7 +133,7 @@ public class ImageResizeRewriter extends
String styleStr = imgElement.getAttribute("style");
for (String attr : Splitter.on(';').split(styleStr)) {
- String[] splits = attr.split(":");
+ String[] splits = StringUtils.split(attr, ':');
if (splits.length != 2) {
continue;
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
Mon Jan 24 13:37:47 2011
@@ -38,7 +38,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.w3c.dom.Text;
import java.util.List;
@@ -176,7 +175,7 @@ public class OsTemplateXmlLoaderRewriter
for (Node child = elem.getFirstChild(); child != null; child =
child.getNextSibling()) {
switch (child.getNodeType()) {
case Node.TEXT_NODE:
- children.put(((Text)child).getNodeValue());
+ children.put(child.getNodeValue());
break;
case Node.DOCUMENT_NODE:
case Node.ELEMENT_NODE:
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java
Mon Jan 24 13:37:47 2011
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.gadgets.rewrite;
+import com.google.common.collect.ImmutableList;
import com.google.inject.Inject;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
@@ -52,7 +53,7 @@ public class ProxyingContentRewriter ext
// Note that concat is including with proxy in order to prevent
// proxying the rewritten concat url
// Basically Url rewritters should all be in one dom walker.
- return Arrays.<Visitor>asList(
+ return ImmutableList.of(
new ConcatVisitor.Js(config, concatUriManager),
new ConcatVisitor.Css(config, concatUriManager),
new ProxyingVisitor(config, proxyUriManager,
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriteModule.java
Mon Jan 24 13:37:47 2011
@@ -201,8 +201,9 @@ public class RewriteModule extends Abstr
AbsolutePathReferenceRewriter absolutePathReferenceRewriter,
StyleTagProxyEmbeddedUrlsRewriter styleTagProxyEmbeddedUrlsRewriter,
ProxyingContentRewriter proxyingContentRewriter) {
- return ImmutableList.of((ResponseRewriter) absolutePathReferenceRewriter,
- (ResponseRewriter) styleTagProxyEmbeddedUrlsRewriter,
- (ResponseRewriter) proxyingContentRewriter);
+ return ImmutableList.<ResponseRewriter>of(
+ absolutePathReferenceRewriter,
+ styleTagProxyEmbeddedUrlsRewriter,
+ proxyingContentRewriter);
}
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
Mon Jan 24 13:37:47 2011
@@ -246,7 +246,7 @@ public class TemplateRewriter implements
// Suppress exceptions due to malformed template libraries
if (LOG.isLoggable(Level.WARNING)) {
LOG.logp(Level.WARNING, classname, "loadTemplateLibraries",
MessageKeys.MALFORMED_TEMPLATE_LIB);
- LOG.log(Level.WARNING, te.getMessage(),te);;
+ LOG.log(Level.WARNING, te.getMessage(),te);
}
}
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java
Mon Jan 24 13:37:47 2011
@@ -432,7 +432,7 @@ public class GadgetsHandler {
private List<String> processFields(BaseRequestItem request, List<String>
defaultList) {
List<String> value = request.getListParameter(BaseRequestItem.FIELDS);
- return ((value == null || value.size() == 0) ? defaultList : value);
+ return ((value == null || value.isEmpty()) ? defaultList : value);
}
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
Mon Jan 24 13:37:47 2011
@@ -117,7 +117,7 @@ public class GadgetsHandlerApi {
}
public enum UserPrefDataType {
- STRING, HIDDEN, BOOL, ENUM, LIST, NUMBER;
+ STRING, HIDDEN, BOOL, ENUM, LIST, NUMBER
}
public interface UserPref {
@@ -216,7 +216,7 @@ public class GadgetsHandlerApi {
// but progress should continue in case further messages shed more info
ERROR,
// Indicative of a problem that prevents usable further processing
- FATAL_ERROR;
+ FATAL_ERROR
}
public interface ProxyRequest extends BaseRequest {
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java
Mon Jan 24 13:37:47 2011
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.servlet;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.JsonSerializer;
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.gadgets.GadgetContext;
@@ -123,7 +124,7 @@ public class JsHandler {
String prevExport = null;
for (String export : rawExports) {
if (!export.equals(prevExport)) {
- String[] pieces = export.split("\\.");
+ String[] pieces = StringUtils.split(export, "\\.");
String base = "window";
for (int i = 0; i < pieces.length; ++i) {
String symExported = (i == 0) ? pieces[0] : base + "." +
pieces[i];
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
Mon Jan 24 13:37:47 2011
@@ -568,7 +568,9 @@ public class ModulePrefs {
xformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
xformer.transform(source, result);
} catch (TransformerConfigurationException e) {
+ // ignore
} catch (TransformerException e) {
+ // ignore
}
buf.append(sw.toString());
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
Mon Jan 24 13:37:47 2011
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.spec;
+import com.google.common.base.Splitter;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.xml.XmlUtil;
import org.apache.shindig.gadgets.AuthType;
@@ -62,7 +63,7 @@ public class Preload implements RequestA
if (viewNames.length() == 0) {
this.views = ImmutableSet.of();
} else {
- this.views = ImmutableSet.copyOf(viewNames.trim().split("\\s*,+\\s*"));
+ this.views =
ImmutableSet.copyOf(Splitter.on(',').trimResults().omitEmptyStrings().split(viewNames));
}
auth = AuthType.parse(XmlUtil.getAttribute(preload, "authz"));
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java
Mon Jan 24 13:37:47 2011
@@ -22,14 +22,11 @@ import org.w3c.dom.DocumentFragment;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import com.google.inject.ImplementedBy;
-
import javax.el.ELResolver;
/**
* A Template Processor can process templates and evaluate expressions.
*/
-@ImplementedBy(DefaultTemplateProcessor.class)
public interface TemplateProcessor {
/**
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
Mon Jan 24 13:37:47 2011
@@ -28,7 +28,6 @@ import org.apache.shindig.gadgets.Render
import org.apache.shindig.gadgets.uri.UriCommon.Param;
import com.google.common.base.Objects;
-import com.google.inject.ImplementedBy;
/**
* Interface defining methods used to generate Uris for the /js servlet.
@@ -133,7 +132,6 @@ public interface JsUriManager {
}
}
- @ImplementedBy(DefaultJsVersioner.class)
public interface Versioner {
/**
* @param gadgetUri Gadget for which extern Uri was generated.
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
Mon Jan 24 13:37:47 2011
@@ -108,7 +108,7 @@ public class RenderingGadgetRewriterTest
@Before
public void setUp() throws Exception {
featureRegistry = createMock(FeatureRegistry.class);
- Map<String, ConfigContributor> configContributors =
ImmutableMap.<String,ConfigContributor>of(
+ Map<String, ConfigContributor> configContributors = ImmutableMap.of(
"core.util", new CoreUtilConfigContributor(featureRegistry),
"shindig.xhrwrapper", new XhrwrapperConfigContributor()
);
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java
Mon Jan 24 13:37:47 2011
@@ -104,7 +104,7 @@ public class StyleTagExtractorVisitorTes
replay(cssRewriter);
// Tag name isn't inspected since visit() filters this.
- List<Node> nodes = ImmutableList.<Node>of();
+ List<Node> nodes = ImmutableList.of();
Node head = addNodesToHtml(nodes);
assertFalse(getRevisitStatus(gadget, true, cssRewriter, nodes));
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizerTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizerTest.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizerTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/BMPOptimizerTest.java
Mon Jan 24 13:37:47 2011
@@ -33,7 +33,7 @@ import java.util.logging.Logger;
*/
public class BMPOptimizerTest extends BaseOptimizerTest {
- Logger log = Logger.getLogger(BMPOptimizerTest.class.getName());
+ static final Logger log = Logger.getLogger(BMPOptimizerTest.class.getName());
@Test
public void testSimpleImage() throws Exception {
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
Mon Jan 24 13:37:47 2011
@@ -90,7 +90,7 @@ public class DefaultConcatUriManagerTest
// Unique to type=CSS, split isn't supported.
Gadget gadget = mockGadget(false, false);
DefaultConcatUriManager manager = makeManager("host.com", "/foo", "token",
null);
- List<List<Uri>> resourceUris = ImmutableList.<List<Uri>>of(RESOURCES_ONE);
+ List<List<Uri>> resourceUris = ImmutableList.of(RESOURCES_ONE);
manager.make(fromList(gadget, resourceUris, ConcatUriManager.Type.CSS),
false);
}
@@ -121,7 +121,7 @@ public class DefaultConcatUriManagerTest
ConcatUriManager.Versioner versioner = makeVersioner(null, versions);
DefaultConcatUriManager manager = makeManager(host, path, splitParam,
versioner);
List<List<Uri>> resourceUris =
- ImmutableList.<List<Uri>>of(RESOURCES_ONE, RESOURCES_TWO,
RESOURCES_ONE);
+ ImmutableList.of(RESOURCES_ONE, RESOURCES_TWO, RESOURCES_ONE);
List<ConcatData> concatUris =
manager.make(fromList(gadget, resourceUris, type), false);
@@ -167,7 +167,7 @@ public class DefaultConcatUriManagerTest
String[] versions = new String[] { "v1" }; // Only one for three
resources.
ConcatUriManager.Versioner versioner = makeVersioner(null, versions);
DefaultConcatUriManager manager = makeManager(host, path, "token",
versioner);
- List<List<Uri>> resourceUris = ImmutableList.<List<Uri>>of(RESOURCES_ONE,
RESOURCES_ONE);
+ List<List<Uri>> resourceUris = ImmutableList.of(RESOURCES_ONE,
RESOURCES_ONE);
manager.make(fromList(gadget, resourceUris, ConcatUriManager.Type.JS),
true);
}
@@ -359,7 +359,7 @@ public class DefaultConcatUriManagerTest
String host = "host.com";
String path = "/concat/path";
DefaultConcatUriManager manager = makeManager(host, path, "token", null);
- List<List<Uri>> resourceUris = ImmutableList.<List<Uri>>of(RESOURCES_ONE);
+ List<List<Uri>> resourceUris = ImmutableList.of(RESOURCES_ONE);
List<ConcatData> concatUris =
manager.make(fromList(gadget, resourceUris, type), true);
@@ -390,7 +390,7 @@ public class DefaultConcatUriManagerTest
String version = "version";
ConcatUriManager.Versioner versioner = makeVersioner(null, version);
DefaultConcatUriManager manager = makeManager(host, path, "token",
versioner);
- List<List<Uri>> resourceUris = ImmutableList.<List<Uri>>of(RESOURCES_ONE);
+ List<List<Uri>> resourceUris = ImmutableList.of(RESOURCES_ONE);
List<ConcatData> concatUris =
manager.make(fromList(gadget, resourceUris, type), true);
@@ -424,7 +424,7 @@ public class DefaultConcatUriManagerTest
ConcatUriManager.Versioner versioner = makeVersioner(null, versions);
DefaultConcatUriManager manager = makeManager(host, path, "token",
versioner);
List<List<Uri>> resourceUris =
- ImmutableList.<List<Uri>>of(RESOURCES_ONE, RESOURCES_TWO,
RESOURCES_ONE);
+ ImmutableList.of(RESOURCES_ONE, RESOURCES_TWO, RESOURCES_ONE);
List<ConcatData> concatUris =
manager.make(fromList(gadget, resourceUris, type), true);
@@ -462,7 +462,7 @@ public class DefaultConcatUriManagerTest
ConcatUriManager.Versioner versioner =
makeVersioner(UriStatus.VALID_VERSIONED, versions);
DefaultConcatUriManager manager = makeManager(host, path, "token",
versioner);
List<List<Uri>> resourceUris =
- ImmutableList.<List<Uri>>of(RESOURCES_ONE, RESOURCES_TWO,
RESOURCES_ONE);
+ ImmutableList.of(RESOURCES_ONE, RESOURCES_TWO, RESOURCES_ONE);
List<ConcatData> concatUris =
manager.make(fromList(gadget, resourceUris, type), true);
@@ -485,21 +485,21 @@ public class DefaultConcatUriManagerTest
String[] versions = new String[] { "v1" }; // Only one for three
resources.
ConcatUriManager.Versioner versioner = makeVersioner(null, versions);
DefaultConcatUriManager manager = makeManager(host, path, "token",
versioner);
- List<List<Uri>> resourceUris = ImmutableList.<List<Uri>>of(RESOURCES_ONE,
RESOURCES_ONE);
+ List<List<Uri>> resourceUris = ImmutableList.of(RESOURCES_ONE,
RESOURCES_ONE);
manager.make(fromList(gadget, resourceUris, type), true);
}
private void checkMissingHostConfig(ConcatUriManager.Type type) throws
Exception {
Gadget gadget = mockGadget(false, false);
DefaultConcatUriManager manager = makeManager(null, "/foo", "token", null);
- List<List<Uri>> resourceUris = ImmutableList.<List<Uri>>of(RESOURCES_ONE);
+ List<List<Uri>> resourceUris = ImmutableList.of(RESOURCES_ONE);
manager.make(fromList(gadget, resourceUris, type), true);
}
private void checkMissingPathConfig(ConcatUriManager.Type type) throws
Exception {
Gadget gadget = mockGadget(false, false);
DefaultConcatUriManager manager = makeManager("host.com", null, "token",
null);
- List<List<Uri>> resourceUris = ImmutableList.<List<Uri>>of(RESOURCES_ONE);
+ List<List<Uri>> resourceUris = ImmutableList.of(RESOURCES_ONE);
manager.make(fromList(gadget, resourceUris, type), false);
}
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
Mon Jan 24 13:37:47 2011
@@ -56,7 +56,7 @@ public class DefaultProxyUriManagerTest
private void checkQueryStyle(boolean debug, boolean noCache, String version)
throws Exception {
String host = "host.com";
String path = "/proxy/path";
- List<Uri> resources = ImmutableList.<Uri>of(RESOURCE_1);
+ List<Uri> resources = ImmutableList.of(RESOURCE_1);
List<Uri> uris = makeAndGet(host, path, debug, noCache, resources,
version);
assertEquals(1, uris.size());
verifyQueryUri(RESOURCE_1, uris.get(0), debug, noCache, version, host,
path);
@@ -69,7 +69,7 @@ public class DefaultProxyUriManagerTest
String version = "ver";
String host = "host.com";
String path = "/proxy/path";
- List<Uri> resources = ImmutableList.<Uri>of(RESOURCE_4);
+ List<Uri> resources = ImmutableList.of(RESOURCE_4);
List<Uri> uris = makeAndGet(host, path, debug, noCache, resources,
version);
assertEquals(1, uris.size());
verifyQueryUri(new UriBuilder(RESOURCE_4).setScheme("http").toUri(),
@@ -194,7 +194,7 @@ public class DefaultProxyUriManagerTest
private void checkChainedStyle(boolean debug, boolean noCache, String
version) throws Exception {
String host = "host.com";
String path = "/proxy/" + DefaultProxyUriManager.CHAINED_PARAMS_TOKEN +
"/path";
- List<Uri> resources = ImmutableList.<Uri>of(RESOURCE_1);
+ List<Uri> resources = ImmutableList.of(RESOURCE_1);
List<Uri> uris = makeAndGet(host, path, debug, noCache, resources,
version);
assertEquals(1, uris.size());
verifyChainedUri(RESOURCE_1, uris.get(0), debug, noCache, version, false,
host, path);
@@ -213,7 +213,7 @@ public class DefaultProxyUriManagerTest
private void checkChainedStyleEndOfPath(boolean debug, boolean noCache,
String version) throws Exception {
String host = "host.com";
String path = "/proxy/" + DefaultProxyUriManager.CHAINED_PARAMS_TOKEN;
- List<Uri> resources = ImmutableList.<Uri>of(RESOURCE_1);
+ List<Uri> resources = ImmutableList.of(RESOURCE_1);
List<Uri> uris = makeAndGet(host, path, debug, noCache, resources,
version);
assertEquals(1, uris.size());
verifyChainedUri(RESOURCE_1, uris.get(0), debug, noCache, version, true,
host, path);
@@ -223,7 +223,7 @@ public class DefaultProxyUriManagerTest
public void batchedProxyQueryStyle() throws Exception {
String host = "host.com";
String path = "/proxy/path";
- List<Uri> resources = ImmutableList.<Uri>of(RESOURCE_1, RESOURCE_2,
RESOURCE_3);
+ List<Uri> resources = ImmutableList.of(RESOURCE_1, RESOURCE_2, RESOURCE_3);
String[] versions = new String[] { "v1", "v2", "v3" };
List<Uri> uris = makeAndGet(host, path, true, true, resources, versions);
assertEquals(3, uris.size());
@@ -236,7 +236,7 @@ public class DefaultProxyUriManagerTest
public void batchedProxyChainedStyle() throws Exception {
String host = "host.com";
String path = "/proxy/" + DefaultProxyUriManager.CHAINED_PARAMS_TOKEN +
"/path";
- List<Uri> resources = ImmutableList.<Uri>of(RESOURCE_1, RESOURCE_2,
RESOURCE_3);
+ List<Uri> resources = ImmutableList.of(RESOURCE_1, RESOURCE_2, RESOURCE_3);
String[] versions = new String[] { "v1", "v2", "v3" };
List<Uri> uris = makeAndGet(host, path, true, true, resources, versions);
assertEquals(3, uris.size());
@@ -249,7 +249,7 @@ public class DefaultProxyUriManagerTest
public void batchedProxyChainedStyleNoVerisons() throws Exception {
String host = "host.com";
String path = "/proxy/" + DefaultProxyUriManager.CHAINED_PARAMS_TOKEN +
"/path";
- List<Uri> resources = ImmutableList.<Uri>of(RESOURCE_1, RESOURCE_2,
RESOURCE_3);
+ List<Uri> resources = ImmutableList.of(RESOURCE_1, RESOURCE_2, RESOURCE_3);
List<Uri> uris = makeAndGet(host, path, true, true, resources);
assertEquals(3, uris.size());
for (int i = 0; i < 3; ++i) {
Modified:
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
(original)
+++
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
Mon Jan 24 13:37:47 2011
@@ -86,7 +86,7 @@ public class SocialApiGuiceModule extend
* to add or replace additional handlers.
*/
protected Set<Class<?>> getHandlers() {
- return ImmutableSet.<Class<?>> of(ActivityHandler.class,
AppDataHandler.class,
+ return ImmutableSet.of(ActivityHandler.class, AppDataHandler.class,
PersonHandler.class, MessageHandler.class, AlbumHandler.class,
MediaItemHandler.class, ActivityStreamHandler.class);
}
Modified:
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java?rev=1062771&r1=1062770&r2=1062771&view=diff
==============================================================================
---
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java
(original)
+++
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java
Mon Jan 24 13:37:47 2011
@@ -105,6 +105,7 @@ public class XSDValidator {
validator.validate(new StreamSource(xml));
} catch (IOException e) {
+ // ignore
} catch (SAXException e) {
errors.append(e.getMessage()).append('\n');
}
