You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by li...@apache.org on 2008/02/06 21:01:09 UTC
svn commit: r619129 - in /incubator/shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/
main/java/org/apache/shindig/gadgets/http/
main/java/org/apache/shindig/util/ test/java/org/apache/shindig/gadgets/
Author: lindner
Date: Wed Feb 6 12:01:07 2008
New Revision: 619129
URL: http://svn.apache.org/viewvc?rev=619129&view=rev
Log:
More minor cleanups
* Use generic specific Collections routines for Empty Maps/Lists
* Remove static qualifyer from inline enums
* Reverse constant string comparisons to simplify, avoid extra null checking
* Use java style array nomenclature instead of c-style
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicRemoteContentFetcher.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetException.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpec.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecParser.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibraryFeatureFactory.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundle.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/RemoteContent.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/UserPrefs.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpProcessingOptions.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/util/Check.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicRemoteContentFetcher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicRemoteContentFetcher.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicRemoteContentFetcher.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicRemoteContentFetcher.java Wed Feb 6 12:01:07 2008
@@ -55,7 +55,7 @@
responseCode = fetcher.getResponseCode();
headers = fetcher.getHeaderFields();
- byte chunk[] = new byte[8192];
+ byte[] chunk = new byte[8192];
int chunkSize;
InputStream in = fetcher.getInputStream();
while (out.size() < maxObjSize && (chunkSize = in.read(chunk)) != -1) {
@@ -90,7 +90,7 @@
responseCode = fetcher.getResponseCode();
headers = fetcher.getHeaderFields();
- byte chunk[] = new byte[8192];
+ byte[] chunk = new byte[8192];
int chunkSize;
InputStream in = fetcher.getInputStream();
while (out.size() < maxObjSize && (chunkSize = in.read(chunk)) != -1) {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java Wed Feb 6 12:01:07 2008
@@ -217,12 +217,11 @@
* @param feature
* @return The parameters, or an empty map.
*/
- @SuppressWarnings("unchecked")
public static Map<String, String> getFeatureParams(Gadget gadget,
String feature) {
GadgetSpec.FeatureSpec spec = gadget.getRequires().get(feature);
if (spec == null) {
- return Collections.EMPTY_MAP;
+ return Collections.emptyMap();
} else {
return spec.getParams();
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetException.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetException.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetException.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetException.java Wed Feb 6 12:01:07 2008
@@ -19,7 +19,7 @@
* the Code enumeration.
*/
public class GadgetException extends Exception {
- public static enum Code {
+ public enum Code {
// Catch-all for internal errors
INTERNAL_SERVER_ERROR,
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java Wed Feb 6 12:01:07 2008
@@ -285,7 +285,7 @@
}
private static class WorkflowDependency {
- private static enum Type {
+ private enum Type {
CORE, FEATURE_PREPARE, FEATURE_PROCESS
}
@@ -428,9 +428,10 @@
@Override
public void run(WorkflowContext wc) throws GadgetException {
- Set<String> needed = new HashSet<String>();
- Set<String> optionalNames = new HashSet<String>();
Map<String, GadgetSpec.FeatureSpec> requires = wc.gadget.getRequires();
+ Set<String> needed = new HashSet<String>(requires.size());
+ Set<String> optionalNames = new HashSet<String>();
+
for (Map.Entry<String, GadgetSpec.FeatureSpec> entry : requires.entrySet()) {
needed.add(entry.getKey());
if (entry.getValue().isOptional()) {
@@ -440,8 +441,8 @@
// Retrieve needed feature processors from registry
Set<GadgetFeatureRegistry.Entry> resultsFound =
- new HashSet<GadgetFeatureRegistry.Entry>();
- Set<String> resultsMissing = new HashSet<String>();
+ new HashSet<GadgetFeatureRegistry.Entry>(needed.size());
+ Set<String> resultsMissing = new HashSet<String>(0);
registry.getIncludedFeatures(needed, resultsFound, resultsMissing);
// Classify features this server is missing
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpec.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpec.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpec.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpec.java Wed Feb 6 12:01:07 2008
@@ -65,7 +65,7 @@
public String getDefaultValue();
public boolean isRequired();
- public static enum DataType {
+ public enum DataType {
STRING, HIDDEN, BOOL, ENUM, LIST, NUMBER
}
@@ -76,7 +76,7 @@
public List<UserPref> getUserPrefs();
- public static enum ContentType {
+ public enum ContentType {
HTML, URL
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecParser.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecParser.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecParser.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecParser.java Wed Feb 6 12:01:07 2008
@@ -77,9 +77,8 @@
NodeList modulePrefs = root.getElementsByTagName("ModulePrefs");
if (modulePrefs.getLength() != 1) {
throw new SpecParserException("Missing or duplicated <ModulePrefs>");
- } else {
- processModulePrefs(id, modulePrefs.item(0), spec);
}
+ processModulePrefs(id, modulePrefs.item(0), spec);
NodeList userPrefs = root.getElementsByTagName("UserPref");
for (int i = 0, j = userPrefs.getLength(); i < j; ++i) {
@@ -120,9 +119,8 @@
Node title = attrs.getNamedItem("title");
if (null == title) {
throw new SpecParserException("Missing \"title\" attribute.");
- } else {
- spec.title = title.getNodeValue();
}
+ spec.title = title.getNodeValue();
Node titleUrl = attrs.getNamedItem("title_url");
if (null != titleUrl) {
@@ -182,7 +180,7 @@
}
boolean rightToLeft = false;
- if (rtlAttr != null && rtlAttr.getTextContent().equals("rtl")) {
+ if ("rtl".equals(rtlAttr.getTextContent())) {
rightToLeft = true;
}
@@ -216,9 +214,8 @@
Node name = attrs.getNamedItem("name");
if (null == name) {
throw new SpecParserException("All UserPrefs must have name attributes.");
- } else {
- up.name = name.getNodeValue();
}
+ up.name = name.getNodeValue();
Node displayName = attrs.getNamedItem("display_name");
if (null != displayName) {
@@ -270,7 +267,7 @@
Node type = attrs.getNamedItem("type");
if (null == type) {
throw new SpecParserException("No content type specified!");
- } else if (type.getNodeValue().equals("url")) {
+ } else if ("url".equals(type.getNodeValue())) {
spec.contentType = GadgetSpec.ContentType.URL;
Node href = attrs.getNamedItem("href");
if (href != null) {
@@ -284,7 +281,7 @@
spec.contentType = GadgetSpec.ContentType.HTML;
Node viewNode = attrs.getNamedItem("view");
String viewStr = (viewNode == null) ? "" : viewNode.getNodeValue();
- String views[] = viewStr.split(",");
+ String[] views = viewStr.split(",");
Node child = content.getFirstChild();
String contentData = content.getTextContent();
if (contentData.length() > 0) {
@@ -321,7 +318,7 @@
NodeList children = feature.getChildNodes();
for (int i = 0, j = children.getLength(); i < j; ++i) {
Node child = children.item(i);
- if (child.getNodeName().equals("Param")) {
+ if ("Param".equals(child.getNodeName())) {
NamedNodeMap paramAttrs = child.getAttributes();
Node paramName = paramAttrs.getNamedItem("name");
if (paramName != null) {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java Wed Feb 6 12:01:07 2008
@@ -114,7 +114,7 @@
for (File file : files) {
if (file.isDirectory()) {
loadFiles(file.listFiles(), features);
- } else if (file.getName().equals("feature.xml")) {
+ } else if ("feature.xml".equals(file.getName())) {
ParsedFeature feature = processFile(file);
if (feature != null) {
features.put(feature.name, feature);
@@ -146,7 +146,7 @@
Enumeration<URL> mappedResources = cl.getResources(file);
while (mappedResources.hasMoreElements()) {
URL resourceUrl = mappedResources.nextElement();
- if (resourceUrl.getProtocol().equals("file")) {
+ if ("file".equals(resourceUrl.getProtocol())) {
File f = new File(resourceUrl.toURI());
loadFiles(new File[]{f}, features);
} else {
@@ -349,7 +349,7 @@
for (int i = 0, j = libraries.getLength(); i < j; ++i) {
Node node = libraries.item(i);
String nodeValue = node.getNodeName();
- if (nodeValue != null && nodeValue.equals("script")) {
+ if ("script".equals(nodeValue)) {
NamedNodeMap attrs = node.getAttributes();
Node srcNode = attrs.getNamedItem("src");
String content;
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java Wed Feb 6 12:01:07 2008
@@ -52,18 +52,18 @@
/**
* Indicates how to load a given resource.
*/
- public static enum Type {
+ public enum Type {
FILE, RESOURCE, URL, INLINE;
/**
* Returns the type named by the given string.
*/
public static Type parse(String name) {
- if (name.equals("file")) {
+ if ("file".equals(name)) {
return FILE;
- } else if (name.equals("url")) {
+ } else if ("url".equals(name)) {
return URL;
- } else if (name.equals("resource")) {
+ } else if ("resource".equals(name)) {
return RESOURCE;
} else {
return INLINE;
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibraryFeatureFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibraryFeatureFactory.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibraryFeatureFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibraryFeatureFactory.java Wed Feb 6 12:01:07 2008
@@ -64,10 +64,9 @@
* @param gadgetLibrary The library for the gadget, may be null.
* @param containerLibrary The library for the container, may be null.
*/
- @SuppressWarnings("unchecked")
public JsLibraryFeature(JsLibrary gadgetLibrary, JsLibrary containerLibrary) {
if (gadgetLibrary == null) {
- gadgetLibraries = Collections.EMPTY_LIST;
+ gadgetLibraries = Collections.emptyList();
} else {
gadgetLibraries = new LinkedList<JsLibrary>();
gadgetLibraries.add(gadgetLibrary);
@@ -75,7 +74,7 @@
}
if (containerLibrary == null) {
- containerLibraries = Collections.EMPTY_LIST;
+ containerLibraries = Collections.emptyList();
} else {
containerLibraries = new LinkedList<JsLibrary>();
containerLibraries.add(containerLibrary);
@@ -88,11 +87,10 @@
* @param gLibraries Libraries to serve for the gadget.
* @param cLibraries Libraries to serve for the container.
*/
- @SuppressWarnings("unchecked")
public JsLibraryFeature(List<JsLibrary> gLibraries,
List<JsLibrary> cLibraries) {
if (gLibraries == null) {
- gadgetLibraries = Collections.EMPTY_LIST;
+ gadgetLibraries = Collections.emptyList();
} else {
gadgetLibraries = new LinkedList<JsLibrary>();
gadgetLibraries.addAll(gLibraries);
@@ -100,7 +98,7 @@
}
if (cLibraries == null) {
- containerLibraries = Collections.EMPTY_LIST;
+ containerLibraries = Collections.emptyList();
} else {
containerLibraries = new LinkedList<JsLibrary>();
containerLibraries.addAll(cLibraries);
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundle.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundle.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundle.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundle.java Wed Feb 6 12:01:07 2008
@@ -36,8 +36,7 @@
this.messages = Collections.unmodifiableMap(tempMap);
}
- @SuppressWarnings("unchecked")
private MessageBundle() {
- this.messages = Collections.EMPTY_MAP;
+ this.messages = Collections.emptyMap();
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/RemoteContent.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/RemoteContent.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/RemoteContent.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/RemoteContent.java Wed Feb 6 12:01:07 2008
@@ -73,11 +73,10 @@
* @param name
* @return All headers with the given name.
*/
- @SuppressWarnings("unchecked")
public List<String> getHeaders(String name) {
List<String> ret = headers.get(name);
if (ret == null) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
} else {
return Collections.unmodifiableList(ret);
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/UserPrefs.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/UserPrefs.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/UserPrefs.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/UserPrefs.java Wed Feb 6 12:01:07 2008
@@ -50,9 +50,8 @@
/**
* Creates an empty user prefs object.
*/
- @SuppressWarnings("unchecked")
private UserPrefs() {
// just use the empty map.
- this.prefs = Collections.EMPTY_MAP;
+ this.prefs = Collections.emptyMap();
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java Wed Feb 6 12:01:07 2008
@@ -92,7 +92,6 @@
}
@Override
- @SuppressWarnings("unchecked")
public void init(ServletConfig config) {
ServletContext context = config.getServletContext();
String jsPath = context.getInitParameter("js-service-path");
@@ -189,10 +188,12 @@
case URL:
outputUrlGadget(gadget, options, resp);
break;
- default:
- resp.sendError(HttpServletResponse.SC_BAD_REQUEST,
- "Unexpected reror: unknown gadget type");
- break;
+ // default makes no sense here, as this is an enum, we want to insure that
+ // we cover all cases of the enum, so leave it out.
+// default:
+// resp.sendError(HttpServletResponse.SC_BAD_REQUEST,
+// "Unexpected reror: unknown gadget type");
+// break;
}
}
@@ -402,6 +403,6 @@
*/
protected boolean getUseCaja(HttpServletRequest req) {
String cajaParam = req.getParameter(CAJA_PARAM);
- return cajaParam != null && cajaParam.equals("1");
+ return "1".equals(cajaParam);
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpProcessingOptions.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpProcessingOptions.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpProcessingOptions.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpProcessingOptions.java Wed Feb 6 12:01:07 2008
@@ -51,7 +51,7 @@
if (noCacheParam == null) {
noCacheParam = req.getParameter("bpc");
}
- return noCacheParam != null && noCacheParam.equals("1");
+ return "1".equals(noCacheParam);
}
/**
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java Wed Feb 6 12:01:07 2008
@@ -97,7 +97,7 @@
if (registry.getIncludedFeatures(needed, found, missing)) {
String containerParam = req.getParameter("c");
RenderingContext context;
- context = containerParam != null && containerParam.equals("1") ?
+ context = "1".equals(containerParam) ?
RenderingContext.CONTAINER :
RenderingContext.GADGET;
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java Wed Feb 6 12:01:07 2008
@@ -131,7 +131,7 @@
private RemoteContent fetchContent(URL signedUrl, HttpServletRequest request,
ProcessingOptions procOptions) throws ServletException {
try {
- if (request.getMethod().equals("POST")) {
+ if ("POST".equals(request.getMethod())) {
String data = request.getParameter("postData");
return fetcher.fetchByPost(signedUrl,
URLDecoder.decode(data, request.getCharacterEncoding()).getBytes(),
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyServlet.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyServlet.java Wed Feb 6 12:01:07 2008
@@ -36,7 +36,7 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
String output = request.getParameter("output");
- if (output != null && output.equals("js")) {
+ if ("js".equals(output)) {
handler.fetchJson(request, response, signer);
} else {
handler.fetch(request, response, signer);
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/util/Check.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/util/Check.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/util/Check.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/util/Check.java Wed Feb 6 12:01:07 2008
@@ -53,7 +53,13 @@
*Check.that(string, anyOf(startsWith("foo"), endsWith("bar")));</pre>
*/
public final class Check {
- /**
+ /**
+ * Private constructor for this class, do not allow instantiation
+ */
+ private Check() {
+ }
+
+ /**
* Checks that {@code condition} is {@code true}.
*
* @throws IllegalStateException if the check fails.
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java?rev=619129&r1=619128&r2=619129&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/BasicGadgetBlacklistTest.java Wed Feb 6 12:01:07 2008
@@ -28,6 +28,7 @@
@Override
protected void setUp() throws Exception {
+ super.setUp();
someUri = new URI("http://bla.com/foo.xml");
}