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 2009/01/07 21:03:15 UTC
svn commit: r732453 [2/3] - in /incubator/shindig/branches/1.0.x-incubating:
./ java/common/ 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/cry...
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.gadgets.servlet;
+import com.google.common.collect.ImmutableSet;
+
import org.apache.shindig.common.ContainerConfig;
import org.apache.shindig.common.servlet.InjectedServlet;
import org.apache.shindig.gadgets.GadgetFeature;
@@ -70,12 +72,7 @@
0, resourceName.length() - ".js".length());
}
- Set<String> needed = new HashSet<String>();
- if (resourceName.contains(":")) {
- needed.addAll(Arrays.asList(resourceName.split(":")));
- } else {
- needed.add(resourceName);
- }
+ Set<String> needed = ImmutableSet.of(resourceName.split(":"));
String debugStr = req.getParameter("debug");
String container = req.getParameter("container");
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java Wed Jan 7 12:03:12 2009
@@ -18,6 +18,8 @@
*/
package org.apache.shindig.gadgets.servlet;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.RenderingContext;
import org.apache.shindig.gadgets.UserPrefs;
@@ -196,7 +198,7 @@
if (prefs == null) {
return null;
}
- Map<String, String> p = new HashMap<String, String>();
+ Map<String, String> p = Maps.newHashMap();
Iterator i = prefs.keys();
while (i.hasNext()) {
String key = (String)i.next();
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java Wed Jan 7 12:03:12 2009
@@ -29,6 +29,7 @@
import org.apache.shindig.gadgets.spec.UserPref;
import org.apache.shindig.gadgets.spec.View;
+import com.google.common.collect.Lists;
import com.google.inject.Inject;
import org.json.JSONArray;
@@ -74,7 +75,7 @@
// Process all JSON first so that we don't wind up with hanging threads if
// a JSONException is thrown.
- gadgets = new ArrayList<GadgetContext>(requestedGadgets.length());
+ gadgets = Lists.newArrayListWithExpectedSize(requestedGadgets.length());
for (int i = 0, j = requestedGadgets.length(); i < j; ++i) {
GadgetContext context = new JsonRpcGadgetContext(
requestContext, requestedGadgets.getJSONObject(i));
@@ -219,7 +220,7 @@
private List<JSONObject> getOrderedEnums(UserPref pref) throws JSONException {
List<UserPref.EnumValuePair> orderedEnums = pref.getOrderedEnumValues();
- List<JSONObject> jsonEnums = new ArrayList<JSONObject>(orderedEnums.size());
+ List<JSONObject> jsonEnums = Lists.newArrayListWithExpectedSize(orderedEnums.size());
for (UserPref.EnumValuePair evp : orderedEnums) {
JSONObject curEnum = new JSONObject();
curEnum.put("value", evp.getValue());
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java Wed Jan 7 12:03:12 2009
@@ -27,6 +27,8 @@
import org.apache.shindig.gadgets.rewrite.ContentRewriterRegistry;
import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
+
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -36,6 +38,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
@@ -48,7 +51,7 @@
public class ProxyHandler extends ProxyBase {
private static final Logger logger = Logger.getLogger(ProxyHandler.class.getName());
- private static final Collection<String> DISALLOWED_RESPONSE_HEADERS = Sets.newHashSet(
+ private static final Set<String> DISALLOWED_RESPONSE_HEADERS = ImmutableSet.of(
"set-cookie", "content-length", "content-encoding", "etag", "last-modified" ,"accept-ranges",
"vary", "expires", "date", "pragma", "cache-control"
);
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java Wed Jan 7 12:03:12 2009
@@ -18,6 +18,8 @@
*/
package org.apache.shindig.gadgets.servlet;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.common.util.Utf8UrlCoder;
import java.util.Collections;
@@ -48,7 +50,7 @@
= CHAINED_SYNTAX_PATTERN.matcher(request.getRequestURI());
usingChainedSyntax = chainedMatcher.matches();
if (usingChainedSyntax) {
- extractedParameters = new HashMap<String, String>();
+ extractedParameters = Maps.newHashMap();
Matcher paramMatcher
= PARAMETER_PAIR_PATTERN.matcher(chainedMatcher.group(1));
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java Wed Jan 7 12:03:12 2009
@@ -16,6 +16,9 @@
* specific language governing permissions and limitations under the License.
*/
package org.apache.shindig.gadgets.spec;
+
+import com.google.common.collect.ImmutableMap;
+
import org.apache.shindig.common.xml.XmlUtil;
import org.w3c.dom.Element;
@@ -96,7 +99,8 @@
this.name = name;
NodeList children = feature.getElementsByTagName("Param");
if (children.getLength() > 0) {
- Map<String, String> params = new HashMap<String, String>(children.getLength(),1);
+ ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+
for (int i = 0, j = children.getLength(); i < j; ++i) {
Element param = (Element)children.item(i);
String paramName = XmlUtil.getAttribute(param, "name");
@@ -105,7 +109,7 @@
}
params.put(paramName, param.getTextContent());
}
- this.params = Collections.unmodifiableMap(params);
+ this.params = params.build();
} else {
this.params = Collections.emptyMap();
}
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,11 @@
*/
package org.apache.shindig.gadgets.spec;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.util.HashUtil;
import org.apache.shindig.common.xml.XmlException;
@@ -58,8 +63,8 @@
NodeList children = doc.getChildNodes();
ModulePrefs modulePrefs = null;
- List<UserPref> userPrefs = new LinkedList<UserPref>();
- Map<String, List<Element>> views = new HashMap<String, List<Element>>();
+ List<UserPref> userPrefs = Lists.newLinkedList();
+ Map<String, List<Element>> views = Maps.newHashMap();
for (int i = 0, j = children.getLength(); i < j; ++i) {
Node child = children.item(i);
if (!(child instanceof Element)) {
@@ -85,7 +90,7 @@
view = view.trim();
List<Element> viewElements = views.get(view);
if (viewElements == null) {
- viewElements = new LinkedList<Element>();
+ viewElements = Lists.newLinkedList();
views.put(view, viewElements);
}
viewElements.add(element);
@@ -102,18 +107,17 @@
if (views.isEmpty()) {
throw new SpecParserException("At least 1 Content is required.");
} else {
- Map<String, View> tmpViews = new HashMap<String, View>();
+ Map<String, View> tmpViews = Maps.newHashMap();
for (Map.Entry<String, List<Element>> view : views.entrySet()) {
View v = new View(view.getKey(), view.getValue(), url);
tmpViews.put(v.getName(), v);
}
- this.views = Collections.unmodifiableMap(tmpViews);
+ this.views = ImmutableMap.copyOf(tmpViews);
}
-
- if (!userPrefs.isEmpty()) {
- this.userPrefs = Collections.unmodifiableList(userPrefs);
+ if (userPrefs.isEmpty()) {
+ this.userPrefs = Collections.emptyList();
} else {
- this.userPrefs = Collections.emptyList();
+ this.userPrefs = ImmutableList.copyOf(userPrefs);
}
}
@@ -201,20 +205,22 @@
public GadgetSpec substitute(Substitutions substituter) {
GadgetSpec spec = new GadgetSpec(this);
spec.modulePrefs = modulePrefs.substitute(substituter);
+
if (userPrefs.isEmpty()) {
spec.userPrefs = Collections.emptyList();
} else {
- List<UserPref> prefs = new ArrayList<UserPref>(userPrefs.size());
+ List<UserPref> prefs = Lists.newArrayListWithExpectedSize(userPrefs.size());
for (UserPref pref : userPrefs) {
prefs.add(pref.substitute(substituter));
}
- spec.userPrefs = Collections.unmodifiableList(prefs);
+ spec.userPrefs = ImmutableList.copyOf(prefs);
}
- Map<String, View> viewMap = new HashMap<String, View>(views.size());
+
+ ImmutableMap.Builder<String, View> viewMap = ImmutableMap.builder();
for (View view : views.values()) {
viewMap.put(view.getName(), view.substitute(substituter));
}
- spec.views = Collections.unmodifiableMap(viewMap);
+ spec.views = viewMap.build();
return spec;
}
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/MessageBundle.java Wed Jan 7 12:03:12 2009
@@ -20,6 +20,7 @@
import org.apache.shindig.common.xml.XmlException;
import org.apache.shindig.common.xml.XmlUtil;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import org.json.JSONObject;
@@ -126,8 +127,8 @@
private Map<String, String> parseMessages(Element element)
throws SpecParserException {
NodeList nodes = element.getElementsByTagName("msg");
- Map<String, String> messages
- = new HashMap<String, String>(nodes.getLength(), 1);
+
+ ImmutableMap.Builder<String, String> messages = ImmutableMap.builder();
for (int i = 0, j = nodes.getLength(); i < j; ++i) {
Element msg = (Element)nodes.item(i);
@@ -138,7 +139,7 @@
}
messages.put(name, msg.getTextContent().trim());
}
- return Collections.unmodifiableMap(messages);
+ return messages.build();
}
@Override
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java Wed Jan 7 12:03:12 2009
@@ -19,6 +19,9 @@
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.variables.Substitutions;
+import com.google.common.base.Join;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -73,7 +76,7 @@
public ModulePrefs(Element element, Uri base) throws SpecParserException {
this.base = base;
- attributes = new HashMap<String, String>();
+ attributes = Maps.newHashMap();
NamedNodeMap attributeNodes = element.getAttributes();
for (int i = 0; i < attributeNodes.getLength(); i++) {
Node node = attributeNodes.item(i);
@@ -95,14 +98,15 @@
LocaleVisitor localeVisitor = new LocaleVisitor();
LinkVisitor linkVisitor = new LinkVisitor();
- Map<String, ElementVisitor> visitors = Maps.newHashMapWithExpectedSize(6);
- visitors.put("Preload", preloadVisitor);
- visitors.put("Optional", featureVisitor);
- visitors.put("Require", featureVisitor);
- visitors.put("OAuth", oauthVisitor);
- visitors.put("Icon", iconVisitor);
- visitors.put("Locale", localeVisitor);
- visitors.put("Link", linkVisitor);
+ Map<String, ElementVisitor> visitors = new ImmutableMap.Builder<String,ElementVisitor>()
+ .put("Preload", preloadVisitor)
+ .put("Optional", featureVisitor)
+ .put("Require", featureVisitor)
+ .put("OAuth", oauthVisitor)
+ .put("Icon", iconVisitor)
+ .put("Locale", localeVisitor)
+ .put("Link", linkVisitor)
+ .build();
walk(element, visitors);
@@ -124,32 +128,31 @@
locales = prefs.getLocales();
oauth = prefs.oauth;
- List<Preload> preloads = new ArrayList<Preload>(prefs.preloads.size());
+ List<Preload> preloads = Lists.newArrayList();
for (Preload preload : prefs.preloads) {
preloads.add(preload.substitute(substituter));
}
- this.preloads = Collections.unmodifiableList(preloads);
+ this.preloads = ImmutableList.copyOf(preloads);
- List<Icon> icons = new ArrayList<Icon>(prefs.icons.size());
+ List<Icon> icons = Lists.newArrayList();
for (Icon icon : prefs.icons) {
icons.add(icon.substitute(substituter));
}
- this.icons = Collections.unmodifiableList(icons);
+ this.icons = ImmutableList.copyOf(icons);
- Map<String, LinkSpec> links = new HashMap<String, LinkSpec>(prefs.links.size());
+ ImmutableMap.Builder<String, LinkSpec> links = ImmutableMap.builder();
for (LinkSpec link : prefs.links.values()) {
LinkSpec sub = link.substitute(substituter);
links.put(sub.getRel(), sub);
}
- this.links = Collections.unmodifiableMap(links);
+ this.links = links.build();
- Map<String, String> attributes
- = new HashMap<String, String>(prefs.attributes.size());
+ ImmutableMap.Builder<String, String> attributes = ImmutableMap.builder();
for (Map.Entry<String, String> attr : prefs.attributes.entrySet()) {
String substituted = substituter.substituteString(attr.getValue());
attributes.put(attr.getKey(), substituted);
}
- this.attributes = Collections.unmodifiableMap(attributes);
+ this.attributes = attributes.build();
}
// Canonical spec items first.
@@ -519,21 +522,12 @@
}
buf.append(">\n");
- for (Preload preload : preloads) {
- buf.append(preload).append('\n');
- }
- for (Feature feature : features.values()) {
- buf.append(feature).append('\n');
- }
- for (Icon icon : icons) {
- buf.append(icon).append('\n');
- }
- for (LocaleSpec locale : locales.values()) {
- buf.append(locale).append('\n');
- }
- for (LinkSpec link : links.values()) {
- buf.append(link).append('\n');
- }
+ Join.join(buf, "\n", preloads);
+ Join.join(buf, "\n", features.values());
+ Join.join(buf, "\n", icons);
+ Join.join(buf, "\n", locales.values());
+ Join.join(buf, "\n", links.values());
+
if (oauth != null) {
buf.append(oauth).append('\n');
}
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java Wed Jan 7 12:03:12 2009
@@ -18,6 +18,8 @@
*/
package org.apache.shindig.gadgets.spec;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.xml.XmlUtil;
@@ -127,10 +129,9 @@
public enum Method {
GET, POST;
- private static Map<String, Method> METHODS;
+ private static Map<String, Method> METHODS = Maps.newHashMap();
static {
- METHODS = new HashMap<String, Method>();
for (Method m : Method.values()) {
METHODS.put(m.toString(), m);
}
@@ -160,7 +161,7 @@
private static Map<String, Location> LOCATIONS;
static {
- LOCATIONS = new HashMap<String, Location>();
+ LOCATIONS = Maps.newHashMap();
for (Location l : Location.values()) {
LOCATIONS.put(l.locationString, l);
}
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.gadgets.spec;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.common.uri.Uri;
import org.w3c.dom.Element;
@@ -38,7 +40,7 @@
private final Map<String, OAuthService> serviceMap;
public OAuthSpec(Element element, Uri base) throws SpecParserException {
- serviceMap = new HashMap<String, OAuthService>();
+ serviceMap = Maps.newHashMap();
NodeList services = element.getElementsByTagName("Service");
for (int i=0; i < services.getLength(); ++i) {
Node node = services.item(i);
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java Wed Jan 7 12:03:12 2009
@@ -24,6 +24,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import org.apache.commons.lang.StringUtils;
import org.w3c.dom.Element;
@@ -60,7 +61,7 @@
// Record all the associated views
String viewNames = XmlUtil.getAttribute(preload, "views", "");
- Set<String> views = new HashSet<String>();
+ Set<String> views = Sets.newHashSet();
for (String s : viewNames.split(",")) {
s = s.trim();
if (s.length() > 0) {
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,10 @@
*/
package org.apache.shindig.gadgets.spec;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.common.xml.XmlUtil;
import org.apache.shindig.gadgets.variables.Substitutions;
@@ -110,17 +114,16 @@
if (enumValues.isEmpty()) {
pref.enumValues = Collections.emptyMap();
} else {
- Map<String, String> values = new HashMap<String, String>(enumValues.size());
+ Map<String, String> values = Maps.newHashMapWithExpectedSize(enumValues.size());
for (Map.Entry<String, String> entry : enumValues.entrySet()) {
values.put(entry.getKey(), substituter.substituteString(entry.getValue()));
}
- pref.enumValues = Collections.unmodifiableMap(values);
+ pref.enumValues = ImmutableMap.copyOf(values);
}
if (orderedEnumValues.isEmpty()) {
pref.orderedEnumValues = Collections.emptyList();
} else {
- List<EnumValuePair> orderedValues
- = new LinkedList<EnumValuePair>();
+ List<EnumValuePair> orderedValues = Lists.newLinkedList();
for (EnumValuePair evp : orderedEnumValues) {
orderedValues.add(new EnumValuePair(evp.getValue(),
substituter.substituteString(evp.getDisplayValue())));
@@ -181,8 +184,8 @@
NodeList children = element.getElementsByTagName("EnumValue");
if (children.getLength() > 0) {
- Map<String, String> enumValues = new HashMap<String, String>();
- List<EnumValuePair> orderedEnumValues = new LinkedList<EnumValuePair>();
+ Map<String, String> enumValues = Maps.newHashMap();
+ List<EnumValuePair> orderedEnumValues = Lists.newLinkedList();
for (int i = 0, j = children.getLength(); i < j; ++i) {
Element child = (Element)children.item(i);
String value = XmlUtil.getAttribute(child, "value");
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java Wed Jan 7 12:03:12 2009
@@ -26,6 +26,8 @@
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.spec.GadgetSpec;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import junitx.framework.StringAssert;
@@ -83,9 +85,7 @@
}
public void testGetBundledJsParam() throws Exception {
- List<String> features = new ArrayList<String>();
- features.add("foo");
- features.add("bar");
+ List<String> features = ImmutableList.of("foo", "bar");
expect(context.getDebug()).andReturn(true);
replay();
@@ -96,7 +96,7 @@
}
public void testGetBundledJsParamWithBadFeatureName() throws Exception {
- List<String> features = new ArrayList<String>();
+ List<String> features = Lists.newArrayList();
features.add("foo!");
features.add("bar");
expect(context.getDebug()).andReturn(true);
@@ -108,7 +108,7 @@
}
public void testGetBundledJsParamWithNoFeatures() throws Exception {
- List<String> features = new ArrayList<String>();
+ List<String> features = Lists.newArrayList();
expect(context.getDebug()).andReturn(false);
replay();
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/EasyMockTestCase.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/EasyMockTestCase.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/EasyMockTestCase.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/EasyMockTestCase.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.gadgets;
+import com.google.common.collect.Lists;
+
import org.easymock.classextension.EasyMock;
import junit.framework.TestCase;
@@ -24,9 +26,10 @@
import java.util.ArrayList;
import java.util.List;
+
public abstract class EasyMockTestCase extends TestCase {
/** Tracks all EasyMock objects created for a test. */
- private final List<Object> mocks = new ArrayList<Object>();
+ private final List<Object> mocks = Lists.newArrayList();
public EasyMockTestCase() {
super();
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java Wed Jan 7 12:03:12 2009
@@ -23,6 +23,7 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -63,7 +64,7 @@
private GadgetFeature makeFeature(String name, String content, String dep)
throws GadgetException {
JsLibrary lib = JsLibrary.create(JsLibrary.Type.INLINE, content, name, null);
- List<String> deps = new LinkedList<String>();
+ List<String> deps = Lists.newLinkedList();
if (deps != null) {
deps.add(dep);
}
@@ -89,7 +90,7 @@
@Test
public void getUnknownLibraries() throws GadgetException {
registry.register(makeFeature(FEATURE_NAME, CONTENT, DEP_NAME));
- List<String> unsupported = new ArrayList<String>();
+ List<String> unsupported = Lists.newArrayList();
registry.getFeatures(Arrays.asList(FEATURE_NAME, "FAKE FAKE FAKE"),
unsupported);
assertEquals("FAKE FAKE FAKE", unsupported.get(0));
@@ -102,7 +103,7 @@
registry.register(makeFeature("feat0", CONTENT, DEP_NAME));
registry.register(makeFeature("feat1", CONTENT, DEP_NAME));
- Set<String> setKeys = Sets.immutableSortedSet("feat0", "feat1");
+ Set<String> setKeys = ImmutableSortedSet.of("feat0", "feat1");
List<String> listKeys = Lists.newLinkedList("feat0", "feat1");
Collection<String> collectKeys
= Collections.unmodifiableCollection(Lists.newArrayList("feat0", "feat1"));
@@ -128,7 +129,7 @@
registry.register(makeFeature(feature, CONTENT, DEP_NAME));
}
- Set<String> found = new HashSet<String>();
+ Set<String> found = Sets.newHashSet();
for (GadgetFeature feature : registry.getAllFeatures()) {
found.add(feature.getName());
}
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.gadgets;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.common.ContainerConfig;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.http.HttpRequest;
@@ -149,7 +151,7 @@
file2.getAbsolutePath(), registry);
Collection<GadgetFeature> features = registry.getAllFeatures();
- Map<String, GadgetFeature> map = new HashMap<String, GadgetFeature>();
+ Map<String, GadgetFeature> map = Maps.newHashMap();
for (GadgetFeature feature : features) {
map.put(feature.getName(), feature);
}
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpCacheTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpCacheTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpCacheTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/AbstractHttpCacheTest.java Wed Jan 7 12:03:12 2009
@@ -20,6 +20,8 @@
import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.replay;
+import com.google.common.collect.Maps;
+
import org.easymock.classextension.EasyMock;
import junit.framework.TestCase;
@@ -61,7 +63,7 @@
public TestHttpCache() {
super();
- map = new HashMap<String, HttpResponse>();
+ map = Maps.newHashMap();
}
@Override
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java Wed Jan 7 12:03:12 2009
@@ -23,6 +23,8 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.auth.AnonymousSecurityToken;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.AuthType;
@@ -69,7 +71,7 @@
@Test
public void getHeader() throws Exception {
- Map<String, List<String>> headers = new HashMap<String, List<String>>();
+ Map<String, List<String>> headers = Maps.newHashMap();
headers.put(TEST_HEADER_KEY, Arrays.asList(TEST_HEADER_VALUE));
HttpRequest request = new HttpRequest(DEFAULT_URI)
.addHeader(TEST_HEADER_KEY, TEST_HEADER_VALUE);
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.gadgets.http;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import static org.junit.Assert.assertEquals;
@@ -56,7 +57,7 @@
@Test
public void addHeadersMap() {
- Map<String, String> headers = Maps.immutableMap("foo", "bar", "blah", "blah");
+ Map<String, String> headers = ImmutableMap.of("foo", "bar", "blah", "blah");
HttpResponseBuilder builder = new HttpResponseBuilder()
.addHeaders(headers);
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/GadgetCssRuleTest.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.gadgets.parse;
+import com.google.common.collect.Lists;
+
import static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.replay;
import org.easymock.classextension.EasyMock;
@@ -43,14 +45,13 @@
private ParsedCssRule makeParsedRule(String[] selectors, String[][] decls) {
ParsedCssRule parsedMock = EasyMock.createNiceMock(ParsedCssRule.class);
- List<String> selectorList = new LinkedList<String>();
+ List<String> selectorList = Lists.newLinkedList();
for (String sel : selectors) {
selectorList.add(sel);
}
expect(parsedMock.getSelectors()).andReturn(selectorList).anyTimes();
- List<ParsedCssDeclaration> declList =
- new LinkedList<ParsedCssDeclaration>();
+ List<ParsedCssDeclaration> declList = Lists.newLinkedList();
for (String[] decl : decls) {
declList.add(makeParsedDecl(decl[0], decl[1]));
}
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderServiceTest.java Wed Jan 7 12:03:12 2009
@@ -26,6 +26,7 @@
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.spec.GadgetSpec;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import org.junit.Test;
@@ -45,7 +46,7 @@
private static final String PRELOAD_STRING_VALUE = "Some random string";
private static final Integer PRELOAD_NUMERIC_VALUE = 5;
private static final Map<String, String> PRELOAD_MAP_VALUE
- = Maps.immutableMap("foo", "bar", "baz", "blah");
+ = ImmutableMap.of("foo", "bar", "baz", "blah");
private final TestPreloader preloader = new TestPreloader();
private final TestPreloader preloader2 = new TestPreloader();
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java Wed Jan 7 12:03:12 2009
@@ -35,6 +35,7 @@
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
import org.apache.shindig.gadgets.spec.GadgetSpec;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -57,7 +58,7 @@
private static final String PRELOAD_CONTENT = "Preloaded data";
private static final String CONTAINER = "some-container";
private static final Uri GADGET_URL = Uri.parse("http://example.org/gadget.xml");
- private static final Map<String, String> PRELOAD_METADATA = Maps.immutableMap("foo", "bar");
+ private static final Map<String, String> PRELOAD_METADATA = ImmutableMap.of("foo", "bar");
private final RecordingHttpFetcher plainFetcher = new RecordingHttpFetcher();
private final RecordingHttpFetcher oauthFetcher = new RecordingHttpFetcher();
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingContentRewriterTest.java Wed Jan 7 12:03:12 2009
@@ -37,6 +37,7 @@
import org.apache.shindig.gadgets.spec.View;
import com.google.caja.util.Join;
+import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -240,7 +241,7 @@
String rewritten = rewrite(gadget, "");
Set<String> actual = getInjectedScript(rewritten);
- Set<String> expected = Sets.immutableSortedSet("foo", "bar", "baz");
+ Set<String> expected = ImmutableSortedSet.of("foo", "bar", "baz");
assertEquals(expected, actual);
}
@@ -293,7 +294,7 @@
String rewritten = rewrite(gadget, "");
Set<String> actual = getInjectedScript(rewritten);
- Set<String> expected = Sets.immutableSortedSet("bar", "baz");
+ Set<String> expected = ImmutableSortedSet.of("bar", "baz");
assertEquals(expected, actual);
assertTrue("Requested scripts not inlined.", rewritten.contains("foo_content();"));
}
@@ -380,7 +381,7 @@
String rewritten = rewrite(gadget, "");
Set<String> actual = getInjectedScript(rewritten);
- Set<String> expected = Sets.immutableSortedSet("baz");
+ Set<String> expected = ImmutableSortedSet.of("baz");
assertEquals(expected, actual);
assertTrue("Requested scripts not inlined.", rewritten.contains("foo_content();"));
assertTrue("Forced external file not forced.",
@@ -632,7 +633,7 @@
throw new PreloadException("broken");
}
public Set<String> getKeys() {
- return Sets.immutableSortedSet("foo");
+ return ImmutableSortedSet.of("foo");
}
};
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/lexer/HtmlRewriterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/lexer/HtmlRewriterTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/lexer/HtmlRewriterTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/lexer/HtmlRewriterTest.java Wed Jan 7 12:03:12 2009
@@ -18,6 +18,8 @@
*/
package org.apache.shindig.gadgets.rewrite.lexer;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.rewrite.BaseRewriterTestCase;
@@ -37,7 +39,7 @@
protected void setUp() throws Exception {
super.setUp();
dummyUri = Uri.parse("http://www.w3c.org");
- defaultTransformerMap = new HashMap<String, HtmlTagTransformer>();
+ defaultTransformerMap = Maps.newHashMap();
}
private void validateRewritten(String content, Uri base,
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/lexer/JavascriptTagMergerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/lexer/JavascriptTagMergerTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/lexer/JavascriptTagMergerTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/lexer/JavascriptTagMergerTest.java Wed Jan 7 12:03:12 2009
@@ -18,6 +18,8 @@
*/
package org.apache.shindig.gadgets.rewrite.lexer;
+import com.google.common.collect.ImmutableMap;
+
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.rewrite.BaseRewriterTestCase;
@@ -38,10 +40,9 @@
super.setUp();
dummyUri = Uri.parse("http://www.w3c.org");
Uri relativeBase = Uri.parse("http://a.b.com/");
- defaultTransformerMap = new HashMap<String, HtmlTagTransformer>();
- defaultTransformerMap
- .put("script", new JavascriptTagMerger(createSpecWithoutRewrite(), defaultRewriterFeature,
- "http://www.test.com/concat?", relativeBase));
+ defaultTransformerMap = new ImmutableMap.Builder<String, HtmlTagTransformer>()
+ .put("script", new JavascriptTagMerger(createSpecWithoutRewrite(), defaultRewriterFeature, "http://www.test.com/concat?", relativeBase))
+ .build();
}
private void validateRewritten(String content, Uri base,
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/lexer/LinkingTagRewriterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/lexer/LinkingTagRewriterTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/lexer/LinkingTagRewriterTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/lexer/LinkingTagRewriterTest.java Wed Jan 7 12:03:12 2009
@@ -18,6 +18,8 @@
*/
package org.apache.shindig.gadgets.rewrite.lexer;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.rewrite.BaseRewriterTestCase;
@@ -39,7 +41,7 @@
dummyUri = Uri.parse("http://www.w3c.org");
Uri relativeBase = Uri.parse("http://a.b.com/");
LinkingTagRewriter rewriter = new LinkingTagRewriter(defaultLinkRewriter, relativeBase);
- defaultTransformerMap = new HashMap<String, HtmlTagTransformer>();
+ defaultTransformerMap = Maps.newHashMap();
for (String tag : rewriter.getSupportedTags()) {
defaultTransformerMap
.put(tag, rewriter);
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java Wed Jan 7 12:03:12 2009
@@ -20,6 +20,8 @@
import static org.easymock.EasyMock.expect;
+import com.google.common.collect.ImmutableSet;
+
import org.apache.shindig.gadgets.GadgetContext;
import org.json.JSONException;
import org.json.JSONObject;
@@ -97,9 +99,7 @@
.put(FEATURE_0, "config")
.put(FEATURE_1, "other config");
- Set<String> needed = new HashSet<String>();
- needed.add(FEATURE_0);
- needed.add(FEATURE_1);
+ Set<String> needed = ImmutableSet.of(FEATURE_0, FEATURE_1);
expect(context.getContainer()).andReturn(CONTAINER);
expect(containerConfig.getJsonObject(CONTAINER, "gadgets.features"))
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java Wed Jan 7 12:03:12 2009
@@ -18,6 +18,8 @@
*/
package org.apache.shindig.gadgets.servlet;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.gadgets.GadgetContext;
import junit.framework.TestCase;
@@ -33,7 +35,7 @@
final static int SPEC_ID = 1234;
final static String[] PREF_KEYS = new String[] {"hello", "foo"};
final static String[] PREF_VALUES = new String[] {"world", "bar"};
- final static Map<String, String> prefs = new HashMap<String, String>();
+ final static Map<String, String> prefs = Maps.newHashMap();
static {
for (int i = 0, j = PREF_KEYS.length; i < j; ++i) {
prefs.put(PREF_KEYS[i], PREF_VALUES[i]);
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java Wed Jan 7 12:03:12 2009
@@ -20,6 +20,8 @@
import static org.easymock.EasyMock.expect;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.http.HttpRequest;
@@ -105,7 +107,7 @@
String domain = "example.org";
String contentType = "text/evil; charset=utf-8";
String magicGarbage = "fadfdfdfd";
- Map<String, List<String>> headers = new HashMap<String, List<String>>();
+ Map<String, List<String>> headers = Maps.newHashMap();
headers.put("Content-Type", Arrays.asList(contentType));
headers.put("X-Magic-Garbage", Arrays.asList(magicGarbage));
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PreloadTest.java Wed Jan 7 12:03:12 2009
@@ -21,6 +21,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import com.google.common.collect.ImmutableSet;
+
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.xml.XmlUtil;
import org.apache.shindig.gadgets.AuthType;
@@ -39,8 +41,7 @@
public class PreloadTest {
private static final Uri SPEC_URL = Uri.parse("http://example.org/g.xml");
private final static String HREF = "http://example.org/preload.xml";
- private final static Set<String> VIEWS
- = new HashSet<String>(Arrays.asList("view0", "view1"));
+ private final static Set<String> VIEWS = ImmutableSet.of("view0", "view1");
@Test
public void basicPreload() throws Exception {
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/UserPrefSubstituterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/UserPrefSubstituterTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/UserPrefSubstituterTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/UserPrefSubstituterTest.java Wed Jan 7 12:03:12 2009
@@ -19,6 +19,9 @@
package org.apache.shindig.gadgets.variables;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.UserPrefs;
import org.apache.shindig.gadgets.spec.GadgetSpec;
@@ -59,9 +62,7 @@
}
public void testSubstitutions() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
- map.put(USER_NAME, USER_VALUE);
- map.put(OVERRIDE_NAME, OVERRIDE_VALUE);
+ Map<String, String> map = ImmutableMap.of(USER_NAME, USER_VALUE, OVERRIDE_NAME, OVERRIDE_VALUE);
UserPrefs prefs = new UserPrefs(map);
UserPrefSubstituter.addSubstitutions(substituter, spec, prefs);
@@ -74,8 +75,7 @@
}
public void testEscaping() throws Exception {
- Map<String, String> map = new HashMap<String, String>();
- map.put(USER_NAME, UNESCAPED_USER_VALUE);
+ Map<String, String> map = ImmutableMap.of(USER_NAME, UNESCAPED_USER_VALUE);
UserPrefs prefs = new UserPrefs(map);
UserPrefSubstituter.addSubstitutions(substituter, spec, prefs);
assertEquals(ESCAPED_USER_VALUE,
Modified: incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java Wed Jan 7 12:03:12 2009
@@ -29,6 +29,7 @@
import org.apache.shindig.gadgets.spec.LocaleSpec;
import org.apache.shindig.gadgets.spec.MessageBundle;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import org.junit.Test;
@@ -86,7 +87,7 @@
GadgetContext context = new GadgetContext() {
@Override
public UserPrefs getUserPrefs() {
- return new UserPrefs(Maps.immutableMap("foo", "shindig"));
+ return new UserPrefs(ImmutableMap.of("foo", "shindig"));
}
};
Modified: incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ActivityDb.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ActivityDb.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ActivityDb.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ActivityDb.java Wed Jan 7 12:03:12 2009
@@ -564,7 +564,7 @@
a = new ActivityTemplateParamsDb();
a.name = e.getKey();
a.value = e.getValue();
- a.activities = new ArrayList<Activity>();
+ a.activities = Lists.newArrayList();
a.activities.add(this);
templateParamsDb.put(e.getKey(), a);
} else {
@@ -572,7 +572,7 @@
}
}
// remove old entries
- List<String> toRemove = new ArrayList<String>();
+ List<String> toRemove = Lists.newArrayList();
for (Entry<String, ActivityTemplateParamsDb> e : templateParamsDb.entrySet()) {
if (!templateParams.containsKey(e.getKey())) {
toRemove.add(e.getKey());
Modified: incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java Wed Jan 7 12:03:12 2009
@@ -115,7 +115,7 @@
}
}
// remove old entries
- List<String> toRemove = new ArrayList<String>();
+ List<String> toRemove = Lists.newArrayList();
for (Entry<String, ApplicationDataMapValueDb> e : valuesDb.entrySet()) {
if (!this.containsKey(e.getKey())) {
toRemove.add(e.getKey());
Modified: incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.social.opensocial.jpa;
+import com.google.common.collect.Maps;
+
import static javax.persistence.GenerationType.IDENTITY;
import org.apache.shindig.social.opensocial.jpa.api.FilterCapability;
@@ -212,7 +214,7 @@
protected String aboutMe;
@OneToMany(targetEntity = PersonPropertyDb.class, mappedBy = "person", cascade = ALL)
- protected List<PersonPropertyDb> properties = new ArrayList<PersonPropertyDb>();
+ protected List<PersonPropertyDb> properties = Lists.newArrayList();
@OneToMany(targetEntity = PersonAccountDb.class, mappedBy = "person", cascade = ALL)
protected List<Account> accounts;
@@ -1135,7 +1137,7 @@
networkPresenceDb = networkPresence.toString();
smokerDb = smoker.toString();
- List<String> lookingFor = new ArrayList<String>();
+ List<String> lookingFor = Lists.newArrayList();
for (Enum<Enum.LookingFor> np : this.lookingFor) {
lookingFor.add(np.toString());
}
@@ -1174,7 +1176,7 @@
}
}
// remove missing entries
- List<PersonPropertyDb> toRemove = new ArrayList<PersonPropertyDb>();
+ List<PersonPropertyDb> toRemove = Lists.newArrayList();
for (PersonPropertyDb pp : properties) {
if (e.getKey().equals(pp.getType())) {
boolean present = false;
@@ -1206,24 +1208,24 @@
networkPresence = new EnumDb<NetworkPresence>(NetworkPresence.valueOf(networkPresenceDb));
smoker = new EnumDb<Smoker>(Smoker.valueOf(smokerDb));
- List<String> lookingFor = new ArrayList<String>();
- this.activities = new ArrayList<String>();
- this.books = new ArrayList<String>();
- this.cars = new ArrayList<String>();
- this.food = new ArrayList<String>();
- this.heroes = new ArrayList<String>();
- this.interests = new ArrayList<String>();
- this.languagesSpoken = new ArrayList<String>();
- this.movies = new ArrayList<String>();
- this.music = new ArrayList<String>();
- this.quotes = new ArrayList<String>();
- this.sports = new ArrayList<String>();
- this.tags = new ArrayList<String>();
- this.turnOffs = new ArrayList<String>();
- this.turnOns = new ArrayList<String>();
- this.tvShows = new ArrayList<String>();
+ List<String> lookingFor = Lists.newArrayList();
+ this.activities = Lists.newArrayList();
+ this.books = Lists.newArrayList();
+ this.cars = Lists.newArrayList();
+ this.food = Lists.newArrayList();
+ this.heroes = Lists.newArrayList();
+ this.interests = Lists.newArrayList();
+ this.languagesSpoken = Lists.newArrayList();
+ this.movies = Lists.newArrayList();
+ this.music = Lists.newArrayList();
+ this.quotes = Lists.newArrayList();
+ this.sports = Lists.newArrayList();
+ this.tags = Lists.newArrayList();
+ this.turnOffs = Lists.newArrayList();
+ this.turnOns = Lists.newArrayList();
+ this.tvShows = Lists.newArrayList();
- Map<String, List<String>> toSave = new HashMap<String, List<String>>();
+ Map<String, List<String>> toSave = Maps.newHashMap();
toSave.put(LOOKING_FOR_PROPERTY, lookingFor);
toSave.put(ACTIVITIES_PROPERTY, this.activities);
@@ -1249,7 +1251,7 @@
}
}
- this.lookingFor = new ArrayList<Enum<LookingFor>>();
+ this.lookingFor = Lists.newArrayList();
for (String lf : lookingFor) {
this.lookingFor.add(new EnumDb<LookingFor>(LookingFor.valueOf(lf)));
}
Modified: incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/eclipselink/Bootstrap.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/eclipselink/Bootstrap.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/eclipselink/Bootstrap.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/eclipselink/Bootstrap.java Wed Jan 7 12:03:12 2009
@@ -30,6 +30,8 @@
import static org.eclipse.persistence.config.PersistenceUnitProperties.TARGET_SERVER;
import static org.eclipse.persistence.config.PersistenceUnitProperties.TRANSACTION_TYPE;
+import com.google.common.collect.Maps;
+
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -85,7 +87,7 @@
public void init(String unitName) {
- Map<String, String> properties = new HashMap<String, String>();
+ Map<String, String> properties = Maps.newHashMap();
// Ensure RESOURCE_LOCAL transactions is used.
properties.put(TRANSACTION_TYPE, PersistenceUnitTransactionType.RESOURCE_LOCAL.name());
Modified: incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java Wed Jan 7 12:03:12 2009
@@ -18,6 +18,8 @@
package org.apache.shindig.social.opensocial.jpa.hibernate;
+import com.google.collect.common.Maps;
+
import java.util.HashMap;
import java.util.Map;
@@ -69,7 +71,7 @@
public void init(String unitName) {
- Map<String, String> properties = new HashMap<String, String>();
+ Map<String, String> properties = Maps.newHashMap();
LOG.info("Starting connection manager with properties " + properties);
Modified: incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.social.opensocial.jpa.spi;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.social.opensocial.jpa.ApplicationDataMapDb;
@@ -76,7 +78,7 @@
*/
private List<ApplicationDataMapDb> getDataMap(UserId userId, GroupId groupId, String appId,
SecurityToken token) {
- List<String> paramList = new ArrayList<String>();
+ List<String> paramList = Lists.newArrayList();
paramList.add(SPIUtils.getUserList(userId, token));
int lastParam = 1;
StringBuilder sb = new StringBuilder();
@@ -175,7 +177,7 @@
}
} else {
for (ApplicationDataMapDb adm : dataMaps) {
- Map<String, String> m = new HashMap<String, String>();
+ Map<String, String> m = Maps.newHashMap();
for (String f : fields) {
m.put(f, adm.get(f));
}
Modified: incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java Wed Jan 7 12:03:12 2009
@@ -125,7 +125,7 @@
plist = JPQLUtils.getListQuery(entiyManager, sb.toString(), paramList, collectionOptions);
if (plist == null) {
- plist = new ArrayList<Person>();
+ plist = Lists.newArrayList();
}
// all of the above could equally have been placed into a thread to overlay the
// db wait times.
Modified: incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/SPIUtils.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.social.opensocial.jpa.spi;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.social.opensocial.spi.UserId;
@@ -36,8 +38,8 @@
* @return
*/
public static List<String> getUserList(Set<UserId> userIds, SecurityToken token) {
- HashMap<String, String> userIdMap = new HashMap<String, String>();
- List<String> paramList = new ArrayList<String>();
+ HashMap<String, String> userIdMap = Maps.newHashMap();
+ List<String> paramList = Lists.newArrayList();
for (UserId u : userIds) {
try {
String uid = u.getUserId(token);
Modified: incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java Wed Jan 7 12:03:12 2009
@@ -83,7 +83,7 @@
c.setTimeInMillis(System.currentTimeMillis());
c.add(Calendar.YEAR, -age);
c.add(Calendar.MONTH, 12 - i % 12);
- List<Address> a = new ArrayList<Address>();
+ List<Address> a = Lists.newArrayList();
a.add(getNewPersonAddress(i));
a.add(getNewPersonAddress(i + 2));
person.setAddresses(a);
@@ -95,7 +95,7 @@
person.setCurrentLocation(getNewAddress(i + 5));
person.setBirthday(c.getTime());
person.setDrinker(new EnumImpl<Drinker>(Drinker.OCCASIONALLY));
- List<ListField> emails = new ArrayList<ListField>();
+ List<ListField> emails = Lists.newArrayList();
emails.add(getNewEmail(i));
emails.add(getNewEmail(i + 1));
person.setEmails(emails);
@@ -110,14 +110,14 @@
person.setIsOwner(true);
person.setIsViewer(true);
person.setJobInterests("job interest");
- List<Organization> organizations = new ArrayList<Organization>();
+ List<Organization> organizations = Lists.newArrayList();
organizations.add(getPersonOrganization(i, "job"));
organizations.add(getPersonOrganization(i + 1, "job"));
organizations.add(getPersonOrganization(i + 2, "job"));
person.setOrganizations(organizations);
person.setLanguagesSpoken(getList("LanguagesSpoken"));
person.setLivingArrangement("living Arrangement");
- List<Enum<LookingFor>> lookingFor = new ArrayList<Enum<LookingFor>>();
+ List<Enum<LookingFor>> lookingFor = Lists.newArrayList();
lookingFor.add(new EnumImpl<LookingFor>(LookingFor.RANDOM));
lookingFor.add(new EnumImpl<LookingFor>(LookingFor.NETWORKING));
person.setLookingFor(lookingFor);
@@ -126,7 +126,7 @@
person.setName(getNewName(i));
person.setNickname("NickName");
person.setPets("Pets");
- List<ListField> phoneNumbers = new ArrayList<ListField>();
+ List<ListField> phoneNumbers = Lists.newArrayList();
phoneNumbers.add(getNewPhone(i));
phoneNumbers.add(getNewPhone(i * 3));
@@ -151,7 +151,7 @@
person.setStatus("Status");
person.setTags(getList("tags"));
- List<ListField> photos = new ArrayList<ListField>();
+ List<ListField> photos = Lists.newArrayList();
photos.add(getNewPhoto(i));
photos.add(getNewPhoto(i * 3));
@@ -161,7 +161,7 @@
person.setTurnOns(getList("TurnOns"));
person.setTvShows(getList("TvShows"));
person.setUpdated(new Date());
- List<Url> urls = new ArrayList<Url>();
+ List<Url> urls = Lists.newArrayList();
urls.add(getNewUrl(i * 4));
urls.add(getNewUrl(i * 5));
urls.add(getNewUrl(i * 6));
@@ -237,7 +237,7 @@
}
private List<String> getList(String base) {
- List<String> list = new ArrayList<String>();
+ List<String> list = Lists.newArrayList();
for (int i = 0; i < 10; i++) {
list.add(base + i);
}
Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/social-api/pom.xml Wed Jan 7 12:03:12 2009
@@ -91,8 +91,8 @@
<artifactId>guice</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.google-collections</groupId>
- <artifactId>google-collect</artifactId>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
</dependency>
<dependency>
<artifactId>commons-lang</artifactId>
Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java Wed Jan 7 12:03:12 2009
@@ -21,6 +21,7 @@
import org.apache.shindig.social.opensocial.model.Enum;
import org.apache.shindig.social.opensocial.service.BeanConverter;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -53,7 +54,7 @@
public class BeanJsonConverter implements BeanConverter {
private static final Object[] EMPTY_OBJECT = {};
- private static final Set<String> EXCLUDED_FIELDS = Sets.newHashSet("class", "declaringclass");
+ private static final Set<String> EXCLUDED_FIELDS = ImmutableSet.of("class", "declaringclass");
private static final String GETTER_PREFIX = "get";
private static final String SETTER_PREFIX = "set";
Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConfig.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConfig.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConfig.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonLibConfig.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.social.core.util;
+import com.google.common.collect.Maps;
+
import org.apache.shindig.social.opensocial.model.Address;
import org.apache.shindig.social.opensocial.model.Enum;
import org.apache.shindig.social.opensocial.model.ListField;
@@ -78,7 +80,7 @@
setJavaPropertyFilter(new NullPropertyFilter());
// the classMap deals with the basic json string to bean conversion
- Map<String, Class<?>> classMap = new HashMap<String, Class<?>>();
+ Map<String, Class<?>> classMap = Maps.newHashMap();
/*
* mappings are required where there is a List of objects in the interface
Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXStreamConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXStreamConverter.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXStreamConverter.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXStreamConverter.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.social.core.util;
+import com.google.common.collect.Maps;
+
import com.google.inject.Inject;
import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
@@ -54,7 +56,7 @@
protected WriterStack writerStack;
- protected Map<XStreamConfiguration.ConverterSet, ConverterConfig> converterMap = new HashMap<XStreamConfiguration.ConverterSet, ConverterConfig>();
+ protected Map<XStreamConfiguration.ConverterSet, ConverterConfig> converterMap = Maps.newHashMap();
@Inject
public BeanXStreamConverter(XStreamConfiguration configuration) {
Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.social.core.util;
+import com.google.common.collect.Maps;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -51,7 +53,7 @@
* @return the morphed bean (a map)
*/
public Object morph(Object bean) {
- Map<Object, Object> result = new HashMap<Object, Object>();
+ Map<Object, Object> result = Maps.newHashMap();
JSONObject jsonObject = (JSONObject) bean;
for (Object entry : jsonObject.entrySet()) {
result.put(((Entry)entry).getKey(), ((Entry)entry).getValue());
Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.social.core.util.atom;
+import com.google.common.collect.Lists;
+
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.Person;
@@ -61,7 +63,7 @@
public AtomContent(Object value) {
if (value instanceof Map) {
Map<?, ?> entries = (Map<?, ?>) value;
- List<AtomKeyValue> keyValues = new ArrayList<AtomKeyValue>();
+ List<AtomKeyValue> keyValues = Lists.newArrayList();
for ( Entry<?, ?> e : entries.entrySet() ) {
keyValues.add(new AtomKeyValue(e));
}
Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/DataCollectionConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/DataCollectionConverter.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/DataCollectionConverter.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/DataCollectionConverter.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.social.core.util.xstream;
+import com.google.common.collect.Maps;
+
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter;
@@ -115,7 +117,7 @@
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context) {
reader.moveDown();
- Map<String, Object> m = new HashMap<String, Object>();
+ Map<String, Object> m = Maps.newHashMap();
while (reader.hasMoreChildren()) {
reader.moveDown(); // entry
String ok = null;
@@ -128,7 +130,7 @@
} else if ("value".equals(elname)) {
ov = reader.getValue();
if (reader.hasMoreChildren()) {
- Map<String, String> innerMap = new HashMap<String, String>();
+ Map<String, String> innerMap = Maps.newHashMap();
while (reader.hasMoreChildren()) {
reader.moveDown();// entry
String k = null;
@@ -162,14 +164,14 @@
nonmap = true;
}
}
- Map<String, Map<String, String>> fm = new HashMap<String, Map<String, String>>();
+ Map<String, Map<String, String>> fm = Maps.newHashMap();
if (nonmap) {
for (Entry<String, Object> e : m.entrySet()) {
if (e.getValue() instanceof Map) {
fm.put(e.getKey(), (Map<String, String>) e.getValue());
} else {
// not certain that this makes sense, but can't see how else.
- Map<String, String> mv = new HashMap<String, String>();
+ Map<String, String> mv = Maps.newHashMap();
mv.put(e.getKey(), (String) e.getValue());
fm.put(e.getKey(), mv);
}
Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/GuiceBeanProvider.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/GuiceBeanProvider.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/GuiceBeanProvider.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/GuiceBeanProvider.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.social.core.util.xstream;
+import com.google.common.collect.Lists;
+
import com.google.inject.Injector;
import com.thoughtworks.xstream.converters.reflection.ObjectAccessException;
@@ -111,8 +113,7 @@
private PropertyDescriptor[] getSerializableProperties(Object object) {
Map<String, PropertyDescriptor> nameMap = getNameMap(object.getClass());
- List<PropertyDescriptor> result = new ArrayList<PropertyDescriptor>(nameMap
- .size());
+ List<PropertyDescriptor> result = Lists.newArrayListWithExpectedSize(nameMap.size());
Set<String> names = nameMap.keySet();
if (propertyNameComparator != null) {
Set<String> sortedSet = new TreeSet<String>(propertyNameComparator);
Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceClassMapper.java
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceClassMapper.java?rev=732453&r1=732452&r2=732453&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceClassMapper.java (original)
+++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceClassMapper.java Wed Jan 7 12:03:12 2009
@@ -17,6 +17,8 @@
*/
package org.apache.shindig.social.core.util.xstream;
+import com.google.common.collect.Maps;
+
import com.google.inject.ImplementedBy;
import com.thoughtworks.xstream.mapper.Mapper;
@@ -51,7 +53,7 @@
/**
* A map of element names to classes.
*/
- private Map<String, Class<?>> elementClassMap = new HashMap<String, Class<?>>();
+ private Map<String, Class<?>> elementClassMap = Maps.newHashMap();
/**
* The first child of the root object. If the root object is not a collection,
* this is null. If the root object is a collection and all the elements are