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/13 12:50:16 UTC
svn commit: r734107 [3/3] - in /incubator/shindig/trunk/java:
common/src/main/java/org/apache/shindig/auth/
common/src/main/java/org/apache/shindig/common/cache/
common/src/main/java/org/apache/shindig/common/crypto/
common/src/main/java/org/apache/shi...
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/JsonObjectToMapMorpher.java Tue Jan 13 03:38:45 2009
@@ -19,7 +19,6 @@
import com.google.common.collect.Maps;
-import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -56,7 +55,7 @@
Map<Object, Object> result = Maps.newHashMap();
JSONObject jsonObject = (JSONObject) bean;
for (Object entry : jsonObject.entrySet()) {
- result.put(((Entry)entry).getKey(), ((Entry)entry).getValue());
+ result.put(((Entry<?, ?>)entry).getKey(), ((Entry<?, ?>)entry).getValue());
}
return result;
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAttributeConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAttributeConverter.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAttributeConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomAttributeConverter.java Tue Jan 13 03:38:45 2009
@@ -44,6 +44,7 @@
* {@inheritDoc}
* @see com.thoughtworks.xstream.converters.ConverterMatcher#canConvert(java.lang.Class)
*/
+ @SuppressWarnings("unchecked")
public boolean canConvert(Class clazz) {
return AtomAttribute.class.equals(clazz);
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java Tue Jan 13 03:38:45 2009
@@ -22,7 +22,6 @@
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.Person;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLinkConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLinkConverter.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLinkConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLinkConverter.java Tue Jan 13 03:38:45 2009
@@ -65,6 +65,7 @@
*
* @see com.thoughtworks.xstream.converters.ConverterMatcher#canConvert(java.lang.Class)
*/
+ @SuppressWarnings("unchecked")
public boolean canConvert(Class clazz) {
return AtomLink.class.equals(clazz);
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/DataCollectionConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/DataCollectionConverter.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/DataCollectionConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/DataCollectionConverter.java Tue Jan 13 03:38:45 2009
@@ -28,13 +28,12 @@
import org.apache.shindig.social.opensocial.spi.DataCollection;
-import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
/**
* This converter changes the way in which a collection is serialized
- *
+ *
*/
public class DataCollectionConverter extends AbstractCollectionConverter {
@@ -47,7 +46,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter#canConvert(java.lang.Class)
*/
@Override
@@ -58,7 +57,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter#marshal(java.lang.Object,
* com.thoughtworks.xstream.io.HierarchicalStreamWriter,
* com.thoughtworks.xstream.converters.MarshallingContext)
@@ -108,7 +107,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter#unmarshal(com.thoughtworks.xstream.io.HierarchicalStreamReader,
* com.thoughtworks.xstream.converters.UnmarshallingContext)
*/
@@ -171,7 +170,7 @@
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 = Maps.newHashMap();
+ Map<String, String> mv = Maps.newHashMap();
mv.put(e.getKey(), (String) e.getValue());
fm.put(e.getKey(), mv);
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/GuiceBeanConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/GuiceBeanConverter.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/GuiceBeanConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/GuiceBeanConverter.java Tue Jan 13 03:38:45 2009
@@ -34,7 +34,7 @@
import java.util.Iterator;
/**
- *
+ *
*/
public class GuiceBeanConverter implements Converter {
private Mapper mapper;
@@ -88,8 +88,7 @@
if (mapping != null) {
if (mapping.getItemFieldName() != null) {
Collection<?> list = (Collection<?>) newObj;
- for (Iterator<?> iter = list.iterator(); iter.hasNext();) {
- Object obj = iter.next();
+ for (Object obj : list) {
writeField(propertyName, mapping.getItemFieldName(),
mapping.getItemType(), definedIn, obj);
}
@@ -165,6 +164,7 @@
/**
* @deprecated since 1.3
*/
+ @Deprecated
public static class DuplicateFieldException extends ConversionException {
public DuplicateFieldException(String msg) {
super(msg);
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/GuiceBeanProvider.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/GuiceBeanProvider.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/GuiceBeanProvider.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/GuiceBeanProvider.java Tue Jan 13 03:38:45 2009
@@ -18,11 +18,12 @@
package org.apache.shindig.social.core.util.xstream;
import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableSortedSet;
+import com.google.common.collect.ImmutableMap;
import com.google.inject.Injector;
import com.thoughtworks.xstream.converters.reflection.ObjectAccessException;
-import com.thoughtworks.xstream.core.util.OrderRetainingMap;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
@@ -30,16 +31,14 @@
import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeSet;
import java.util.WeakHashMap;
/**
- *
+ *
*/
public class GuiceBeanProvider {
@@ -63,15 +62,13 @@
}
public void visitSerializableProperties(Object object, Visitor visitor) {
- PropertyDescriptor[] propertyDescriptors = getSerializableProperties(object);
- for (int i = 0; i < propertyDescriptors.length; i++) {
- PropertyDescriptor property = propertyDescriptors[i];
+ for (PropertyDescriptor property : getSerializableProperties(object)) {
try {
Method readMethod = property.getReadMethod();
String name = property.getName();
Class<?> definedIn = readMethod.getDeclaringClass();
if (visitor.shouldVisit(name, definedIn)) {
- Object value = readMethod.invoke(object, new Object[0]);
+ Object value = readMethod.invoke(object);
visitor.visit(name, property.getPropertyType(), definedIn, value);
}
} catch (IllegalArgumentException e) {
@@ -90,7 +87,7 @@
public void writeProperty(Object object, String propertyName, Object value) {
PropertyDescriptor property = getProperty(propertyName, object.getClass());
try {
- property.getWriteMethod().invoke(object, new Object[] { value });
+ property.getWriteMethod().invoke(object, value);
} catch (IllegalArgumentException e) {
throw new ObjectAccessException("Could not set property "
+ object.getClass() + "." + property.getName(), e);
@@ -111,22 +108,21 @@
return getProperty(name, type) != null;
}
- private PropertyDescriptor[] getSerializableProperties(Object object) {
+ private List<PropertyDescriptor> getSerializableProperties(Object object) {
Map<String, PropertyDescriptor> nameMap = getNameMap(object.getClass());
+
+ Set<String> names = (propertyNameComparator == null) ? nameMap.keySet() :
+ ImmutableSortedSet.orderedBy(propertyNameComparator).copyOf(nameMap.keySet());
+
List<PropertyDescriptor> result = Lists.newArrayListWithExpectedSize(nameMap.size());
- Set<String> names = nameMap.keySet();
- if (propertyNameComparator != null) {
- Set<String> sortedSet = new TreeSet<String>(propertyNameComparator);
- sortedSet.addAll(names);
- names = sortedSet;
- }
+
for (final String name : names) {
final PropertyDescriptor descriptor = nameMap.get(name);
if (canStreamProperty(descriptor)) {
result.add(descriptor);
}
}
- return result.toArray(new PropertyDescriptor[result.size()]);
+ return result;
}
protected boolean canStreamProperty(PropertyDescriptor descriptor) {
@@ -140,28 +136,31 @@
}
private PropertyDescriptor getProperty(String name, Class<?> type) {
- return (PropertyDescriptor) getNameMap(type).get(name);
+ return getNameMap(type).get(name);
}
private Map<String, PropertyDescriptor> getNameMap(Class<?> type) {
Map<String, PropertyDescriptor> nameMap = propertyNameCache.get(type);
- if (nameMap == null) {
- BeanInfo beanInfo;
- try {
- beanInfo = Introspector.getBeanInfo(type, Object.class);
- } catch (IntrospectionException e) {
- throw new ObjectAccessException("Cannot get BeanInfo of type "
- + type.getName(), e);
- }
- nameMap = new OrderRetainingMap();
- propertyNameCache.put(type, nameMap);
- PropertyDescriptor[] propertyDescriptors = beanInfo
- .getPropertyDescriptors();
- for (int i = 0; i < propertyDescriptors.length; i++) {
- PropertyDescriptor descriptor = propertyDescriptors[i];
- nameMap.put(descriptor.getName(), descriptor);
- }
+
+ if (nameMap != null) {
+ return nameMap;
+ }
+
+ ImmutableMap.Builder<String,PropertyDescriptor> nameMapBuilder = ImmutableMap.builder();
+
+ BeanInfo beanInfo;
+ try {
+ beanInfo = Introspector.getBeanInfo(type, Object.class);
+ } catch (IntrospectionException e) {
+ throw new ObjectAccessException("Cannot get BeanInfo of type "
+ + type.getName(), e);
+ }
+
+ for (PropertyDescriptor descriptor : beanInfo.getPropertyDescriptors()) {
+ nameMapBuilder.put(descriptor.getName(), descriptor);
}
+ nameMap = nameMapBuilder.build();
+ propertyNameCache.put(type, nameMap);
return nameMap;
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceClassMapper.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceClassMapper.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceClassMapper.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceClassMapper.java Tue Jan 13 03:38:45 2009
@@ -19,18 +19,13 @@
import com.google.common.collect.Maps;
-import com.google.inject.ImplementedBy;
-
import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.mapper.MapperWrapper;
-import org.apache.shindig.social.opensocial.model.Person;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -84,9 +79,9 @@
* as it is shared over multiple threads.
*/
private WriterStack writerStack;
-
+
/**
- * A list of explicit mapping specifications.
+ * A list of explicit mapping specifications.
*/
private List<ImplicitCollectionFieldMapping> itemFieldMappings;
@@ -282,11 +277,12 @@
}
-
+
/**
* {@inheritDoc}
* @see com.thoughtworks.xstream.mapper.MapperWrapper#getImplicitCollectionDefForFieldName(java.lang.Class, java.lang.String)
*/
+ @SuppressWarnings("unchecked")
@Override
public ImplicitCollectionMapping getImplicitCollectionDefForFieldName(
Class itemType, String fieldName) {
@@ -299,5 +295,5 @@
}
-
+
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceFieldAliasingMapper.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceFieldAliasingMapper.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceFieldAliasingMapper.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/InterfaceFieldAliasingMapper.java Tue Jan 13 03:38:45 2009
@@ -20,17 +20,14 @@
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;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
- *
+ *
*/
public class InterfaceFieldAliasingMapper extends MapperWrapper {
@@ -64,10 +61,11 @@
/**
* {@inheritDoc}
- *
+ *
* @see com.thoughtworks.xstream.mapper.MapperWrapper#realMember(java.lang.Class,
* java.lang.String)
*/
+ @SuppressWarnings("unchecked")
@Override
public String realMember(Class type, String serialized) {
// get the possible member spec, using the serialized elment as the key.
@@ -86,10 +84,11 @@
/**
* {@inheritDoc}
- *
+ *
* @see com.thoughtworks.xstream.mapper.MapperWrapper#serializedMember(java.lang.Class,
* java.lang.String)
*/
+ @SuppressWarnings("unchecked")
@Override
public String serializedMember(Class type, String memberName) {
// get the possible serialized spec, using the memberName elment as the key.
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/MapConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/MapConverter.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/MapConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/MapConverter.java Tue Jan 13 03:38:45 2009
@@ -23,6 +23,7 @@
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.mapper.Mapper;
+import com.google.common.collect.Maps;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -70,6 +71,7 @@
* com.thoughtworks.xstream.io.HierarchicalStreamWriter,
* com.thoughtworks.xstream.converters.MarshallingContext)
*/
+ @Override
public void marshal(Object source, HierarchicalStreamWriter writer,
MarshallingContext context) {
Map<?, ?> map = (Map<?, ?>) source;
@@ -106,9 +108,10 @@
* .xstream.io.HierarchicalStreamReader,
* com.thoughtworks.xstream.converters.UnmarshallingContext)
*/
+ @Override
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context) {
- Map<String, Object> m = new ConcurrentHashMap<String, Object>();
+ Map<String, Object> m = Maps.newConcurrentHashMap();
reader.moveDown();
while (reader.hasMoreChildren()) {
String key = reader.getNodeName();
@@ -162,6 +165,7 @@
* @see com.thoughtworks.xstream.converters.ConverterMatcher#canConvert(java.lang
* .Class)
*/
+ @Override
@SuppressWarnings("unchecked")
// API is not generic
public boolean canConvert(Class clazz) {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/NamespaceSet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/NamespaceSet.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/NamespaceSet.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/NamespaceSet.java Tue Jan 13 03:38:45 2009
@@ -19,7 +19,6 @@
import com.google.common.collect.Maps;
-import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/PropertyDictionary.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/PropertyDictionary.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/PropertyDictionary.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/PropertyDictionary.java Tue Jan 13 03:38:45 2009
@@ -26,7 +26,6 @@
import java.beans.Introspector;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
@@ -41,7 +40,7 @@
*/
public class PropertyDictionary {
- private final Map<String, Map<String, BeanProperty>> keyedByPropertyNameCache = new ConcurrentHashMap<String, Map<String, BeanProperty>>();
+ private final Map<String, Map<String, BeanProperty>> keyedByPropertyNameCache = Maps.newConcurrentHashMap();
public Iterator<BeanProperty> serializablePropertiesFor(Class<?> cls) {
return buildMap(cls).values().iterator();
@@ -49,15 +48,14 @@
/**
* Locates a serializable property
- *
+ *
* @param cls
* @param name
- * @param definedIn
* @return
*/
public BeanProperty property(Class<?> cls, String name) {
Map<String, BeanProperty> properties = buildMap(cls);
- BeanProperty property = (BeanProperty) properties.get(name);
+ BeanProperty property = properties.get(name);
if (property == null) {
throw new ObjectAccessException("No such property " + cls.getName() + "."
+ name);
@@ -68,9 +66,8 @@
/**
* Builds the map of all serializable properties for the the provided bean
- *
+ *
* @param cls
- * @param tupleKeyed
* @return
*/
private Map<String, BeanProperty> buildMap(Class<?> cls) {
@@ -85,15 +82,15 @@
final Map<PropertyKey, BeanProperty> propertyMap = Maps.newHashMap();
Method[] methods = cls.getMethods();
- for (int i = 0; i < methods.length; i++) {
- if (!Modifier.isPublic(methods[i].getModifiers())
- || Modifier.isStatic(methods[i].getModifiers())) {
+ for (Method method : methods) {
+ if (!Modifier.isPublic(method.getModifiers())
+ || Modifier.isStatic(method.getModifiers())) {
continue;
}
- String methodName = methods[i].getName();
- Class<?>[] parameters = methods[i].getParameterTypes();
- Class<?> returnType = methods[i].getReturnType();
+ String methodName = method.getName();
+ Class<?>[] parameters = method.getParameterTypes();
+ Class<?> returnType = method.getReturnType();
String propertyName = null;
if ((methodName.startsWith("get") || methodName.startsWith("is"))
&& parameters.length == 0 && returnType != null) {
@@ -105,13 +102,13 @@
.substring(2));
BeanProperty property = getBeanProperty(propertyMap, cls,
propertyName, returnType);
- property.setGetterMethod(methods[i]);
+ property.setGetterMethod(method);
} else if (methodName.startsWith("set") && parameters.length == 1
&& returnType.equals(void.class)) {
propertyName = Introspector.decapitalize(methodName.substring(3));
BeanProperty property = getBeanProperty(propertyMap, cls,
propertyName, parameters[0]);
- property.setSetterMethod(methods[i]);
+ property.setSetterMethod(method);
}
}
@@ -127,7 +124,7 @@
.sort(serializableProperties, new BeanPropertyComparator());
// build the maps and return
- final Map<String, BeanProperty> keyedByFieldName = new OrderRetainingMap();
+ final Map<String, BeanProperty> keyedByFieldName = new OrderRetainingMap<String, BeanProperty>();
for (BeanProperty property : serializableProperties) {
keyedByFieldName.put(property.getName(), property);
}
@@ -136,14 +133,14 @@
}
}
}
- return (Map<String, BeanProperty>) keyedByPropertyNameCache.get(clsName);
+ return keyedByPropertyNameCache.get(clsName);
}
private BeanProperty getBeanProperty(
Map<PropertyKey, BeanProperty> propertyMap, Class<?> cls,
String propertyName, Class<?> type) {
PropertyKey key = new PropertyKey(propertyName, type);
- BeanProperty property = (BeanProperty) propertyMap.get(key);
+ BeanProperty property = propertyMap.get(key);
if (property == null) {
property = new BeanProperty(cls, propertyName, type);
propertyMap.put(key, property);
@@ -165,6 +162,7 @@
this.propertyType = propertyType;
}
+ @Override
public boolean equals(Object o) {
if (this == o)
return true;
@@ -183,6 +181,7 @@
return true;
}
+ @Override
public int hashCode() {
int result;
result = (propertyName != null ? propertyName.hashCode() : 0);
@@ -191,6 +190,7 @@
return result;
}
+ @Override
public String toString() {
return "PropertyKey{propertyName='" + propertyName + "'"
+ ", propertyType=" + propertyType + "}";
@@ -204,6 +204,10 @@
private static class BeanPropertyComparator implements
Comparator<BeanProperty> {
+ protected BeanPropertyComparator()
+ {
+ }
+
public int compare(BeanProperty o1, BeanProperty o2) {
return o1.getName().compareTo(o2.getName());
}
@@ -214,11 +218,17 @@
private static final long serialVersionUID = 1565370254073638221L;
private List<V> valueOrder = Lists.newArrayList();
+ protected OrderRetainingMap()
+ {
+ }
+
+ @Override
public V put(K key, V value) {
valueOrder.add(value);
return super.put(key, value);
}
+ @Override
public Collection<V> values() {
return Collections.unmodifiableList(valueOrder);
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/RestfullCollectionConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/RestfullCollectionConverter.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/RestfullCollectionConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/RestfullCollectionConverter.java Tue Jan 13 03:38:45 2009
@@ -28,7 +28,7 @@
/**
* This converter changes the way in which a collection is serialized
- *
+ *
*/
public class RestfullCollectionConverter extends AbstractCollectionConverter {
@@ -41,9 +41,10 @@
/**
* {@inheritDoc}
- *
+ *
* @see com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter#canConvert(java.lang.Class)
*/
+ @SuppressWarnings("unchecked")
@Override
public boolean canConvert(Class clazz) {
boolean convert = (RestfulCollection.class.isAssignableFrom(clazz));
@@ -52,7 +53,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter#marshal(java.lang.Object,
* com.thoughtworks.xstream.io.HierarchicalStreamWriter,
* com.thoughtworks.xstream.converters.MarshallingContext)
@@ -87,7 +88,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter#unmarshal(com.thoughtworks.xstream.io.HierarchicalStreamReader,
* com.thoughtworks.xstream.converters.UnmarshallingContext)
*/
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/StackWriterWrapper.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/StackWriterWrapper.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/StackWriterWrapper.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/StackWriterWrapper.java Tue Jan 13 03:38:45 2009
@@ -65,6 +65,7 @@
* @see com.thoughtworks.xstream.io.WriterWrapper#addAttribute(java.lang.String,
* java.lang.String)
*/
+ @Override
public void addAttribute(String name, String value) {
if (!"class".equals(name)) {
super.addAttribute(name, value);
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/ThreadSafeWriterStack.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/ThreadSafeWriterStack.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/ThreadSafeWriterStack.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/ThreadSafeWriterStack.java Tue Jan 13 03:38:45 2009
@@ -19,7 +19,6 @@
import com.google.common.collect.Lists;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -33,10 +32,11 @@
/**
* A thread local holder for the stack.
*/
- private ThreadLocal<List<Object[]>> stackHolder = new ThreadLocal<List<Object[]>>() {
- protected List<Object[]> initialValue() {
- return Lists.newArrayList();
- }
+ private ThreadLocal<List<Object[]>> stackHolder = new ThreadLocal<List<Object[]>>() {
+ @Override
+ protected List<Object[]> initialValue() {
+ return Lists.newArrayList();
+ }
};
/**
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java Tue Jan 13 03:38:45 2009
@@ -56,7 +56,6 @@
import org.apache.shindig.social.opensocial.spi.RestfulCollection;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -90,11 +89,11 @@
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";
-
+
static {
// configure the name space mapping. This does not need to be all the elments in the
// namespace, just the point of translation from one namespace to another.
- // It would have been good to use a standard parser/serializer approach, but
+ // It would have been good to use a standard parser/serializer approach, but
// the xstream namespace implementation does not work exactly how we need it to.
NamespaceSet atom = new NamespaceSet();
atom.addNamespace("xmlns", ATOM_NS);
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStreamConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStreamConfiguration.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStreamConfiguration.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStreamConfiguration.java Tue Jan 13 03:38:45 2009
@@ -33,8 +33,8 @@
@ImplementedBy(XStream081Configuration.class)
public interface XStreamConfiguration {
public static enum ConverterSet {
- MAP(), COLLECTION(), DEFAULT();
- };
+ MAP(), COLLECTION(), DEFAULT()
+ }
public class ConverterConfig {
public InterfaceClassMapper mapper;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java Tue Jan 13 03:38:45 2009
@@ -19,7 +19,6 @@
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;
@@ -203,7 +202,7 @@
/**
* a Map to convert json string to Field representations.
*/
-
+
private static final Map<String,Field> lookup = Maps.uniqueIndex(EnumSet.allOf(Field.class), Functions.TO_STRING);
/**
@@ -220,7 +219,7 @@
* The set of default fields returned fields.
*/
public static final Set<String> DEFAULT_FIELDS = ImmutableSet.of(
- ID.toString(),
+ ID.toString(),
NAME.toString(),
THUMBNAIL_URL.toString());
@@ -342,7 +341,7 @@
* @param birthday the person's data of birth
*/
void setBirthday(Date birthday);
-
+
/**
* Get the person's body characteristics, specified as an BodyType. Container support for this
* field is OPTIONAL.
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java Tue Jan 13 03:38:45 2009
@@ -85,6 +85,7 @@
* The post data should be a regular json object. All of the fields vars will be pulled from the
* values and set. If there are no fields vars then all of the data will be overridden.
*/
+ @SuppressWarnings("unchecked")
@Override
protected Future<?> handlePost(RequestItem request) throws SocialSpiException {
request.applyUrlTemplate(APP_DATA_PATH);
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java Tue Jan 13 03:38:45 2009
@@ -22,7 +22,6 @@
import org.apache.shindig.social.opensocial.spi.RestfulCollection;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
import java.io.IOException;
import java.io.PrintWriter;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java Tue Jan 13 03:38:45 2009
@@ -23,7 +23,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import net.oauth.OAuthAccessor;
import net.oauth.OAuthConsumer;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java Tue Jan 13 03:38:45 2009
@@ -49,6 +49,7 @@
/**
* We don't support any delete methods right now.
*/
+ @Override
protected Future<?> handleDelete(RequestItem request) throws SocialSpiException {
throw new SocialSpiException(ResponseError.NOT_IMPLEMENTED, null);
}
@@ -56,6 +57,7 @@
/**
* We don't distinguish between put and post for these urls.
*/
+ @Override
protected Future<?> handlePut(RequestItem request) throws SocialSpiException {
return handlePost(request);
}
@@ -64,6 +66,7 @@
* Handles /samplecontainer/setstate and /samplecontainer/setevilness/{doevil}. TODO(doll): These
* urls aren't very resty. Consider changing the samplecontainer.html calls post.
*/
+ @Override
protected Future<?> handlePost(RequestItem request) throws SocialSpiException {
request.applyUrlTemplate(POST_PATH);
String type = request.getParameter("type");
@@ -86,6 +89,7 @@
/**
* Handles /samplecontainer/dumpstate
*/
+ @Override
protected Future<?> handleGet(RequestItem request) {
return ImmediateFuture.newInstance(service.getDb());
}
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JsonLibTestsGuiceModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JsonLibTestsGuiceModule.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JsonLibTestsGuiceModule.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/JsonLibTestsGuiceModule.java Tue Jan 13 03:38:45 2009
@@ -28,7 +28,6 @@
import java.util.Map;
import com.google.inject.AbstractModule;
-import com.google.inject.name.Named;
import com.google.inject.name.Names;
/**
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java Tue Jan 13 03:38:45 2009
@@ -21,7 +21,6 @@
import org.apache.shindig.common.servlet.ParameterFetcher;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXStreamConverter;
-import org.apache.shindig.social.core.util.BeanXmlConverter;
import org.apache.shindig.social.opensocial.service.BeanConverter;
import org.apache.shindig.social.opensocial.service.DataServiceServletFetcher;
@@ -40,7 +39,7 @@
bind(String.class).annotatedWith(Names.named("shindig.canonical.json.db"))
.toInstance("sampledata/canonicaldb.json");
-
+
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.xml")).to(
BeanXStreamConverter.class);
bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json")).to(
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java Tue Jan 13 03:38:45 2009
@@ -34,7 +34,7 @@
import org.apache.shindig.social.opensocial.service.DataServiceServlet;
import org.apache.shindig.social.opensocial.service.HandlerDispatcher;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
import org.json.JSONObject;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonPeopleTest.java Tue Jan 13 03:38:45 2009
@@ -48,6 +48,8 @@
public class RestfulJsonPeopleTest extends AbstractLargeRestfulTests {
private Person canonical;
+ @SuppressWarnings({ "unchecked", "boxing" })
+ @Override
protected void setUp() throws Exception {
super.setUp();
NameImpl name = new NameImpl("Sir Shin H. Digg Social Butterfly");
@@ -200,6 +202,7 @@
*
* @throws Exception if test encounters an error
*/
+ @SuppressWarnings("boxing")
@Test
public void testGetPersonJson() throws Exception {
// TODO(doll): Test all of the date fields
@@ -406,6 +409,7 @@
assertEquals(list.get(0), actual.getString(0));
}
+ @SuppressWarnings("unchecked")
private void assertEnumField(JSONObject result, Enum expected,
Person.Field field) throws JSONException {
JSONObject actual = result.getJSONObject(field.toString());
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlPeopleTest.java Tue Jan 13 03:38:45 2009
@@ -55,6 +55,8 @@
private Person canonical;
private XPathFactory xpathFactory;
+ @SuppressWarnings({ "boxing", "unchecked" })
+ @Override
protected void setUp() throws Exception {
super.setUp();
xpathFactory = XPathFactory.newInstance();
@@ -214,6 +216,7 @@
* @throws Exception
* if test encounters an error
*/
+ @SuppressWarnings("boxing")
@Test
public void testGetPersonJson() throws Exception {
// TODO(doll): Test all of the date fields
@@ -228,9 +231,9 @@
// Currently, for Shindig {pid}/@all/{uid} == {uid}/@self
String resp = getResponse("/people/canonical/@self", "GET", extraParams,
"xml", "application/xml");
-
+
XSDValidator.validate(resp, XMLSCHEMA, XSDRESOURCE,false);
-
+
XPath xp = xpathFactory.newXPath();
NodeList resultNodeList = (NodeList) xp.evaluate("/response/person",
new InputSource(new StringReader(resp)), XPathConstants.NODESET);
@@ -430,6 +433,7 @@
.get(0)));
}
+ @SuppressWarnings("boxing")
private void assertFloatField(Map<String, List<String>> result,
Float expected, Object field) {
assertEquals(expected.floatValue(), Float.valueOf(result.get(
@@ -447,7 +451,7 @@
t = "";
} else {
t = v.get(0);
- }
+ }
assertEquals(expected, t);
}
@@ -459,7 +463,7 @@
}
}
- private void assertEnumField(Map<String, List<Node>> result, Enum expected,
+ private void assertEnumField(Map<String, List<Node>> result, Enum<?> expected,
Person.Field field) {
Map<String, List<String>> actual = childNodesToMap(result.get(
field.toString()).get(0));
@@ -503,9 +507,9 @@
// Currently, for Shindig @all == @friends
String resp = getResponse("/people/john.doe/@friends", "GET", extraParams,
"xml", "application/xml");
-
+
XSDValidator.validate(resp, XMLSCHEMA, XSDRESOURCE,false);
-
+
XPath xp = xpathFactory.newXPath();
NodeList resultNodeList = (NodeList) xp.evaluate("/response",
new InputSource(new StringReader(resp)), XPathConstants.NODESET);
@@ -520,10 +524,10 @@
// The users should be in alphabetical order
Map<String, List<Node>> entryOne = childNodesToNodeMap(resultNodes.get("entry").get(0));
-
+
assertPerson(childNodesToNodeMap(entryOne.get("person").get(0)),
"george.doe", "George Doe");
-
+
Map<String, List<Node>> entryTwo = childNodesToNodeMap(resultNodes.get("entry").get(1));
assertPerson(childNodesToNodeMap(entryTwo.get("person").get(0)),
"jane.doe", "Jane Doe");
@@ -557,7 +561,7 @@
assertEquals("0", result.get("startIndex").get(0));
Map<String, List<Node>> entryOne = childNodesToNodeMap(resultNodes.get("entry").get(0));
-
+
assertPerson(childNodesToNodeMap(entryOne.get("person").get(0)),
"george.doe", "George Doe");
@@ -565,7 +569,7 @@
extraParams.put("startIndex", "1");
resp = getResponse("/people/john.doe/@friends", "GET", extraParams, "xml",
"application/xml");
-
+
XSDValidator.validate(resp, XMLSCHEMA, XSDRESOURCE,false);
xp = xpathFactory.newXPath();
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java Tue Jan 13 03:38:45 2009
@@ -88,7 +88,7 @@
List<Activity> activityList = ImmutableList.of();
RestfulCollection<Activity> data = new RestfulCollection<Activity>(activityList);
- EasyMock.expect(activityService.getActivities(JOHN_DOE,
+ org.easymock.EasyMock.expect(activityService.getActivities(JOHN_DOE,
new GroupId(group, null), null, Sets.<String>newHashSet(), new CollectionOptions(request), token)).andReturn(
ImmediateFuture.newInstance(data));
@@ -116,7 +116,7 @@
RestfulCollection<Activity> data = new RestfulCollection<Activity>(activities);
Set<UserId> userIdSet = Sets.newLinkedHashSet(JOHN_DOE);
userIdSet.add(new UserId(UserId.Type.userId, "jane.doe"));
- EasyMock.expect(activityService.getActivities(userIdSet,
+ org.easymock.EasyMock.expect(activityService.getActivities(userIdSet,
new GroupId(GroupId.Type.self, null), "appId", Sets.<String>newHashSet(), new CollectionOptions(request), token)).andReturn(
ImmediateFuture.newInstance(data));
@@ -129,7 +129,7 @@
setPath("/people/john.doe/@friends/@app/1");
Activity activity = new ActivityImpl();
- EasyMock.expect(activityService.getActivity(JOHN_DOE.iterator().next(),
+ org.easymock.EasyMock.expect(activityService.getActivity(JOHN_DOE.iterator().next(),
new GroupId(GroupId.Type.friends, null),
"appId", Sets.<String>newHashSet(), "1", token)).andReturn(
ImmediateFuture.newInstance(activity));
@@ -145,9 +145,9 @@
setPathAndPostData("/people/john.doe/@self/@app", jsonActivity);
Activity activity = new ActivityImpl();
- EasyMock.expect(converter.convertToObject(jsonActivity, Activity.class)).andReturn(activity);
+ org.easymock.EasyMock.expect(converter.convertToObject(jsonActivity, Activity.class)).andReturn(activity);
- EasyMock.expect(activityService.createActivity(JOHN_DOE.iterator().next(),
+ org.easymock.EasyMock.expect(activityService.createActivity(JOHN_DOE.iterator().next(),
new GroupId(GroupId.Type.self, null), "appId", Sets.<String>newHashSet(),
activity, token)).andReturn(ImmediateFuture.newInstance((Void) null));
replay();
@@ -168,7 +168,7 @@
public void testHandleDelete() throws Exception {
setPath("/people/john.doe/@self/@app/1");
- EasyMock.expect(activityService.deleteActivities(JOHN_DOE.iterator().next(),
+ org.easymock.EasyMock.expect(activityService.deleteActivities(JOHN_DOE.iterator().next(),
new GroupId(GroupId.Type.self, null), "appId", Sets.newHashSet("1"), token)).andReturn(
ImmediateFuture.newInstance((Void) null));
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java Tue Jan 13 03:38:45 2009
@@ -95,7 +95,7 @@
setPath("/activities/john.doe/@" + group.toString() + "/appId");
DataCollection data = new DataCollection(null);
- EasyMock.expect(appDataService.getPersonData(JOHN_DOE,
+ org.easymock.EasyMock.expect(appDataService.getPersonData(JOHN_DOE,
new GroupId(group, null),
"appId", Sets.<String>newHashSet(), token)).andReturn(ImmediateFuture.newInstance(data));
@@ -122,7 +122,7 @@
DataCollection data = new DataCollection(null);
Set<UserId> userIdSet = Sets.newLinkedHashSet(JOHN_DOE);
userIdSet.add(new UserId(UserId.Type.userId, "jane.doe"));
- EasyMock.expect(appDataService.getPersonData(userIdSet,
+ org.easymock.EasyMock.expect(appDataService.getPersonData(userIdSet,
new GroupId(GroupId.Type.self, null),
"appId", Sets.<String>newHashSet(), token)).andReturn(ImmediateFuture.newInstance(data));
@@ -137,7 +137,7 @@
setPathAndParams("/appData/john.doe/@friends/appId", params);
DataCollection data = new DataCollection(null);
- EasyMock.expect(appDataService.getPersonData(JOHN_DOE,
+ org.easymock.EasyMock.expect(appDataService.getPersonData(JOHN_DOE,
new GroupId(GroupId.Type.friends, null),
"appId", Sets.newHashSet("pandas"), token)).andReturn(ImmediateFuture.newInstance(data));
@@ -154,9 +154,9 @@
setPathAndParams("/appData/john.doe/@self/appId", params, jsonAppData);
HashMap<String, String> values = Maps.newHashMap();
- EasyMock.expect(converter.convertToObject(jsonAppData, HashMap.class)).andReturn(values);
+ org.easymock.EasyMock.expect(converter.convertToObject(jsonAppData, HashMap.class)).andReturn(values);
- EasyMock.expect(appDataService.updatePersonData(JOHN_DOE.iterator().next(),
+ org.easymock.EasyMock.expect(appDataService.updatePersonData(JOHN_DOE.iterator().next(),
new GroupId(GroupId.Type.self, null),
"appId", Sets.newHashSet("pandas"), values, token))
.andReturn(ImmediateFuture.newInstance((Void) null));
@@ -190,7 +190,7 @@
// create an invalid set of app data and inject
values.put("Aokkey", "an ok key");
values.put("", "an empty value");
- EasyMock.expect(converter.convertToObject(jsonAppData, HashMap.class)).andReturn(values);
+ org.easymock.EasyMock.expect(converter.convertToObject(jsonAppData, HashMap.class)).andReturn(values);
replay();
try {
@@ -216,7 +216,7 @@
// create an invalid set of app data and inject
values.put("Aokkey", "an ok key");
values.put("a bad key", "a good value");
- EasyMock.expect(converter.convertToObject(jsonAppData, HashMap.class)).andReturn(values);
+ org.easymock.EasyMock.expect(converter.convertToObject(jsonAppData, HashMap.class)).andReturn(values);
replay();
try {
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java Tue Jan 13 03:38:45 2009
@@ -111,9 +111,9 @@
"{id:id,error:{message:'notImplemented: The service junk is not implemented',code:501}}");
PrintWriter writerMock = EasyMock.createMock(PrintWriter.class);
- EasyMock.expect(res.getWriter()).andReturn(writerMock);
- writerMock.write(EasyMock.eq(err.toString()));
- EasyMock.expectLastCall();
+ org.easymock.EasyMock.expect(res.getWriter()).andReturn(writerMock);
+ writerMock.write(org.easymock.EasyMock.eq(err.toString()));
+ org.easymock.EasyMock.expectLastCall();
EasyMock.replay(req, res, jsonConverter, writerMock);
servlet.service(req, res);
@@ -128,17 +128,17 @@
*/
public void testFailedRequest() throws Exception {
setupRequest("{id:id,method:appdata.get}");
- EasyMock.expect(appDataHandler.handleItem(EasyMock.isA(RpcRequestItem.class)));
- EasyMock.expectLastCall().andReturn(
+ org.easymock.EasyMock.expect(appDataHandler.handleItem(org.easymock.EasyMock.isA(RpcRequestItem.class)));
+ org.easymock.EasyMock.expectLastCall().andReturn(
ImmediateFuture.errorInstance(new RuntimeException("FAILED")));
JSONObject err = new JSONObject(
"{id:id,error:{message:'internalError: FAILED',code:500}}");
PrintWriter writerMock = EasyMock.createMock(PrintWriter.class);
- EasyMock.expect(res.getWriter()).andReturn(writerMock);
- writerMock.write(EasyMock.eq(err.toString()));
- EasyMock.expectLastCall();
+ org.easymock.EasyMock.expect(res.getWriter()).andReturn(writerMock);
+ writerMock.write(org.easymock.EasyMock.eq(err.toString()));
+ org.easymock.EasyMock.expectLastCall();
EasyMock.replay(req, res, appDataHandler, jsonConverter, writerMock);
servlet.service(req, res);
@@ -152,19 +152,19 @@
String resultObject = "my lovely json";
- EasyMock.expect(handler.handleItem(EasyMock.isA(RequestItem.class)));
- EasyMock.expectLastCall().andReturn(ImmediateFuture.newInstance(resultObject));
+ org.easymock.EasyMock.expect(handler.handleItem(org.easymock.EasyMock.isA(RequestItem.class)));
+ org.easymock.EasyMock.expectLastCall().andReturn(ImmediateFuture.newInstance(resultObject));
- EasyMock.expect(jsonConverter.convertToJson(resultObject))
+ org.easymock.EasyMock.expect(jsonConverter.convertToJson(resultObject))
.andReturn(new JSONObject(ImmutableMap.of("foo", "bar")));
JSONObject result = new JSONObject();
result.put("id", "id");
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()));
- EasyMock.expectLastCall();
+ org.easymock.EasyMock.expect(res.getWriter()).andReturn(writerMock);
+ writerMock.write(org.easymock.EasyMock.eq(result.toString()));
+ org.easymock.EasyMock.expectLastCall();
EasyMock.replay(req, res, handler, jsonConverter, writerMock);
servlet.service(req, res);
@@ -179,19 +179,19 @@
String resultObject = "my lovely json";
Future<?> responseItemFuture = ImmediateFuture.newInstance(resultObject);
- EasyMock.expect(peopleHandler.handleItem(EasyMock.isA(RequestItem.class)));
- EasyMock.expectLastCall().andReturn(responseItemFuture);
- EasyMock.expect(activityHandler.handleItem(EasyMock.isA(RequestItem.class)));
- EasyMock.expectLastCall().andReturn(responseItemFuture);
+ org.easymock.EasyMock.expect(peopleHandler.handleItem(org.easymock.EasyMock.isA(RequestItem.class)));
+ org.easymock.EasyMock.expectLastCall().andReturn(responseItemFuture);
+ org.easymock.EasyMock.expect(activityHandler.handleItem(org.easymock.EasyMock.isA(RequestItem.class)));
+ org.easymock.EasyMock.expectLastCall().andReturn(responseItemFuture);
- EasyMock.expect(jsonConverter.convertToJson(resultObject))
+ org.easymock.EasyMock.expect(jsonConverter.convertToJson(resultObject))
.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);
- EasyMock.expect(res.getWriter()).andReturn(writerMock);
- writerMock.write(EasyMock.eq(result.toString()));
- EasyMock.expectLastCall();
+ org.easymock.EasyMock.expect(res.getWriter()).andReturn(writerMock);
+ writerMock.write(org.easymock.EasyMock.eq(result.toString()));
+ org.easymock.EasyMock.expectLastCall();
EasyMock.replay(req, res, peopleHandler, activityHandler, jsonConverter, writerMock);
servlet.service(req, res);
@@ -200,27 +200,27 @@
}
public void testGetExecution() throws Exception {
- EasyMock.expect(req.getParameterMap()).andStubReturn(
+ org.easymock.EasyMock.expect(req.getParameterMap()).andStubReturn(
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");
+ org.easymock.EasyMock.expect(req.getMethod()).andStubReturn("GET");
+ org.easymock.EasyMock.expect(req.getAttribute(org.easymock.EasyMock.isA(String.class))).andReturn(FAKE_GADGET_TOKEN);
+ org.easymock.EasyMock.expect(req.getCharacterEncoding()).andStubReturn("UTF-8");
res.setCharacterEncoding("UTF-8");
String resultObject = "my lovely json";
Future<?> responseItemFuture = ImmediateFuture.newInstance(resultObject);
- EasyMock.expect(peopleHandler.handleItem(EasyMock.isA(RequestItem.class)));
- EasyMock.expectLastCall().andReturn(responseItemFuture);
+ org.easymock.EasyMock.expect(peopleHandler.handleItem(org.easymock.EasyMock.isA(RequestItem.class)));
+ org.easymock.EasyMock.expectLastCall().andReturn(responseItemFuture);
- EasyMock.expect(jsonConverter.convertToJson(resultObject))
+ org.easymock.EasyMock.expect(jsonConverter.convertToJson(resultObject))
.andReturn(new JSONObject(ImmutableMap.of("foo", "bar")));
JSONObject result = new JSONObject("{id:'1',data:{foo:'bar'}}");
PrintWriter writerMock = EasyMock.createMock(PrintWriter.class);
- EasyMock.expect(res.getWriter()).andReturn(writerMock);
- writerMock.write(EasyMock.eq(result.toString()));
- EasyMock.expectLastCall();
+ org.easymock.EasyMock.expect(res.getWriter()).andReturn(writerMock);
+ writerMock.write(org.easymock.EasyMock.eq(result.toString()));
+ org.easymock.EasyMock.expectLastCall();
EasyMock.replay(req, res, peopleHandler, activityHandler, jsonConverter, writerMock);
servlet.service(req, res);
@@ -237,10 +237,10 @@
}
};
- EasyMock.expect(req.getInputStream()).andStubReturn(stream);
- EasyMock.expect(req.getMethod()).andStubReturn("POST");
- EasyMock.expect(req.getAttribute(EasyMock.isA(String.class))).andReturn(FAKE_GADGET_TOKEN);
- EasyMock.expect(req.getCharacterEncoding()).andStubReturn("UTF-8");
+ org.easymock.EasyMock.expect(req.getInputStream()).andStubReturn(stream);
+ org.easymock.EasyMock.expect(req.getMethod()).andStubReturn("POST");
+ org.easymock.EasyMock.expect(req.getAttribute(org.easymock.EasyMock.isA(String.class))).andReturn(FAKE_GADGET_TOKEN);
+ org.easymock.EasyMock.expect(req.getCharacterEncoding()).andStubReturn("UTF-8");
res.setCharacterEncoding("UTF-8");
res.setContentType("application/json");
}
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java Tue Jan 13 03:38:45 2009
@@ -28,7 +28,7 @@
import com.google.common.collect.Sets;
import com.google.inject.Guice;
-import org.easymock.classextension.EasyMock;
+import org.easymock.EasyMock;
import java.util.Collections;
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/StandardHandlerDispatcherTest.java Tue Jan 13 03:38:45 2009
@@ -52,7 +52,7 @@
public void testGetHandler() {
PersonHandler handler = mockControl.createMock(PersonHandler.class);
- EasyMock.expect(personHandlerProvider.get()).andReturn(handler);
+ org.easymock.EasyMock.expect(personHandlerProvider.get()).andReturn(handler);
mockControl.replay();
@@ -75,7 +75,7 @@
Provider<DataRequestHandler> mockProvider = mockControl.createMock(Provider.class);
dispatcher.addHandler("mock", mockProvider);
- EasyMock.expect(mockProvider.get()).andReturn(mockHandler);
+ org.easymock.EasyMock.expect(mockProvider.get()).andReturn(mockHandler);
mockControl.replay();
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/spi/DataRequestHandlerTest.java Tue Jan 13 03:38:45 2009
@@ -35,18 +35,22 @@
@Override
protected void setUp() throws Exception {
drh = new DataRequestHandler() {
+ @Override
protected Future<?> handleDelete(RequestItem request) {
return ImmediateFuture.newInstance("DELETE");
}
+ @Override
protected Future<?> handlePut(RequestItem request) {
return ImmediateFuture.newInstance("PUT");
}
+ @Override
protected Future<?> handlePost(RequestItem request) {
return ImmediateFuture.newInstance("POST");
}
+ @Override
protected Future<?> handleGet(RequestItem request) {
return ImmediateFuture.newInstance("GET");
}
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/ApiValidator.java Tue Jan 13 03:38:45 2009
@@ -20,8 +20,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -38,6 +36,7 @@
import org.mozilla.javascript.Context;
import org.mozilla.javascript.EvaluatorException;
import org.mozilla.javascript.Script;
+import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -67,7 +66,7 @@
* @throws IOException
* if feature.xml or the javascript that represents the
* feature is missing
- *
+ *
*/
private ApiValidator(String feature) throws IOException,
ParserConfigurationException, SAXException {
@@ -193,7 +192,7 @@
/**
* Validate an JSON Object extracted
- *
+ *
* @param object
* @param string
* @param optional
@@ -221,7 +220,7 @@
for (String fieldName : fieldNames) {
Object o = parsedJSONObject.get(fieldName,
parsedJSONObject);
- if (o == ScriptableObject.NOT_FOUND) {
+ if (o == Scriptable.NOT_FOUND) {
if (optional.containsKey(fieldName)) {
log.warn("Missing Optional Field " + fieldName);
} else if (!nullf.containsKey(fieldName)) {
@@ -258,7 +257,7 @@
/**
* get an object from the json context and scope.
- *
+ *
* @param object
* the name of the object specified as a path from the base
* object
@@ -280,7 +279,7 @@
/**
* List a scriptable object at log debug level, constructors will not be
* expanded as this loads to recursion.
- *
+ *
* @param id
* The name of the object
* @param scriptableObject
@@ -302,7 +301,7 @@
/**
* Load a feature based on the spec
- *
+ *
* @param spec
* The name of the location of the spec in the classpath, must
* not start with a '/' and must should contain a feature.xml
@@ -346,7 +345,7 @@
/**
* Add some javascript to the context, and execute it. If extra custom
* javascript is wanted in the context or scope then this method will load it.
- *
+ *
* @param javascript
*/
public void addScript(String javascript) {
@@ -357,7 +356,7 @@
/**
* Get an ordered list of javascript resources from a feature sets.
- *
+ *
* @param spec
* The spec location
* @return An ordered list of javascript resources, these are relative to
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java Tue Jan 13 03:38:45 2009
@@ -164,6 +164,7 @@
assertEquals("2", jsonMap.getJSONObject("item2").getString("value"));
}
+ @SuppressWarnings("unchecked")
public void testListsToJson() throws Exception {
Map<String, String> item1Map = Maps.newHashMap();
item1Map.put("value", "1");
@@ -206,6 +207,7 @@
assertEquals("video", actualItem.getType().toString());
}
+ @SuppressWarnings("unchecked")
public void testJsonToMap() throws Exception {
String jsonActivity = "{count : 0, favoriteColor : 'yellow'}";
Map<String, String> data = Maps.newHashMap();
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonLibConverterTest.java Tue Jan 13 03:38:45 2009
@@ -41,7 +41,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java Tue Jan 13 03:38:45 2009
@@ -46,8 +46,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@@ -135,7 +133,7 @@
public void testMapsToXml() throws Exception {
// This is the structure our app data currently takes
- Map<String, Map<String, String>> map = new TreeMap<String, Map<String, String>>();
+ Map<String, Map<String, String>> map = Maps.newTreeMap();
Map<String, String> item1Map = Maps.newHashMap();
item1Map.put("value", "1");
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java Tue Jan 13 03:38:45 2009
@@ -27,14 +27,12 @@
import org.apache.shindig.social.core.model.NameImpl;
import org.apache.shindig.social.core.model.PersonImpl;
import org.apache.shindig.social.core.util.BeanXStreamConverter;
-import org.apache.shindig.social.core.util.xstream.GuiceBeanProvider;
import org.apache.shindig.social.core.util.xstream.XStream081Configuration;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.Address;
import org.apache.shindig.social.opensocial.model.ListField;
import org.apache.shindig.social.opensocial.model.MediaItem;
import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.opensocial.spi.DataCollection;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -42,8 +40,6 @@
import com.google.inject.Injector;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -52,8 +48,6 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@@ -72,7 +66,7 @@
public void setUp() throws Exception {
super.setUp();
Injector injector = Guice.createInjector(new SocialApiTestsGuiceModule());
-
+
johnDoe = new PersonImpl("johnDoeId", "Johnny", new NameImpl("John Doe"));
johnDoe.setPhoneNumbers(Lists.<ListField> newArrayList(new ListFieldImpl(
"home", "+33H000000000"), new ListFieldImpl("mobile", "+33M000000000"),
@@ -88,11 +82,11 @@
activity.setMediaItems(Lists.<MediaItem> newArrayList(new MediaItemImpl(
"image/jpg", MediaItem.Type.IMAGE, "http://foo.bar")));
-
+
beanXmlConverter = new BeanXStreamConverter(new XStream081Configuration(injector));
}
-
+
public static class SimplePerson {
private String id;
@@ -144,7 +138,7 @@
public void testMapsToXml() throws Exception {
// This is the structure our app data currently takes
- Map<String, Map<String, String>> map = new TreeMap<String, Map<String, String>>();
+ Map<String, Map<String, String>> map = Maps.newTreeMap();
Map<String, String> item1Map = Maps.newHashMap();
item1Map.put("value", "1");
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXmlConverterTest.java Tue Jan 13 03:38:45 2009
@@ -33,6 +33,7 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import com.google.common.collect.ImmutableMap;
import junit.framework.TestCase;
import org.apache.commons.lang.StringUtils;
import org.w3c.dom.Element;
@@ -120,15 +121,11 @@
public void xxxtestMapsToXml() throws Exception {
// This is the structure our app data currently takes
- Map<String, Map<String, String>> map =
- new TreeMap<String, Map<String, String>>();
-
- Map<String, String> item1Map = Maps.newHashMap();
- item1Map.put("value", "1");
+ Map<String, Map<String, String>> map = Maps.newTreeMap();
+ Map<String, String> item1Map = ImmutableMap.of("value","1");
map.put("item1", item1Map);
- Map<String, String> item2Map = Maps.newHashMap();
- item2Map.put("value", "2");
+ Map<String, String> item2Map = ImmutableMap.of("value", "2");
map.put("item2", item2Map);
String xml = beanXmlConverter.convertToXml(map);
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtilsTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtilsTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonLibConverterUtilsTest.java Tue Jan 13 03:38:45 2009
@@ -17,8 +17,6 @@
*/
package org.apache.shindig.social.opensocial.util;
-import static org.junit.Assert.*;
-
import org.apache.shindig.social.core.util.JsonLibConverterUtils;
import net.sf.json.JSONArray;
@@ -27,7 +25,7 @@
import org.junit.Test;
/**
- *
+ *
*/
public class JsonLibConverterUtilsTest {
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpherTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpherTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpherTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonObjectToMapMorpherTest.java Tue Jan 13 03:38:45 2009
@@ -17,20 +17,24 @@
*/
package org.apache.shindig.social.opensocial.util;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-import org.apache.shindig.social.core.util.JsonObjectToMapMorpher;
+import java.util.List;
+import java.util.Map;
import net.sf.ezmorph.Morpher;
import net.sf.ezmorph.ObjectMorpher;
import net.sf.json.JSON;
import net.sf.json.JSONObject;
+import org.apache.shindig.social.core.util.JsonObjectToMapMorpher;
import org.junit.Test;
-import java.util.List;
-import java.util.Map;
-
/**
* Tests the JsonObjectMapMorpher
*/
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/NullPropertyFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/NullPropertyFilterTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/NullPropertyFilterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/NullPropertyFilterTest.java Tue Jan 13 03:38:45 2009
@@ -26,9 +26,6 @@
import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
-
import junit.framework.Assert;
/**
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java?rev=734107&r1=734106&r2=734107&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java Tue Jan 13 03:38:45 2009
@@ -33,7 +33,7 @@
import org.apache.shindig.social.opensocial.spi.UserId;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSortedSet;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -112,7 +112,7 @@
options.setMax(20);
RestfulCollection<Person> responseItem = db.getPeople(
- ImmutableSortedSet.of(JOHN_DOE, JANE_DOE), new GroupId(GroupId.Type.friends, null),
+ ImmutableSet.of(JOHN_DOE, JANE_DOE), new GroupId(GroupId.Type.friends, null),
options, Collections.<String>emptySet(), token).get();
assertNotNull(responseItem);
assertEquals(responseItem.getTotalResults(), 4);