Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceFieldAliasingMapper.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/InterfaceFieldAliasingMapper.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/InterfaceFieldAliasingMapper.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceFieldAliasingMapper.java Wed Jan 7 12:03:12 2009 @@ -17,6 +17,9 @@ */ package org.apache.shindig.social.core.util.xstream; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + import com.thoughtworks.xstream.mapper.FieldAliasingMapper; import com.thoughtworks.xstream.mapper.Mapper; import com.thoughtworks.xstream.mapper.MapperWrapper; @@ -31,8 +34,8 @@ */ public class InterfaceFieldAliasingMapper extends MapperWrapper { - private Map<String, List<InterfaceFieldAliasMapping>> serializedMap = new HashMap<String, List<InterfaceFieldAliasMapping>>(); - private Map<String, List<InterfaceFieldAliasMapping>> membersMap = new HashMap<String, List<InterfaceFieldAliasMapping>>(); + private Map<String, List<InterfaceFieldAliasMapping>> serializedMap = Maps.newHashMap(); + private Map<String, List<InterfaceFieldAliasMapping>> membersMap = Maps.newHashMap(); private WriterStack writerStack; /** @@ -44,17 +47,15 @@ this.writerStack = writerStack; for (InterfaceFieldAliasMapping ifa : ifaList) { - List<InterfaceFieldAliasMapping> serializedMatches = serializedMap - .get(ifa.getFieldName()); + List<InterfaceFieldAliasMapping> serializedMatches = serializedMap.get(ifa.getFieldName()); if (serializedMatches == null) { - serializedMatches = new ArrayList<InterfaceFieldAliasMapping>(); + serializedMatches = Lists.newArrayList(); serializedMap.put(ifa.getFieldName(), serializedMatches); } serializedMatches.add(ifa); - List<InterfaceFieldAliasMapping> memberMatches = membersMap.get(ifa - .getAlias()); + List<InterfaceFieldAliasMapping> memberMatches = membersMap.get(ifa.getAlias()); if (memberMatches == null) { - memberMatches = new ArrayList<InterfaceFieldAliasMapping>(); + memberMatches = Lists.newArrayList(); membersMap.put(ifa.getAlias(), memberMatches); } memberMatches.add(ifa);
Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/NamespaceSet.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/NamespaceSet.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/NamespaceSet.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/NamespaceSet.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 java.util.HashMap; import java.util.Map; import java.util.Set; @@ -33,11 +35,11 @@ /** * A map namespace attributes to the namespace uri. */ - private Map<String, String> namespaces = new HashMap<String, String>(); + private Map<String, String> namespaces = Maps.newHashMap(); /** * A map of localElement names to prefixed element names. */ - private Map<String, String> elementNames = new HashMap<String, String>(); + private Map<String, String> elementNames = Maps.newHashMap(); /** * Add a namespace to the list. Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/PropertyDictionary.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/PropertyDictionary.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/PropertyDictionary.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/PropertyDictionary.java Wed Jan 7 12:03:12 2009 @@ -17,6 +17,9 @@ */ package org.apache.shindig.social.core.util.xstream; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + import com.thoughtworks.xstream.converters.javabean.BeanProperty; import com.thoughtworks.xstream.converters.reflection.ObjectAccessException; @@ -79,7 +82,7 @@ // is possible that a class have two writable only // properties that have the same name // but different types - final Map<PropertyKey, BeanProperty> propertyMap = new HashMap<PropertyKey, BeanProperty>(); + final Map<PropertyKey, BeanProperty> propertyMap = Maps.newHashMap(); Method[] methods = cls.getMethods(); for (int i = 0; i < methods.length; i++) { @@ -114,7 +117,7 @@ // retain only those that can be both read and written and // sort them by name - List<BeanProperty> serializableProperties = new ArrayList<BeanProperty>(); + List<BeanProperty> serializableProperties = Lists.newArrayList(); for (BeanProperty property : propertyMap.values()) { if (property.isReadable() || property.isWritable()) { serializableProperties.add(property); @@ -209,7 +212,7 @@ private static class OrderRetainingMap<K, V> extends HashMap<K, V> { private static final long serialVersionUID = 1565370254073638221L; - private List<V> valueOrder = new ArrayList<V>(); + private List<V> valueOrder = Lists.newArrayList(); public V put(K key, V value) { valueOrder.add(value); Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/ThreadSafeWriterStack.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/ThreadSafeWriterStack.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/ThreadSafeWriterStack.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/ThreadSafeWriterStack.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 java.util.ArrayList; import java.util.List; @@ -33,7 +35,7 @@ */ private ThreadLocal<List<Object[]>> stackHolder = new ThreadLocal<List<Object[]>>() { protected List<Object[]> initialValue() { - return new ArrayList<Object[]>(); + return Lists.newArrayList(); } }; Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.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/XStream081Configuration.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/XStream081Configuration.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java Wed Jan 7 12:03:12 2009 @@ -17,6 +17,9 @@ */ package org.apache.shindig.social.core.util.xstream; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + import com.google.inject.Inject; import com.google.inject.Injector; @@ -67,23 +70,23 @@ * Defines the type of the list container when at the top level where there * are no methods to specify the name of the list. */ - private static final Map<ConverterSet, List<ClassFieldMapping>> listElementMappingList = new HashMap<ConverterSet, List<ClassFieldMapping>>(); + private static final Map<ConverterSet, List<ClassFieldMapping>> listElementMappingList = Maps.newHashMap(); /** * Specifies a priority sorted list of Class to Element Name mappings. */ - private static final Map<ConverterSet, List<ClassFieldMapping>> elementMappingList = new HashMap<ConverterSet, List<ClassFieldMapping>>(); + private static final Map<ConverterSet, List<ClassFieldMapping>> elementMappingList = Maps.newHashMap(); /** * A list of omits, the potential field is the key, and if the class which the * field is in, is also in the list, the field is supressed. */ - private static final Map<ConverterSet, Map<String, Class<?>[]>> omitMap = new HashMap<ConverterSet, Map<String, Class<?>[]>>(); + private static final Map<ConverterSet, Map<String, Class<?>[]>> omitMap = Maps.newHashMap(); /** * Maps elements names to classes. */ - private static final Map<ConverterSet, Map<String, Class<?>>> elementClassMap = new HashMap<ConverterSet, Map<String, Class<?>>>(); - private static final Map<ConverterSet, List<ImplicitCollectionFieldMapping>> itemFieldMappings = new HashMap<ConverterSet, List<ImplicitCollectionFieldMapping>>(); - private static final Map<ConverterSet, List<InterfaceFieldAliasMapping>> fieldAliasMappingList = new HashMap<ConverterSet, List<InterfaceFieldAliasMapping>>(); - private static final Map<String, NamespaceSet> namepaces = new HashMap<String, NamespaceSet>(); + private static final Map<ConverterSet, Map<String, Class<?>>> elementClassMap = Maps.newHashMap(); + private static final Map<ConverterSet, List<ImplicitCollectionFieldMapping>> itemFieldMappings = Maps.newHashMap(); + private static final Map<ConverterSet, List<InterfaceFieldAliasMapping>> fieldAliasMappingList = Maps.newHashMap(); + private static final Map<String, NamespaceSet> namepaces = Maps.newHashMap(); private static final String ATOM_NS = "http://www.w3.org/2005/Atom"; private static final String OS_NS = "http://ns.opensocial.org/2008/opensocial"; private static final String OSEARCH_NS = "http://a9.com/-/spec/opensearch/1.1"; @@ -114,7 +117,7 @@ namepaces.put("reponse", os); namepaces.put("appdata", os); - List<ClassFieldMapping> defaultElementMappingList = new ArrayList<ClassFieldMapping>(); + List<ClassFieldMapping> defaultElementMappingList = Lists.newArrayList(); // this is order specific, so put the more specified interfaces at the top. defaultElementMappingList.add(new ClassFieldMapping("feed", AtomFeed.class)); @@ -162,7 +165,7 @@ // element setup for RestfullCollection Responses - List<ClassFieldMapping> collectionElementMappingList = new ArrayList<ClassFieldMapping>(); + List<ClassFieldMapping> collectionElementMappingList = Lists.newArrayList(); collectionElementMappingList.add(new ClassFieldMapping("feed", AtomFeed.class)); @@ -215,12 +218,12 @@ // Entries here might indicate a hole in the spec. // This not in the XSD for 81, but is in the wording of the spec. // omitMap.put("addresses", new Class[] { Person.class }); - Map<String, Class<?>[]> defaultOmitMap = new HashMap<String, Class<?>[]>(); + Map<String, Class<?>[]> defaultOmitMap = Maps.newHashMap(); defaultOmitMap.put("isOwner", new Class[] { Person.class }); defaultOmitMap.put("isViewer", new Class[] { Person.class }); omitMap.put(ConverterSet.DEFAULT, defaultOmitMap); - Map<String, Class<?>> defaultElementClassMap = new HashMap<String, Class<?>>(); + Map<String, Class<?>> defaultElementClassMap = Maps.newHashMap(); defaultElementClassMap.put("feed", AtomFeed.class); defaultElementClassMap.put("content", AtomContent.class); defaultElementClassMap.put("person", Person.class); @@ -242,7 +245,7 @@ defaultElementClassMap.put("listField", ListField.class); elementClassMap.put(ConverterSet.DEFAULT, defaultElementClassMap); - List<ImplicitCollectionFieldMapping> defaultItemFieldMappings = new ArrayList<ImplicitCollectionFieldMapping>(); + List<ImplicitCollectionFieldMapping> defaultItemFieldMappings = Lists.newArrayList(); defaultItemFieldMappings.add(new ImplicitCollectionFieldMapping( AtomFeed.class, "entry", AtomEntry.class, "entry")); defaultItemFieldMappings.add(new ImplicitCollectionFieldMapping( @@ -301,11 +304,11 @@ itemFieldMappings.put(ConverterSet.DEFAULT, defaultItemFieldMappings); - List<ClassFieldMapping> defaultListElementMappingList = new ArrayList<ClassFieldMapping>(); + List<ClassFieldMapping> defaultListElementMappingList = Lists.newArrayList(); listElementMappingList.put(ConverterSet.DEFAULT, defaultListElementMappingList); - List<InterfaceFieldAliasMapping> defaultFieldAliasMappingList = new ArrayList<InterfaceFieldAliasMapping>(); + List<InterfaceFieldAliasMapping> defaultFieldAliasMappingList = Lists.newArrayList(); // defaultFieldAliasMappingList.add(new // InterfaceFieldAliasMapping("address",ListField.class,"value","urls")); // defaultFieldAliasMappingList.add(new Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.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/opensocial/model/Person.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java Wed Jan 7 12:03:12 2009 @@ -19,10 +19,15 @@ import org.apache.shindig.social.core.model.PersonImpl; +import com.google.common.collect.EnumHashBiMap; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; +import com.google.common.base.Functions; + import com.google.inject.ImplementedBy; import java.util.Date; +import java.util.EnumSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -196,25 +201,28 @@ URLS("urls"); /** - * The json field that the instance represents. + * a Map to convert json string to Field representations. */ - private final String urlString; + + private static final Map<String,Field> lookup = Maps.uniqueIndex(EnumSet.allOf(Field.class), Functions.TO_STRING); /** - * The set of required fields. + * The json field that the instance represents. */ - public static final Set<String> DEFAULT_FIELDS = EnumUtil.getEnumStrings(ID, NAME, - THUMBNAIL_URL); + private final String urlString; /** * The set of all fields. */ - public static final Set<String> ALL_FIELDS = EnumUtil.getEnumStrings(Field.values()); + public static final Set<String> ALL_FIELDS = lookup.keySet(); /** - * a Map to convert json string to Field representations. + * The set of default fields returned fields. */ - private static Map<String, Field> URL_STRING_TO_FIELD_MAP; + public static final Set<String> DEFAULT_FIELDS = ImmutableSet.of( + ID.toString(), + NAME.toString(), + THUMBNAIL_URL.toString()); /** * create a field base on the a json element. @@ -242,14 +250,7 @@ * @return The corresponding person field. */ public static Person.Field fromUrlString(String urlString) { - if (URL_STRING_TO_FIELD_MAP == null) { - URL_STRING_TO_FIELD_MAP = Maps.newHashMap(); - for (Person.Field field : Person.Field.values()) { - URL_STRING_TO_FIELD_MAP.put(field.toString(), field); - } - } - - return URL_STRING_TO_FIELD_MAP.get(urlString); + return lookup.get(urlString); } } Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataRequestHandler.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataRequestHandler.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/opensocial/service/DataRequestHandler.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataRequestHandler.java Wed Jan 7 12:03:12 2009 @@ -21,7 +21,7 @@ import org.apache.shindig.social.ResponseError; import org.apache.shindig.social.opensocial.spi.SocialSpiException; -import com.google.common.collect.Sets; +import com.google.common.collect.ImmutableSet; import java.util.Collection; import java.util.Set; @@ -29,10 +29,10 @@ public abstract class DataRequestHandler { - private static final Set<String> GET_SYNONYMS = Sets.newHashSet("get"); - private static final Set<String> CREATE_SYNONYMS = Sets.newHashSet("put", "create"); - private static final Set<String> UPDATE_SYNONYMS = Sets.newHashSet("post", "update"); - private static final Set<String> DELETE_SYNONYMS = Sets.newHashSet("delete"); + private static final Set<String> GET_SYNONYMS = ImmutableSet.of("get"); + private static final Set<String> CREATE_SYNONYMS = ImmutableSet.of("put", "create"); + private static final Set<String> UPDATE_SYNONYMS = ImmutableSet.of("post", "update"); + private static final Set<String> DELETE_SYNONYMS = ImmutableSet.of("delete"); public Future<?> handleItem(RequestItem request) { if (request.getOperation() == null) { Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.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/opensocial/service/DataServiceServlet.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java Wed Jan 7 12:03:12 2009 @@ -21,6 +21,7 @@ import org.apache.shindig.social.opensocial.spi.DataCollection; import org.apache.shindig.social.opensocial.spi.RestfulCollection; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import java.io.IOException; @@ -107,7 +108,7 @@ Object response = responseItem.getResponse(); // TODO: ugliness resulting from not using RestfulItem if (!(response instanceof DataCollection) && !(response instanceof RestfulCollection)) { - response = Maps.immutableMap("entry", response); + response = ImmutableMap.of("entry", response); } writer.write(converter.convertToString(response)); Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.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/opensocial/service/DataServiceServletFetcher.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java Wed Jan 7 12:03:12 2009 @@ -20,7 +20,7 @@ import org.apache.shindig.auth.SecurityTokenDecoder; import org.apache.shindig.common.servlet.ParameterFetcher; -import com.google.common.collect.Maps; +import com.google.common.collect.ImmutableMap; import java.util.Map; @@ -33,7 +33,7 @@ public class DataServiceServletFetcher implements ParameterFetcher { public Map<String, String> fetch(HttpServletRequest req) { - return Maps.immutableMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, req.getParameter("st")); + return ImmutableMap.of(SecurityTokenDecoder.SECURITY_TOKEN_NAME, req.getParameter("st")); } } Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.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/opensocial/service/RequestItem.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java Wed Jan 7 12:03:12 2009 @@ -26,12 +26,14 @@ import org.joda.time.DateTime; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Set; -import java.util.Date; /** * Abstract base type for social API requests. @@ -183,12 +185,11 @@ } public Set<String> getFields() { - return getFields(Sets.<String>newHashSet()); + return getFields(Collections.<String>emptySet()); } public Set<String> getFields(Set<String> defaultValue) { - Set<String> result = Sets.newHashSet(); - result.addAll(getListParameter(FIELDS)); + Set<String> result = ImmutableSet.copyOf(getListParameter(FIELDS)); if (result.isEmpty()) { return defaultValue; } Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcher.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcher.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/opensocial/service/StandardHandlerDispatcher.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcher.java Wed Jan 7 12:03:12 2009 @@ -20,6 +20,8 @@ import com.google.inject.Inject; import com.google.inject.Provider; + +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import java.util.Map; @@ -41,7 +43,7 @@ public StandardHandlerDispatcher(Provider<PersonHandler> personHandlerProvider, Provider<ActivityHandler> activityHandlerProvider, Provider<AppDataHandler> appDataHandlerProvider) { - this(Maps.immutableMap( + this(ImmutableMap.of( DataServiceServlet.PEOPLE_ROUTE, personHandlerProvider, DataServiceServlet.ACTIVITY_ROUTE, activityHandlerProvider, DataServiceServlet.APPDATA_ROUTE, appDataHandlerProvider)); Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.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/sample/oauth/SampleContainerOAuthLookupService.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java Wed Jan 7 12:03:12 2009 @@ -21,6 +21,7 @@ import org.apache.shindig.social.core.oauth.OAuthSecurityToken; import org.apache.shindig.social.opensocial.oauth.OAuthLookupService; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -39,7 +40,7 @@ public class SampleContainerOAuthLookupService implements OAuthLookupService { // If we were a real social network this would probably be a function - private static Map<String, String> sampleContainerUrlToAppIdMap = Maps.immutableMap( + private static Map<String, String> sampleContainerUrlToAppIdMap = ImmutableMap.of( "http://localhost:8080/gadgets/files/samplecontainer/examples/SocialHelloWorld.xml", "7810", "http://localhost:8080/gadgets/files/samplecontainer/examples/SocialActivitiesWorld.xml", @@ -47,12 +48,12 @@ ); // If we were a real social network we would probably be keeping track of this in a db somewhere - private static Map<String, ArrayList<String>> sampleContainerAppInstalls = Maps.immutableMap( + private static Map<String, ArrayList<String>> sampleContainerAppInstalls = ImmutableMap.of( "john.doe", Lists.newArrayList("7810", "8355") ); // If we were a real social network we would establish shared secrets with each of our gadgets - private static Map<String, String> sampleContainerSharedSecrets = Maps.immutableMap( + private static Map<String, String> sampleContainerSharedSecrets = ImmutableMap.of( "7810", "SocialHelloWorldSharedSecret", "8355", "SocialActivitiesWorldSharedSecret" ); Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.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/sample/spi/JsonDbOpensocialService.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java Wed Jan 7 12:03:12 2009 @@ -35,6 +35,7 @@ import org.apache.shindig.social.opensocial.spi.SocialSpiException; import org.apache.shindig.social.opensocial.spi.UserId; +import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -380,7 +381,7 @@ String userId = user.getUserId(token); if (group == null) { - return Sets.newLinkedHashSet(userId); + return ImmutableSortedSet.of(userId); } Set<String> returnVal = Sets.newLinkedHashSet(); Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java?rev=732453&r1=732452&r2=732453&view=diff ============================================================================== --- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java Wed Jan 7 12:03:12 2009 @@ -17,7 +17,9 @@ */ package org.apache.shindig.social.dataservice.integration; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; + import com.google.inject.Guice; import com.google.inject.Injector; @@ -101,7 +103,7 @@ protected String getResponse(String path, String method, String postData, String format, String contentType) throws Exception { - return getResponse(path, method, Maps.<String, String> newHashMap(), + return getResponse(path, method, Maps.<String,String> newHashMap(), postData, format, contentType); } @@ -208,14 +210,14 @@ * element. */ protected Map<String, List<String>> childNodesToMap(Node n) { - Map<String, List<String>> v = new HashMap<String, List<String>>(); + Map<String, List<String>> v = Maps.newHashMap(); NodeList result = n.getChildNodes(); for (int i = 0; i < result.getLength(); i++) { Node nv = result.item(i); if (nv.getNodeType() == Node.ELEMENT_NODE) { List<String> l = v.get(nv.getLocalName()); if (l == null) { - l = new ArrayList<String>(); + l = Lists.newArrayList(); v.put(nv.getLocalName(), l); } l.add(nv.getTextContent()); @@ -236,7 +238,7 @@ */ protected Map<String, Map<String, List<String>>> childNodesToMapofMap( NodeList result) { - Map<String, Map<String, List<String>>> v = new HashMap<String, Map<String, List<String>>>(); + Map<String, Map<String, List<String>>> v = Maps.newHashMap(); for (int i = 0; i < result.getLength(); i++) { Map<String, List<Node>> keyValue = childNodesToNodeMap(result.item(i)); @@ -246,7 +248,7 @@ Node valueNode = keyValue.get("value").get(0); Node key = keyValue.get("key").get(0); NodeList entryList = valueNode.getChildNodes(); - Map<String, List<String>> pv = new HashMap<String, List<String>>(); + Map<String, List<String>> pv = Maps.newHashMap(); v.put(key.getTextContent(), pv); for (int j = 0; j < entryList.getLength(); j++) { Node n = entryList.item(j); @@ -255,7 +257,7 @@ assertTrue(ve.containsKey("key")); List<String> l = pv.get(ve.get("key").get(0)); if ( l == null ) { - l = new ArrayList<String>(); + l = Lists.newArrayList(); pv.put(ve.get("key").get(0), l); } l.add(ve.get("value").get(0)); @@ -270,14 +272,14 @@ * @return */ protected Map<String, List<Node>> childNodesToNodeMap(Node n) { - Map<String, List<Node>> v = new HashMap<String, List<Node>>(); + Map<String, List<Node>> v = Maps.newHashMap(); NodeList result = n.getChildNodes(); for (int i = 0; i < result.getLength(); i++) { Node nv = result.item(i); if (nv.getNodeType() == Node.ELEMENT_NODE) { List<Node> l = v.get(nv.getLocalName()); if (l == null) { - l = new ArrayList<Node>(); + l = Lists.newArrayList(); v.put(nv.getLocalName(), l); } l.add(nv); Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java?rev=732453&r1=732452&r2=732453&view=diff ============================================================================== --- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java Wed Jan 7 12:03:12 2009 @@ -31,6 +31,7 @@ import org.apache.shindig.social.core.util.xstream.XStream081Configuration; import org.apache.shindig.social.opensocial.spi.SocialSpiException; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.inject.Guice; import com.google.inject.Injector; @@ -159,7 +160,7 @@ EasyMock.expect(handler.handleItem(EasyMock.isA(RequestItem.class))); EasyMock.expectLastCall().andReturn(ImmediateFuture.newInstance(jsonObject)); - EasyMock.expect(jsonConverter.convertToString(Maps.immutableMap("entry", jsonObject))) + EasyMock.expect(jsonConverter.convertToString(ImmutableMap.of("entry", jsonObject))) .andReturn("{ 'entry' : " + jsonObject + " }"); PrintWriter writerMock = EasyMock.createMock(PrintWriter.class); Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java?rev=732453&r1=732452&r2=732453&view=diff ============================================================================== --- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java Wed Jan 7 12:03:12 2009 @@ -25,7 +25,9 @@ import org.apache.shindig.social.core.util.BeanXStreamConverter; import org.apache.shindig.social.core.util.BeanXmlConverter; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; + import com.google.inject.Provider; import junit.framework.TestCase; @@ -157,11 +159,11 @@ EasyMock.expectLastCall().andReturn(ImmediateFuture.newInstance(resultObject)); EasyMock.expect(jsonConverter.convertToJson(resultObject)) - .andReturn(new JSONObject(Maps.immutableMap("foo", "bar"))); + .andReturn(new JSONObject(ImmutableMap.of("foo", "bar"))); JSONObject result = new JSONObject(); result.put("id", "id"); - result.put("data", Maps.immutableMap("foo", "bar")); + result.put("data", ImmutableMap.of("foo", "bar")); PrintWriter writerMock = EasyMock.createMock(PrintWriter.class); EasyMock.expect(res.getWriter()).andReturn(writerMock); writerMock.write(EasyMock.eq(result.toString())); @@ -186,7 +188,7 @@ EasyMock.expectLastCall().andReturn(responseItemFuture); EasyMock.expect(jsonConverter.convertToJson(resultObject)) - .andStubReturn(new JSONObject(Maps.immutableMap("foo", "bar"))); + .andStubReturn(new JSONObject(ImmutableMap.of("foo", "bar"))); JSONArray result = new JSONArray("[{id:'1',data:{foo:'bar'}}," + "{id:'2',data:{foo:'bar'}}]"); PrintWriter writerMock = EasyMock.createMock(PrintWriter.class); @@ -202,7 +204,7 @@ public void testGetExecution() throws Exception { EasyMock.expect(req.getParameterMap()).andStubReturn( - Maps.immutableMap("method", new String[]{"people.get"}, "id", new String[]{"1"})); + ImmutableMap.of("method", new String[]{"people.get"}, "id", new String[]{"1"})); EasyMock.expect(req.getMethod()).andStubReturn("GET"); EasyMock.expect(req.getAttribute(EasyMock.isA(String.class))).andReturn(FAKE_GADGET_TOKEN); EasyMock.expect(req.getCharacterEncoding()).andStubReturn("UTF-8"); @@ -215,7 +217,7 @@ EasyMock.expectLastCall().andReturn(responseItemFuture); EasyMock.expect(jsonConverter.convertToJson(resultObject)) - .andReturn(new JSONObject(Maps.immutableMap("foo", "bar"))); + .andReturn(new JSONObject(ImmutableMap.of("foo", "bar"))); JSONObject result = new JSONObject("{id:'1',data:{foo:'bar'}}"); PrintWriter writerMock = EasyMock.createMock(PrintWriter.class); Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java?rev=732453&r1=732452&r2=732453&view=diff ============================================================================== --- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java Wed Jan 7 12:03:12 2009 @@ -30,8 +30,10 @@ import org.apache.shindig.social.opensocial.spi.SocialSpiException; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Maps; import com.google.common.collect.Sets; + import junit.framework.TestCase; import org.easymock.classextension.EasyMock; @@ -163,7 +165,7 @@ EasyMock.expect(personService.getPeople( JOHN_DOE, new GroupId(GroupId.Type.friends, null), options, - Sets.newLinkedHashSet("money", "fame", "fortune"), token)) + ImmutableSortedSet.of("money", "fame", "fortune"), token)) .andReturn(ImmediateFuture.newInstance(data)); replay(); Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java?rev=732453&r1=732452&r2=732453&view=diff ============================================================================== --- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java Wed Jan 7 12:03:12 2009 @@ -30,6 +30,9 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.mozilla.javascript.Context; @@ -200,17 +203,17 @@ public Map<String, Object> validateObject(Object jsonObject, String[] fieldNames, String[] optionalFields, String[] nullFields) throws ApiValidatorExpcetion { - Map<String, String> optional = new HashMap<String, String>(); + Map<String, String> optional = Maps.newHashMap(); for (String opt : optionalFields) { optional.put(opt, opt); } - Map<String, String> nullf = new HashMap<String, String>(); + Map<String, String> nullf = Maps.newHashMap(); for (String nf : nullFields) { nullf.put(nf, nf); } - Map<String, Object> resultFields = new HashMap<String, Object>(); + Map<String, Object> resultFields = Maps.newHashMap(); if (jsonObject instanceof ScriptableObject) { ScriptableObject parsedJSONObject = (ScriptableObject) jsonObject; @@ -316,7 +319,7 @@ List<String> scripts = getScripts(spec); - List<Script> compiled = new ArrayList<Script>(); + List<Script> compiled = Lists.newArrayList(); for (String script : scripts) { String scriptPath = spec + "/" + script; InputStream in = this.getClass().getClassLoader().getResourceAsStream( @@ -386,7 +389,7 @@ DocumentBuilder documentBuilder = builderFactory.newDocumentBuilder(); Document doc = documentBuilder.parse(in); NodeList nl = doc.getElementsByTagName("script"); - List<String> scripts = new ArrayList<String>(); + List<String> scripts = Lists.newArrayList(); for (int i = 0; i < nl.getLength(); i++) { Node scriptNode = nl.item(i); NamedNodeMap attributes = scriptNode.getAttributes(); Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java?rev=732453&r1=732452&r2=732453&view=diff ============================================================================== --- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java Wed Jan 7 12:03:12 2009 @@ -301,7 +301,7 @@ // appear // to be allowed in json // just check that the list is in the holder correctly - List<Map<String, String>> list = new ArrayList<Map<String, String>>(); + List<Map<String, String>> list = Lists.newArrayList(); list.add(item1Map); list.add(item2Map); String result = beanJsonConverter.convertToString(list); Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java?rev=732453&r1=732452&r2=732453&view=diff ============================================================================== --- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java Wed Jan 7 12:03:12 2009 @@ -19,6 +19,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; + import com.google.inject.Guice; import com.google.inject.Injector; @@ -163,7 +164,7 @@ } public void testMapToXml() throws XmlException { - Map<String, String> m = new LinkedHashMap<String, String>(); + Map<String, String> m = Maps.newLinkedHashMap(); m.put("key1", "value1"); m.put("key2", "value2"); String xml = beanXmlConverter.convertToString(m); @@ -185,7 +186,7 @@ } public void testEmptyList() throws XmlException { - List<String> empty = new ArrayList<String>(); + List<String> empty = Lists.newArrayList(); String xml = beanXmlConverter.convertToString(empty); XmlUtil.parse(xml); String expectedXml = "<feed xmlns=\"http://ns.opensocial.org/2008/opensocial\" " @@ -197,10 +198,11 @@ assertEquals(StringUtils.deleteWhitespace(expectedXml), StringUtils .deleteWhitespace(xml)); - List<List<String>> emptyLists = new ArrayList<List<String>>(); - emptyLists.add(new ArrayList<String>()); - emptyLists.add(new ArrayList<String>()); - emptyLists.add(new ArrayList<String>()); + List<List<String>> emptyLists = Lists.newArrayList(); + List<String> emptyList = Lists.newArrayList(); + emptyLists.add(emptyList); + emptyLists.add(emptyList); + emptyLists.add(emptyList); xml = beanXmlConverter.convertToString(emptyLists); XmlUtil.parse(xml); expectedXml = "<feed xmlns=\"http://ns.opensocial.org/2008/opensocial\" " @@ -215,7 +217,7 @@ } public void testElementNamesInList() throws XmlException { - List<Activity> activities = new ArrayList<Activity>(); + List<Activity> activities = Lists.newArrayList(); activities.add(activity); activities.add(activity); activities.add(activity); Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java?rev=732453&r1=732452&r2=732453&view=diff ============================================================================== --- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java Wed Jan 7 12:03:12 2009 @@ -167,7 +167,7 @@ } public void testMapToXml() throws XmlException { - Map<String, String> m = new LinkedHashMap<String, String>(); + Map<String, String> m = Maps.newLinkedHashMap(); m.put("key1", "value1"); m.put("key2", "value2"); String xml = beanXmlConverter.convertToString(m); @@ -181,17 +181,18 @@ } public void testEmptyList() throws XmlException { - List<String> empty = new ArrayList<String>(); + List<String> empty = Lists.newArrayList(); String xml = beanXmlConverter.convertToString(empty); XmlUtil.parse(xml); String expectedXml = "<response><list/></response>"; assertEquals(StringUtils.deleteWhitespace(expectedXml), StringUtils .deleteWhitespace(xml)); - List<List<String>> emptyLists = new ArrayList<List<String>>(); - emptyLists.add(new ArrayList<String>()); - emptyLists.add(new ArrayList<String>()); - emptyLists.add(new ArrayList<String>()); + List<List<String>> emptyLists = Lists.newArrayList(); + List<String> emptyList = Lists.newArrayList(); + emptyLists.add(emptyList); + emptyLists.add(emptyList); + emptyLists.add(emptyList); xml = beanXmlConverter.convertToString(emptyLists); XmlUtil.parse(xml); expectedXml = "<response><list.container>" + " <list/>" + " <list/>" @@ -201,7 +202,7 @@ } public void testElementNamesInList() throws XmlException { - List<Activity> activities = new ArrayList<Activity>(); + List<Activity> activities = Lists.newArrayList(); activities.add(activity); activities.add(activity); activities.add(activity); Modified: incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java?rev=732453&r1=732452&r2=732453&view=diff ============================================================================== --- incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java (original) +++ incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java Wed Jan 7 12:03:12 2009 @@ -32,7 +32,8 @@ import org.apache.shindig.social.opensocial.spi.SocialSpiException; import org.apache.shindig.social.opensocial.spi.UserId; -import com.google.common.collect.Maps; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Sets; import com.google.inject.Guice; import com.google.inject.Injector; @@ -111,7 +112,7 @@ options.setMax(20); RestfulCollection<Person> responseItem = db.getPeople( - Sets.newLinkedHashSet(JOHN_DOE, JANE_DOE), new GroupId(GroupId.Type.friends, null), + ImmutableSortedSet.of(JOHN_DOE, JANE_DOE), new GroupId(GroupId.Type.friends, null), options, Collections.<String>emptySet(), token).get(); assertNotNull(responseItem); assertEquals(responseItem.getTotalResults(), 4); @@ -207,7 +208,7 @@ public void testUpdateExpectedAppData() throws Exception { // Delete the data db.updatePersonData(CANON_USER, SELF_GROUP, APP_ID, - null, Maps.immutableMap("count", "10", "newvalue", "20"), new FakeGadgetToken()); + null, ImmutableMap.of("count", "10", "newvalue", "20"), new FakeGadgetToken()); // Fetch the remaining and test DataCollection responseItem = db.getPersonData( @@ -223,4 +224,4 @@ assertTrue(responseItem.getEntry().get(CANONICAL_USER_ID).containsKey("newvalue")); assertTrue(responseItem.getEntry().get(CANONICAL_USER_ID).get("newvalue").equals("20")); } -} \ No newline at end of file +} Modified: incubator/shindig/branches/1.0.x-incubating/pom.xml URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/pom.xml?rev=732453&r1=732452&r2=732453&view=diff ============================================================================== --- incubator/shindig/branches/1.0.x-incubating/pom.xml (original) +++ incubator/shindig/branches/1.0.x-incubating/pom.xml Wed Jan 7 12:03:12 2009 @@ -934,9 +934,9 @@ <version>1.0</version> </dependency> <dependency> - <groupId>com.google.code.google-collections</groupId> - <artifactId>google-collect</artifactId> - <version>snapshot-20080321</version> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + <version>0.8</version> </dependency> <dependency> <groupId>commons-codec</groupId>
