You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ss...@apache.org on 2012/02/27 00:43:33 UTC
svn commit: r1293966 [2/12] - in /shindig/trunk:
extras/src/main/java/org/apache/shindig/extras/
java/common/src/main/java/org/apache/shindig/auth/
java/common/src/main/java/org/apache/shindig/common/
java/common/src/main/java/org/apache/shindig/common...
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/OpenSocialVersion.java Sun Feb 26 23:43:20 2012
@@ -27,16 +27,16 @@ import java.util.StringTokenizer;
* Convenience class for working with OpenSocial Specification and Feature versions.
* Applies the rules specified in the OS specification
* http://opensocial-resources.googlecode.com/svn/spec/1.0/Core-Gadget.xml#Versioning
- *
+ *
*/
public class OpenSocialVersion {
-
+
public static Comparator<OpenSocialVersion> COMPARATOR = new VersionComparator();
-
+
public int major = -1;
public int minor = -1;
public int patch = -1;
-
+
/**
* Create a new OpenSocialVersion based upon a versionString
* @param versionString Version string
@@ -60,8 +60,8 @@ public class OpenSocialVersion {
patch = -1;
}
}
-
-
+
+
/**
* Same version number matches same version number
*/
@@ -94,7 +94,7 @@ public class OpenSocialVersion {
}
return cmp == 0;
}
-
+
/**
* Tests if OpenSocialVersion is equivalent to the parameter version
* @param version Compare with this version string
@@ -103,7 +103,7 @@ public class OpenSocialVersion {
public boolean isEquivalent(String version){
return isEquivalent(new OpenSocialVersion(version));
}
-
+
/**
* Tests if OpenSocialVersion is equal to or greater than parameter version
* @param version Compare with this version
@@ -127,7 +127,7 @@ public class OpenSocialVersion {
}
return cmp <= 0;
}
-
+
/**
* Tests if OpenSocialVersion is equal to or greater than parameter version
* @param version Compare with this version string
@@ -155,6 +155,6 @@ class VersionComparator implements java.
}
return cmp;
}
-
+
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/StringEncoding.java Sun Feb 26 23:43:20 2012
@@ -54,7 +54,7 @@ public class StringEncoding {
throw new AssertionError(Arrays.toString(digits));
}
}
-
+
/**
* Returns the given bytes in their encoded form.
* @param data bytes to convert to string
@@ -87,7 +87,7 @@ public class StringEncoding {
}
return result.toString();
}
-
+
/**
* Decodes the given encoded string and returns the original raw bytes.
* @param encoded String to encode
@@ -114,5 +114,5 @@ public class StringEncoding {
}
assert next == outLength && bitsLeft < SHIFT;
return result;
- }
+ }
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/TimeSource.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/TimeSource.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/TimeSource.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/TimeSource.java Sun Feb 26 23:43:20 2012
@@ -22,7 +22,7 @@ package org.apache.shindig.common.util;
* Simple source of current time to use for dependency injection.
*/
public class TimeSource {
-
+
public long currentTimeMillis() {
return System.currentTimeMillis();
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java Sun Feb 26 23:43:20 2012
@@ -96,7 +96,7 @@ public final class XmlUtil {
// Not supported by some very old parsers.
if (LOG.isLoggable(Level.INFO)) {
LOG.logp(Level.INFO, CLASSNAME, "static block", MessageKeys.ERROR_PARSING_EXTERNAL_GENERAL_ENTITIES);
- }
+ }
}
try {
@@ -116,7 +116,7 @@ public final class XmlUtil {
// Only supported by Apache's XML parsers.
if (LOG.isLoggable(Level.INFO)) {
LOG.logp(Level.INFO, CLASSNAME, "static block", MessageKeys.ERROR_PARSING_EXTERNAL_DTD);
- }
+ }
}
try {
@@ -134,13 +134,13 @@ public final class XmlUtil {
canReuseBuilders = true;
if (LOG.isLoggable(Level.INFO)) {
LOG.logp(Level.INFO, CLASSNAME, "static block", MessageKeys.REUSE_DOC_BUILDERS);
- }
+ }
} catch (UnsupportedOperationException e) {
// Only supported by newer parsers (xerces 2.8.x+ for instance).
canReuseBuilders = false;
if (LOG.isLoggable(Level.INFO)) {
LOG.logp(Level.INFO, CLASSNAME, "static block", MessageKeys.NOT_REUSE_DOC_BUILDERS);
- }
+ }
} catch (ParserConfigurationException e) {
// Only supported by newer parsers (xerces 2.8.x+ for instance).
canReuseBuilders = false;
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfigELResolver.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfigELResolver.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfigELResolver.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfigELResolver.java Sun Feb 26 23:43:20 2012
@@ -35,7 +35,7 @@ import javax.el.PropertyNotWritableExcep
public class ContainerConfigELResolver extends ELResolver {
/** Key for the current container. */
public static final String CURRENT_CONFIG_KEY = "Cur";
-
+
private final ContainerConfig config;
private final String currentContainer;
@@ -43,13 +43,13 @@ public class ContainerConfigELResolver e
this.config = config;
this.currentContainer = currentContainer;
}
-
+
@Override
public Class<?> getCommonPropertyType(ELContext context, Object base) {
if ((base == null) || (base instanceof ContainerReference)) {
return String.class;
}
-
+
return null;
}
@@ -66,12 +66,12 @@ public class ContainerConfigELResolver e
Object value = getValue(context, base, property);
return (value == null) ? null : value.getClass();
}
-
+
return null;
}
@Override
- public Object getValue(ELContext context, Object base, Object property) {
+ public Object getValue(ELContext context, Object base, Object property) {
// Handle all requests off the base, and anything that is a reference to
// a container
String container;
@@ -85,7 +85,7 @@ public class ContainerConfigELResolver e
}
context.setPropertyResolved(true);
- if (JsonContainerConfig.PARENT_KEY.equals(property)) {
+ if (JsonContainerConfig.PARENT_KEY.equals(property)) {
// "parent": find the parent of the base, and return a ContainerReference
String parent = config.getString(container, JsonContainerConfig.PARENT_KEY);
if (parent == null) {
@@ -112,7 +112,7 @@ public class ContainerConfigELResolver e
context.setPropertyResolved(true);
return true;
}
-
+
return false;
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/config/DynamicConfigProperty.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/DynamicConfigProperty.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/config/DynamicConfigProperty.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/config/DynamicConfigProperty.java Sun Feb 26 23:43:20 2012
@@ -36,7 +36,7 @@ import javax.el.ValueExpression;
*/
public class DynamicConfigProperty implements CharSequence {
private static final String classname = DynamicConfigProperty.class.getName();
- private static final Logger LOG = Logger.getLogger(classname,MessageKeys.MESSAGES);
+ private static final Logger LOG = Logger.getLogger(classname,MessageKeys.MESSAGES);
private final ELContext context;
private final ValueExpression expression;
@@ -55,7 +55,7 @@ public class DynamicConfigProperty imple
LOG.logp(Level.WARNING, classname, "toString", MessageKeys.EVAL_EL_FAILED, new Object[] {expression.getExpressionString()});
//now log the stacktrace
LOG.logp(Level.WARNING, classname, "toString", MessageKeys.EVAL_EL_FAILED, e);
- }
+ }
return "";
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java Sun Feb 26 23:43:20 2012
@@ -57,7 +57,7 @@ public class JsonContainerConfig extends
public JsonContainerConfig(@Named("shindig.containers.default") String containers,
@Nullable @Named("shindig.host") String host,
@Nullable @Named("shindig.port") String port,
- @Nullable @Named("shindig.contextroot") String contextRoot,
+ @Nullable @Named("shindig.contextroot") String contextRoot,
Expressions expressions)
throws ContainerConfigException {
super(expressions);
@@ -66,7 +66,7 @@ public class JsonContainerConfig extends
/**
* Creates a new configuration from a JSON Object, for use in testing.
- * @throws ContainerConfigException
+ * @throws ContainerConfigException
*/
public JsonContainerConfig(JSONObject json, Expressions expressions) throws ContainerConfigException {
super(expressions);
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfigLoader.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfigLoader.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfigLoader.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfigLoader.java Sun Feb 26 23:43:20 2012
@@ -146,7 +146,7 @@ public class JsonContainerConfigLoader {
location = location.substring(6);
if (LOG.isLoggable(Level.INFO)) {
LOG.logp(Level.INFO, classname, "loadContainers", MessageKeys.LOAD_RESOURCES_FROM, new Object[] {location});
- }
+ }
if (path.endsWith(".txt")) {
loadResources(CRLF_SPLITTER.split(ResourceLoader.getContent(location)), all);
} else {
@@ -155,7 +155,7 @@ public class JsonContainerConfigLoader {
} else {
if (LOG.isLoggable(Level.INFO)) {
LOG.logp(Level.INFO, classname, "loadContainers", MessageKeys.LOAD_FILES_FROM, new Object[] {location});
- }
+ }
File file = new File(location);
loadFiles(new File[] {file}, all);
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ExpressionProvider.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ExpressionProvider.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ExpressionProvider.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ExpressionProvider.java Sun Feb 26 23:43:20 2012
@@ -33,9 +33,9 @@ import com.google.inject.ImplementedBy;
public interface ExpressionProvider {
/**
- *
+ *
* @param cacheProvider - the cache provider - not used by all EL implementations.
- * @param converter - type conversion class -
+ * @param converter - type conversion class -
* @return
*/
ExpressionFactory newExpressionFactory(CacheProvider cacheProvider,
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java Sun Feb 26 23:43:20 2012
@@ -49,14 +49,14 @@ import com.google.inject.Singleton;
*/
@Singleton
public class Expressions {
-
+
private final ExpressionFactory factory;
private final ELContext parseContext;
private final ELResolver defaultELResolver;
private final Functions functions;
private final ELTypeConverter typeConverter;
- /**
+ /**
* Returns an instance of Expressions that doesn't require
* any functions or perform any caching. Use only for testing.
*/
@@ -64,8 +64,8 @@ public class Expressions {
public static Expressions forTesting(Functions functions) {
return new Expressions(functions, null, new JuelTypeConverter(), new JuelProvider());
}
-
- /**
+
+ /**
* Returns an instance of Expressions that doesn't require
* any functions or perform any caching. Use only for testing.
*/
@@ -73,7 +73,7 @@ public class Expressions {
public static Expressions forTesting() {
return new Expressions(null, null, new JuelTypeConverter(), new JuelProvider());
}
-
+
@Inject
public Expressions(Functions functions, CacheProvider cacheProvider,
ELTypeConverter typeConverter, ExpressionProvider expProvider) {
@@ -83,8 +83,8 @@ public class Expressions {
// Stub context with no FunctionMapper, used only to parse expressions
parseContext = new Context(null);
defaultELResolver = createDefaultELResolver();
-
-
+
+
}
/**
@@ -118,7 +118,7 @@ public class Expressions {
return factory.createValueExpression(parseContext, expression, type);
}
}
-
+
public ValueExpression constant(Object value, Class<?> type) {
boolean shouldConvert = typeConverter.isPostConvertible(type);
if (shouldConvert) {
@@ -127,15 +127,15 @@ public class Expressions {
else {
return factory.createValueExpression(value, type);
}
-
+
}
-
-
+
+
private ExpressionFactory newExpressionFactory(
ExpressionProvider expProvider, CacheProvider cacheProvider) {
return expProvider.newExpressionFactory(cacheProvider, typeConverter);
}
-
+
/**
* @return a default ELResolver with functionality needed by all
* expression evaluation.
@@ -150,7 +150,7 @@ public class Expressions {
resolver.add(new ListELResolver());
resolver.add(new ArrayELResolver());
// TODO: bean el resolver?
-
+
return resolver;
}
@@ -165,7 +165,7 @@ public class Expressions {
public Context(ELResolver resolver) {
this.resolver = resolver;
}
-
+
@Override
public ELResolver getELResolver() {
return resolver;
@@ -181,12 +181,12 @@ public class Expressions {
if (variables == null) {
variables = new Variables();
}
-
+
return variables;
}
-
+
}
-
+
static private class Variables extends VariableMapper {
private final Map<String, ValueExpression> variables = Maps.newHashMap();
@Override
@@ -198,9 +198,9 @@ public class Expressions {
public ValueExpression setVariable(String var, ValueExpression expression) {
return variables.put(var, expression);
}
-
+
}
-
+
private static class ValueExpressionWrapper extends ValueExpression {
private static final long serialVersionUID = 2135607228206570229L;
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Functions.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Functions.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Functions.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Functions.java Sun Feb 26 23:43:20 2012
@@ -62,7 +62,7 @@ public class Functions extends FunctionM
*/
String[] names() default {};
}
-
+
/**
* Creates a Functions class with the specified
*/
@@ -72,19 +72,19 @@ public class Functions extends FunctionM
if ((m.getModifiers() & Modifier.STATIC) == 0) {
continue;
}
-
+
addMethod(m);
}
}
}
-
+
@Override
public Method resolveFunction(String prefix, String methodName) {
Map<String, Method> prefixMap = functions.get(prefix);
if (prefixMap == null) {
return null;
}
-
+
return prefixMap.get(methodName);
}
@@ -98,7 +98,7 @@ public class Functions extends FunctionM
prefixMap = Maps.newHashMap();
functions.put(prefix, prefixMap);
}
-
+
for (String methodName : annotation.names()) {
Method priorMethod = prefixMap.put(methodName, m);
if (priorMethod != null) {
@@ -108,7 +108,7 @@ public class Functions extends FunctionM
}
}
}
-
+
/**
* A default version for Guice; includes the Opensocial functions.
*/
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/JsonELResolver.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/JsonELResolver.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/JsonELResolver.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/JsonELResolver.java Sun Feb 26 23:43:20 2012
@@ -39,11 +39,11 @@ class JsonELResolver extends ELResolver
if (base instanceof JSONArray) {
return Integer.class;
}
-
+
if (base instanceof JSONObject) {
return String.class;
}
-
+
return null;
}
@@ -60,7 +60,7 @@ class JsonELResolver extends ELResolver
Object value = getValue(context, base, property);
return value == null ? null : value.getClass();
}
-
+
return null;
}
@@ -76,7 +76,7 @@ class JsonELResolver extends ELResolver
int index = toInt(property);
return ((JSONArray) base).opt(index);
}
-
+
return null;
}
@@ -85,7 +85,7 @@ class JsonELResolver extends ELResolver
if (isJson(base)) {
context.setPropertyResolved(true);
}
-
+
return false;
}
@@ -117,7 +117,7 @@ class JsonELResolver extends ELResolver
if (property instanceof Number) {
return ((Number) property).intValue();
}
-
+
try {
return Integer.parseInt(String.valueOf(property));
} catch (NumberFormatException nfe) {
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/OpensocialFunctions.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/OpensocialFunctions.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/OpensocialFunctions.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/OpensocialFunctions.java Sun Feb 26 23:43:20 2012
@@ -36,7 +36,7 @@ import javax.el.ELException;
public final class OpensocialFunctions {
private OpensocialFunctions() {
}
-
+
/**
* Convert a string to a JSON Object or JSON Array.
*/
@@ -45,7 +45,7 @@ public final class OpensocialFunctions {
if ((text == null) || "".equals(text)) {
return null;
}
-
+
try {
if (text.startsWith("[")) {
return new JSONArray(text);
@@ -56,7 +56,7 @@ public final class OpensocialFunctions {
throw new ELException(je);
}
}
-
+
/**
* Decode a base-64 encoded string.
*/
@@ -65,7 +65,7 @@ public final class OpensocialFunctions {
if (text == null) {
return null;
}
-
+
// TODO: allow a charset to be passed in?
return CharsetUtil.newUtf8String(Base64.decodeBase64(CharsetUtil.getUtf8Bytes(text)));
}
@@ -78,7 +78,7 @@ public final class OpensocialFunctions {
if (text == null) {
return null;
}
-
+
return Utf8UrlCoder.encode(text);
}
@@ -92,7 +92,7 @@ public final class OpensocialFunctions {
if (text == null) {
return null;
}
-
+
return Utf8UrlCoder.decode(text);
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/RootELResolver.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/RootELResolver.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/RootELResolver.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/RootELResolver.java Sun Feb 26 23:43:20 2012
@@ -42,17 +42,17 @@ public class RootELResolver extends ELRe
public RootELResolver() {
this(ImmutableMap.<String, Object>of());
}
-
+
public RootELResolver(Map<String, ? extends Object> base) {
this.map = base;
}
-
+
@Override
public Class<?> getCommonPropertyType(ELContext context, Object base) {
if (base == null) {
return String.class;
}
-
+
return null;
}
@@ -69,7 +69,7 @@ public class RootELResolver extends ELRe
Object value = map.get(property);
return value == null ? null : value.getClass();
}
-
+
return null;
}
@@ -79,7 +79,7 @@ public class RootELResolver extends ELRe
context.setPropertyResolved(true);
return map.get(property);
}
-
+
return null;
}
@@ -89,7 +89,7 @@ public class RootELResolver extends ELRe
context.setPropertyResolved(true);
return true;
}
-
+
return false;
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java Sun Feb 26 23:43:20 2012
@@ -36,27 +36,27 @@ import com.google.common.collect.Immutab
* and JSONArray is supported.
*/
public class ShindigTypeConverter implements ELTypeConverter {
-
-
+
+
public boolean isPostConvertible(Class<?> type) {
return false;
}
-
+
@SuppressWarnings("unchecked")
public <T> T convert(Object obj, Class<T> type) throws ELException {
// Handle boolean specially
if (type == Boolean.class || type == Boolean.TYPE) {
return (T) coerceToBoolean(obj);
}
-
+
if (type == JSONArray.class) {
return (T) coerceToJsonArray(obj);
}
-
+
if (type == Iterable.class) {
return (T) coerceToIterable(obj);
}
-
+
// Nothing more we can do.
return null;
}
@@ -70,11 +70,11 @@ public class ShindigTypeConverter implem
if (obj == null) {
return ImmutableList.of();
}
-
+
if (obj instanceof Iterable<?>) {
return ((Iterable<?>) obj);
}
-
+
if (obj instanceof JSONArray) {
final JSONArray array = (JSONArray) obj;
// TODO: Extract JSONArrayIterator class?
@@ -82,23 +82,23 @@ public class ShindigTypeConverter implem
public Iterator<Object> iterator() {
return new Iterator<Object>() {
private int i = 0;
-
+
public boolean hasNext() {
return i < array.length();
}
-
+
public Object next() {
if (i >= array.length()) {
throw new NoSuchElementException();
}
-
+
try {
return array.get(i++);
} catch (Exception e) {
throw new ELException(e);
}
}
-
+
public void remove() {
throw new UnsupportedOperationException();
}
@@ -106,33 +106,33 @@ public class ShindigTypeConverter implem
}
};
}
-
+
if (obj instanceof JSONObject) {
JSONObject json = (JSONObject) obj;
-
+
// Does this object have a "list" property that is an array?
// TODO: add to specification
Object childList = json.opt("list");
if (childList instanceof JSONArray) {
return coerceToIterable(childList);
}
-
+
// A scalar JSON value is treated as a single element list.
return ImmutableList.of(json);
}
-
+
return ImmutableList.of(obj);
}
-
+
private JSONArray coerceToJsonArray(Object obj) {
if (obj == null) {
return null;
}
-
+
if (obj instanceof JSONArray) {
return (JSONArray) obj;
}
-
+
if (obj instanceof String) {
JSONArray array = new JSONArray();
StringTokenizer tokenizer = new StringTokenizer(obj.toString(), ",");
@@ -142,37 +142,37 @@ public class ShindigTypeConverter implem
return array;
}
-
+
throw new ELException("Could not coerce " + obj.getClass().getName() + " to JSONArray");
}
/**
* Coerce the following booleans:
- *
+ *
* null -> false
* empty string, and "false" -> false
* boolean false -> false
* number 0 -> false
- *
+ *
* All else is true.
*/
private Boolean coerceToBoolean(Object obj) {
if (obj == null) {
return false;
}
-
+
if (obj instanceof String) {
return !("".equals(obj) || "false".equals(obj));
}
-
+
if (obj instanceof Boolean) {
return (Boolean) obj;
}
-
+
if (obj instanceof Number) {
return 0 != ((Number) obj).intValue();
}
-
+
return true;
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java Sun Feb 26 23:43:20 2012
@@ -49,7 +49,7 @@ import com.google.inject.name.Names;
*/
public abstract class ApiServlet extends InjectedServlet {
private static final String classname = ApiServlet.class.getName();
- private static final Logger LOG = Logger.getLogger(classname, MessageKeys.MESSAGES);
+ private static final Logger LOG = Logger.getLogger(classname, MessageKeys.MESSAGES);
protected static final String FORMAT_PARAM = "format";
protected static final String JSON_FORMAT = "json";
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java Sun Feb 26 23:43:20 2012
@@ -24,7 +24,7 @@ import java.util.Map;
*/
public class DataCollection {
private Map<String, Map<String, String>> entry;
-
+
public DataCollection(Map<String, Map<String, String>> entry) {
this.entry = entry;
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java Sun Feb 26 23:43:20 2012
@@ -109,7 +109,7 @@ public class DataServiceServlet extends
return;
}
- HttpUtil.setCORSheader(servletResponse, containerConfig.<String>getList(token.getContainer(),
+ HttpUtil.setCORSheader(servletResponse, containerConfig.<String>getList(token.getContainer(),
"gadgets.parentOrigins"));
handleSingleRequest(servletRequest, servletResponse, token);
@@ -127,7 +127,7 @@ public class DataServiceServlet extends
case -32700:
case -32602:
case -32600:
- // Parse error, invalid params, and invalid request
+ // Parse error, invalid params, and invalid request
errorCode = HttpServletResponse.SC_BAD_REQUEST;
break;
case -32601:
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java Sun Feb 26 23:43:20 2012
@@ -226,7 +226,7 @@ public class DefaultHandlerRegistry impl
Operation op, Method m) {
try {
MethodCaller methodCaller = new MethodCaller(m, false);
-
+
String opName = m.getName();
// Use the override if its defined
if (op.name().length() > 0) {
@@ -394,7 +394,7 @@ public class DefaultHandlerRegistry impl
return handler.execute(pathParams, body, token, converter);
}
}
-
+
/**
* Calls methods annotated with {@link Operation} and appropriately translates
* RequestItem to the actual input class of the method.
@@ -402,14 +402,14 @@ public class DefaultHandlerRegistry impl
private static class MethodCaller {
/** Type of object to create for this method, or null if takes no args */
private Class<?> inputClass;
-
+
/** Constructors for request item class that will be used */
private final Constructor<?> restRequestItemConstructor;
private final Constructor<?> rpcRequestItemConstructor;
-
+
/** The method */
private final Method method;
-
+
/**
* Create information needed to call a method
* @param method The method
@@ -420,16 +420,16 @@ public class DefaultHandlerRegistry impl
this.method = method;
inputClass = method.getParameterTypes().length > 0 ? method.getParameterTypes()[0] : null;
-
+
// Methods that need RequestItem interface should automatically get a BaseRequestItem
if (RequestItem.class.equals(inputClass)) {
inputClass = BaseRequestItem.class;
}
boolean inputIsRequestItem = (inputClass != null) &&
RequestItem.class.isAssignableFrom(inputClass);
-
+
Class<?> requestItemType = inputIsRequestItem ? inputClass : BaseRequestItem.class;
-
+
restRequestItemConstructor = requestItemType.getConstructor(Map.class,
SecurityToken.class, BeanConverter.class, BeanJsonConverter.class);
rpcRequestItemConstructor = requestItemType.getConstructor(JSONObject.class,
@@ -440,13 +440,13 @@ public class DefaultHandlerRegistry impl
BeanConverter converter, BeanJsonConverter jsonConverter) {
return getRequestItem(params, token, converter, jsonConverter, restRequestItemConstructor);
}
-
- public RequestItem getRpcRequestItem(JSONObject params, Map<String, FormDataItem> formItems,
+
+ public RequestItem getRpcRequestItem(JSONObject params, Map<String, FormDataItem> formItems,
SecurityToken token, BeanJsonConverter converter) {
return getRequestItem(params, formItems, token, converter, converter, rpcRequestItemConstructor);
}
-
- private RequestItem getRequestItem(Object params, Map<String, FormDataItem> formItems,
+
+ private RequestItem getRequestItem(Object params, Map<String, FormDataItem> formItems,
SecurityToken token, BeanConverter converter, BeanJsonConverter jsonConverter,
Constructor<?> constructor) {
try {
@@ -460,7 +460,7 @@ public class DefaultHandlerRegistry impl
throw new RuntimeException(e);
}
}
-
+
private RequestItem getRequestItem(Object params, SecurityToken token, BeanConverter converter,
BeanJsonConverter jsonConverter, Constructor<?> constructor) {
try {
@@ -473,7 +473,7 @@ public class DefaultHandlerRegistry impl
throw new RuntimeException(e);
}
}
-
+
public Future<?> call(Object handler, RequestItem item) {
try {
Object result;
@@ -631,12 +631,12 @@ public class DefaultHandlerRegistry impl
}
return false;
}
-
+
@Override
public int hashCode() {
return this.constCount ^ this.lastConstIndex ^ operationPath.hashCode();
}
-
+
/**
* Rank based on the number of consant parts they accept, where the constant parts occur
* and lexical ordering.
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerExecutionListener.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerExecutionListener.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerExecutionListener.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerExecutionListener.java Sun Feb 26 23:43:20 2012
@@ -57,7 +57,7 @@ public interface HandlerExecutionListene
* You can configure this for use by adding a binding in your Guice Module like this:
* bind(HandlerExecutionListener.class).to(HandlerExecutionListener.LoggingHandler.class);
*/
-
+
public static class LoggingHandler implements HandlerExecutionListener {
public static final Logger LOG = Logger.getLogger(HandlerExecutionListener.class.toString());
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerRegistry.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerRegistry.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerRegistry.java Sun Feb 26 23:43:20 2012
@@ -48,7 +48,7 @@ public interface HandlerRegistry {
* @return the handler
*/
RestHandler getRestHandler(String path, String method);
-
+
/**
* @return The list of available services
*/
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java Sun Feb 26 23:43:20 2012
@@ -61,14 +61,14 @@ public class JsonRpcServlet extends ApiS
* actual request, per the proposed Opensocial 0.9 specification.
*/
public static final String REQUEST_PARAM = "request";
-
+
private MultipartFormParser formParser;
@Inject
void setMultipartFormParser(MultipartFormParser formParser) {
this.formParser = formParser;
}
-
+
private String jsonRpcResultField = "result";
private boolean jsonRpcBothFields = false;
@@ -88,7 +88,7 @@ public class JsonRpcServlet extends ApiS
String method = servletRequest.getMethod();
if (!("GET".equals(method) || "POST".equals(method))) {
- sendError(servletResponse,
+ sendError(servletResponse,
new ResponseItem(HttpServletResponse.SC_BAD_REQUEST, "Only POST/GET Allowed"));
return;
}
@@ -121,7 +121,7 @@ public class JsonRpcServlet extends ApiS
return;
}
}
-
+
if (content == null) {
sendError(servletResponse, new ResponseItem(HttpServletResponse.SC_BAD_REQUEST, "No content specified"));
return;
@@ -230,7 +230,7 @@ public class JsonRpcServlet extends ApiS
}
/**
- *
+ *
*/
protected void addResult(Map<String,Object> result, Object data) {
if (jsonRpcBothFields) {
@@ -311,7 +311,7 @@ public class JsonRpcServlet extends ApiS
.put(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "internalError")
.put(HttpServletResponse.SC_EXPECTATION_FAILED, "limitExceeded")
.build();
-
+
// TODO(doll): Refactor the responseItem so that the fields on it line up with this format.
// Then we can use the general converter to output the response to the client and we won't
// be harcoded to json.
@@ -327,7 +327,7 @@ public class JsonRpcServlet extends ApiS
message += ": " + responseItem.getErrorMessage();
}
}
-
+
if (StringUtils.isNotBlank(message)) {
error.put("message", message);
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/Operation.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/Operation.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/Operation.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/Operation.java Sun Feb 26 23:43:20 2012
@@ -49,7 +49,7 @@ public @interface Operation {
String path() default "";
/**
- * The name to match for the RPC operation to override the default behavior
+ * The name to match for the RPC operation to override the default behavior
* which is to use the name of the annotated method
*/
String name() default "";
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/RestfulCollection.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/RestfulCollection.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/RestfulCollection.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/RestfulCollection.java Sun Feb 26 23:43:20 2012
@@ -64,13 +64,13 @@ public class RestfulCollection<T> {
}
/**
- * Helper constructor for un-paged collection,
+ * Helper constructor for un-paged collection,
* Use {@link #RestfulCollection(java.util.List, int, int, int)} in paginated context
*/
public RestfulCollection(List<T> entry, int startIndex, int totalResults) {
this(entry, startIndex, totalResults, entry.size());
}
-
+
public List<T> getEntry() {
return entry;
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java Sun Feb 26 23:43:20 2012
@@ -332,7 +332,7 @@ public class BeanDelegator {
interfaceType = interfaceParamType.getActualTypeArguments()[1];
return validateTypes(dataType, interfaceType);
}
-
+
if (Multimap.class.isAssignableFrom((Class<?>) dataParamType.getRawType()) &&
Multimap.class.isAssignableFrom((Class<?>) interfaceParamType.getRawType())) {
Type dataKeyType = dataParamType.getActualTypeArguments()[0];
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java Sun Feb 26 23:43:20 2012
@@ -256,7 +256,7 @@ public class BeanJsonConverter implement
private Object convertToClass(JSONObject in, Class<?> type) {
Object out = injector.getInstance(type);
-
+
/*
* Simple hack to add support for arbitrary extensions to Shindig's data
* model. It initializes keys/values of an ExtendableBean class, which is
@@ -268,7 +268,7 @@ public class BeanJsonConverter implement
((ExtendableBean) out).put(name, convertToObject(in.opt(name), null));
}
}
-
+
for (Map.Entry<String, Method> entry : SETTERS.getUnchecked(out.getClass()).entrySet()) {
Object value = in.opt(entry.getKey());
if (value != null) {
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ExtendableBeanConverter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ExtendableBeanConverter.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ExtendableBeanConverter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ExtendableBeanConverter.java Sun Feb 26 23:43:20 2012
@@ -31,7 +31,7 @@ import com.thoughtworks.xstream.io.Hiera
/**
* Serializes an ExtendableBeanImpl type as a Map instead of a POJO.
- *
+ *
* Note: For an ExtendableBean field within a POJO to be properly serialized to
* XML, the field must still be hardcoded into the POJO, even if the POJO itself
* is an ExtendableBean. This is because POJOs are still serialized to XML
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/WriterStack.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/WriterStack.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/WriterStack.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/WriterStack.java Sun Feb 26 23:43:20 2012
@@ -54,7 +54,7 @@ public interface WriterStack {
/**
* Remove and return the current node name, making the parent node the active
* node name.
- *
+ *
* @return the node name just removed from the stack.
*/
String pop();
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/XStreamConfiguration.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/XStreamConfiguration.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/XStreamConfiguration.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/XStreamConfiguration.java Sun Feb 26 23:43:20 2012
@@ -45,7 +45,7 @@ public interface XStreamConfiguration {
/**
* Generate the converter config.
- *
+ *
* @param c
* which converter set.
* @param rp
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/CommonsFormDataItem.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/CommonsFormDataItem.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/CommonsFormDataItem.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/CommonsFormDataItem.java Sun Feb 26 23:43:20 2012
@@ -27,11 +27,11 @@ import java.io.InputStream;
*/
class CommonsFormDataItem implements FormDataItem {
private final FileItem fileItem;
-
+
CommonsFormDataItem(FileItem fileItem) {
this.fileItem = fileItem;
}
-
+
public byte[] get() {
return fileItem.get();
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParser.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParser.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParser.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/DefaultMultipartFormParser.java Sun Feb 26 23:43:20 2012
@@ -50,17 +50,17 @@ public class DefaultMultipartFormParser
} catch (FileUploadException e) {
UnknownServiceException use = new UnknownServiceException("File upload error.");
use.initCause(e);
- throw use;
+ throw use;
}
}
-
+
private Collection<FormDataItem> convertToFormData(List<FileItem> fileItems) {
- List<FormDataItem> formDataItems =
+ List<FormDataItem> formDataItems =
Lists.newArrayListWithCapacity(fileItems.size());
for (FileItem item : fileItems) {
formDataItems.add(new CommonsFormDataItem(item));
}
-
+
return formDataItems;
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/FormDataItem.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/FormDataItem.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/FormDataItem.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/FormDataItem.java Sun Feb 26 23:43:20 2012
@@ -27,22 +27,22 @@ public interface FormDataItem {
/**
* Returns the Content type of the field item.
- *
+ *
* @return content type
*/
String getContentType();
/**
* The size of the content stored in this field item.
- *
+ *
* @return size of the content
*/
long getSize();
-
+
/**
* Returns an InputStream from which the content of the field item can be
* read.
- *
+ *
* @return InputStream to the content of the field item.
* @throws IOException
*/
@@ -50,7 +50,7 @@ public interface FormDataItem {
/**
* Returns the content of the field item.
- *
+ *
* @return content of the field item
*/
byte[] get();
@@ -65,15 +65,15 @@ public interface FormDataItem {
/**
* Name of the uploaded file, if the item represents file upload.
* This will be only valid when {@link #isFormField()} returns false.
- *
+ *
* @return name of the uploaded file
*/
String getName();
-
+
/**
* Field name of this field item. Can be used to identify a field by name but
* as per RFC this need not be unique.
- *
+ *
* @return name of the field
*/
String getFieldName();
@@ -81,7 +81,7 @@ public interface FormDataItem {
/**
* Used to identify if the field item represents a file upload or a regular
* form field.
- *
+ *
* @return true if it is a regular form field
*/
boolean isFormField();
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/MultipartFormParser.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/MultipartFormParser.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/MultipartFormParser.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/multipart/MultipartFormParser.java Sun Feb 26 23:43:20 2012
@@ -31,7 +31,7 @@ import com.google.inject.ImplementedBy;
public interface MultipartFormParser {
/** Parse a request into a list of data items */
Collection<FormDataItem> parse(HttpServletRequest request) throws IOException;
-
+
/**
* @return true if the request requires multipart parsing.
*/
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoUtilTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoUtilTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoUtilTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoUtilTest.java Sun Feb 26 23:43:20 2012
@@ -31,9 +31,9 @@ public class AuthInfoUtilTest extends As
public void testToken() throws Exception {
HttpServletRequest req = new FakeHttpServletRequest();
SecurityToken token = new FakeGadgetToken();
-
+
AuthInfoUtil.setSecurityTokenForRequest(req, token);
-
+
assertEquals(token, AuthInfoUtil.getSecurityTokenFromRequest(req));
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/AllTests.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/AllTests.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/AllTests.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/AllTests.java Sun Feb 26 23:43:20 2012
@@ -27,7 +27,7 @@ import junitx.util.SimpleTestFilter;
* Run all gadgets tests.
*/
public class AllTests extends TestSuite {
-
+
public static Test suite() throws Exception {
DirectorySuiteBuilder builder = new DirectorySuiteBuilder(
new SimpleTestFilter());
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java Sun Feb 26 23:43:20 2012
@@ -145,7 +145,7 @@ public class JsonSerializerTest {
}
@JsonProperty("simple!")
public void setSimpleName(int foo) {
-
+
}
@JsonProperty("invalid-setter-two-args")
public void setInvalidSetterTwoArgs(String foo, String bar) {
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonUtilTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonUtilTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonUtilTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonUtilTest.java Sun Feb 26 23:43:20 2012
@@ -59,6 +59,6 @@ public class JsonUtilTest {
JsonPojo pojo = new JsonPojo();
// These exist as getters on all objects, but not as properties
assertNull(JsonUtil.getProperty(pojo, "class"));
- assertNull(JsonUtil.getProperty(pojo, "declaringClass"));
+ assertNull(JsonUtil.getProperty(pojo, "declaringClass"));
}
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/OpenSocialVersionTest.java Sun Feb 26 23:43:20 2012
@@ -30,7 +30,7 @@ import junit.framework.Assert;
*
*/
public class OpenSocialVersionTest {
-
+
@Test
public void createOpenSocialVersion(){
OpenSocialVersion version = new OpenSocialVersion("1.2.3");
@@ -39,44 +39,44 @@ public class OpenSocialVersionTest {
Assert.assertEquals(3, version.patch);
Assert.assertEquals(version, new OpenSocialVersion("1.2.3"));
}
-
+
@Test
public void testEquivalence(){
OpenSocialVersion version = new OpenSocialVersion("1.2.3");
OpenSocialVersion version2 = new OpenSocialVersion("1.2");
Assert.assertTrue(version.isEquivalent(version2));
-
+
version = new OpenSocialVersion("2");
Assert.assertTrue(version.isEquivalent("2.2"));
-
+
version = new OpenSocialVersion("3");
Assert.assertTrue(!version.isEquivalent("2.2"));
}
-
+
@Test
public void testEqualOrGreaterThan(){
OpenSocialVersion version = new OpenSocialVersion("1.2.3");
OpenSocialVersion version2 = new OpenSocialVersion("1.2");
Assert.assertTrue(version.isEqualOrGreaterThan(version2));
Assert.assertTrue(!version2.isEqualOrGreaterThan(version));
-
+
version = new OpenSocialVersion("2");
version2 = new OpenSocialVersion("2.2");
Assert.assertTrue(!version.isEqualOrGreaterThan(version2));
Assert.assertTrue(version2.isEqualOrGreaterThan(version));
-
+
version = new OpenSocialVersion("2.2.48");
version2 = new OpenSocialVersion("2.2.49");
Assert.assertTrue(!version.isEqualOrGreaterThan(version2));
Assert.assertTrue(version2.isEqualOrGreaterThan(version));
-
+
version = new OpenSocialVersion("3");
Assert.assertTrue(version.isEqualOrGreaterThan("2.2"));
-
+
version = new OpenSocialVersion("3.1.18");
Assert.assertTrue(version.isEqualOrGreaterThan("2.2"));
}
-
+
@Test
public void testVersionSorting(){
ArrayList<OpenSocialVersion> list = new ArrayList<OpenSocialVersion>();
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java Sun Feb 26 23:43:20 2012
@@ -84,7 +84,7 @@ public class CryptoTest {
assertArrayEquals("Array of length " + i, orig, plainText);
}
}
-
+
@Test
public void testRandomDigits() throws Exception {
Pattern digitPattern = Pattern.compile("^\\d+$");
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletUserAgentProviderTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletUserAgentProviderTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletUserAgentProviderTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpServletUserAgentProviderTest.java Sun Feb 26 23:43:20 2012
@@ -64,19 +64,19 @@ public class HttpServletUserAgentProvide
assertNull(provider.get());
verify();
}
-
+
private static class HttpServletRequestProvider implements Provider<HttpServletRequest> {
private HttpServletRequest req;
-
+
private HttpServletRequestProvider(HttpServletRequest req) {
this.req = req;
}
-
+
public HttpServletRequest get() {
return req;
}
}
-
+
private static class PassThroughUAParser implements UserAgent.Parser {
public UserAgent parse(String agentVersion) {
return new UserAgent(UserAgent.Browser.OTHER, agentVersion);
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpUtilTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpUtilTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpUtilTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/HttpUtilTest.java Sun Feb 26 23:43:20 2012
@@ -41,11 +41,11 @@ public class HttpUtilTest {
public static final FakeTimeSource timeSource = new FakeTimeSource();
public static final long testStartTime = timeSource.currentTimeMillis();
-
+
static {
HttpUtil.setTimeSource(timeSource);
}
-
+
private HttpServletResponse mockResponse = EasyMock.createMock(HttpServletResponse.class);
private HttpServletResponseRecorder recorder = new HttpServletResponseRecorder(mockResponse);
@@ -61,7 +61,7 @@ public class HttpUtilTest {
checkCacheControlHeaders(testStartTime, recorder, HttpUtil.getDefaultTtl(), true);
}
-
+
@Test
public void testSetCachingHeadersAllowProxy() {
HttpUtil.setCachingHeaders(recorder, false);
@@ -87,7 +87,7 @@ public class HttpUtilTest {
HttpUtil.setCachingHeaders(recorder, 0);
checkCacheControlHeaders(testStartTime, recorder, 0, true);
}
-
+
@Test
public void testSetNoCche() {
HttpUtil.setNoCache(recorder);
@@ -142,5 +142,5 @@ public class HttpUtilTest {
}
}
}
-
+
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/UserAgentTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/UserAgentTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/UserAgentTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/servlet/UserAgentTest.java Sun Feb 26 23:43:20 2012
@@ -35,7 +35,7 @@ public class UserAgentTest extends Asser
public void testVersionNumberParsingStandardDecimal() {
assertEquals(3.1415, getUaEntry("3.1415").getVersionNumber(), 0);
}
-
+
@Test
public void testVersionNumberParsingMultiPart() {
assertEquals(3.1, getUaEntry("3.1.5").getVersionNumber(), 0);
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java Sun Feb 26 23:43:20 2012
@@ -198,7 +198,7 @@ public class UriBuilderTest {
.setFragment("foo");
assertEquals("http://apache.org/shindig?hello=world&hello=monde#foo", builder.toString());
}
-
+
@Test
public void removeQueryParameter() {
UriBuilder uri = UriBuilder.parse("http://www.example.com/foo?bar=baz&quux=baz");
@@ -255,7 +255,7 @@ public class UriBuilderTest {
assertEquals("http://apache.org/shindig?hello+world=foo%26bar#foo", builder.toString());
assertEquals("hello+world=foo%26bar", builder.getQuery());
}
-
+
@Test
public void addSingleFragmentParameter() {
UriBuilder builder = new UriBuilder()
@@ -289,7 +289,7 @@ public class UriBuilderTest {
.setQuery("foo");
assertEquals("http://apache.org/shindig?foo#hello=world&hello=monde", builder.toString());
}
-
+
@Test
public void removeFragmentParameter() {
UriBuilder uri = UriBuilder.parse("http://www.example.com/foo#bar=baz&quux=baz");
@@ -398,7 +398,7 @@ public class UriBuilderTest {
assertEquals(uri.hashCode(), uri2.hashCode());
}
-
+
@Test
public void constructFromServletRequestHttpStandardPortAndModify() {
HttpServletRequest req = createMock(HttpServletRequest.class);
@@ -408,19 +408,19 @@ public class UriBuilderTest {
expect(req.getRequestURI()).andReturn("/my/path");
expect(req.getQueryString()).andReturn("foo=bar&baz=bak");
replay(req);
-
+
UriBuilder builder = new UriBuilder(req);
verify(req);
-
+
assertEquals("http://example.com/my/path?foo=bar&baz=bak", builder.toString());
assertEquals("bar", builder.getQueryParameter("foo")); // sanity check on a single param
assertEquals(0, builder.getFragmentParameters().size()); // shouldn't NPE
-
+
// Simple modification
builder.setPath("/other/path");
assertEquals("http://example.com/other/path?foo=bar&baz=bak", builder.toString());
}
-
+
@Test
public void constructFromServletRequestHttpsStandardPort() {
HttpServletRequest req = createMock(HttpServletRequest.class);
@@ -430,13 +430,13 @@ public class UriBuilderTest {
expect(req.getRequestURI()).andReturn("/my/path");
expect(req.getQueryString()).andReturn("foo=bar&baz=bak");
replay(req);
-
+
UriBuilder builder = new UriBuilder(req);
verify(req);
-
+
assertEquals("https://example.com/my/path?foo=bar&baz=bak", builder.toString());
}
-
+
@Test
public void constructFromServletRequestNonStandardPort() {
HttpServletRequest req = createMock(HttpServletRequest.class);
@@ -446,13 +446,13 @@ public class UriBuilderTest {
expect(req.getRequestURI()).andReturn("/my/path");
expect(req.getQueryString()).andReturn("one=two&three=four");
replay(req);
-
+
UriBuilder builder = new UriBuilder(req);
verify(req);
-
+
assertEquals("http://example.com:5000/my/path?one=two&three=four", builder.toString());
}
-
+
@Test
public void constructFromServletRequestNonePort() {
HttpServletRequest req = createMock(HttpServletRequest.class);
@@ -462,10 +462,10 @@ public class UriBuilderTest {
expect(req.getRequestURI()).andReturn("/my/path");
expect(req.getQueryString()).andReturn("one=two&three=four");
replay(req);
-
+
UriBuilder builder = new UriBuilder(req);
verify(req);
-
+
assertEquals("http://example.com/my/path?one=two&three=four", builder.toString());
}
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriTest.java Sun Feb 26 23:43:20 2012
@@ -199,12 +199,12 @@ public class UriTest {
assertEquals("http://example.org/foo/bar/wee", base.resolve(other).toString());
}
-
+
@Test
public void resolvePathRelativeToNullPath() throws Exception {
Uri base = new UriBuilder().setScheme("http").setAuthority("example.org").toUri();
Uri other = Uri.parse("dir");
-
+
assertEquals("http://example.org/dir", base.resolve(other).toString());
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java Sun Feb 26 23:43:20 2012
@@ -40,7 +40,7 @@ public class CharsetUtilTest {
testStringOfLength(100);
testStringOfLength(1000);
}
-
+
private void testStringOfLength(int len) {
StringBuilder sb = new StringBuilder();
for (int i=0; i < len; ++i) {
@@ -52,17 +52,17 @@ public class CharsetUtilTest {
assertEquals('a', out[i]);
}
}
-
+
private static final byte[] LATIN1_UTF8_DATA = {
'G', 'a', 'm', 'e', 's', ',', ' ', 'H', 'Q', ',', ' ', 'M', 'a', 'n', 'g', (byte)0xC3,
(byte) 0xA1, ',', ' ', 'A', 'n', 'i', 'm', 'e', ' ', 'e', ' ', 't', 'u', 'd', 'o', ' ',
'q', 'u', 'e', ' ', 'u', 'm', ' ', 'b', 'o', 'm', ' ', 'n', 'e', 'r', 'd', ' ', 'a', 'm', 'a'
};
-
+
private static final String LATIN1_STRING
= "Games, HQ, Mang\u00E1, Anime e tudo que um bom nerd ama";
-
+
@Test
public void testLatin1() {
ArrayAssert.assertEquals(LATIN1_UTF8_DATA, CharsetUtil.getUtf8Bytes(LATIN1_STRING));
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/DateUtilTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/DateUtilTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/DateUtilTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/DateUtilTest.java Sun Feb 26 23:43:20 2012
@@ -41,7 +41,7 @@ public class DateUtilTest {
"3090-06-30T03:29:55.000Z",
"1670-06-06T01:57:27.000Z"
};
-
+
Date[] timeStamps = new Date[] {
new Date(1211865170000L),
new Date(1211949648000L),
@@ -53,7 +53,7 @@ public class DateUtilTest {
public void parse() {
for (int i = 0, j = rfc1123text.length; i < j; ++i) {
assertEquals(timeStamps[i].getTime(), DateUtil.parseRfc1123Date(rfc1123text[i]).getTime());
- }
+ }
}
@Test
@@ -62,38 +62,38 @@ public class DateUtilTest {
assertEquals(rfc1123text[i], DateUtil.formatRfc1123Date(timeStamps[i].getTime()));
}
}
-
+
@Test
public void formatIso8601() {
for (int i = 0, j = timeStamps.length; i < j; ++i) {
assertEquals(iso8601text[i], DateUtil.formatIso8601Date(timeStamps[i].getTime()));
}
}
-
+
@Test
public void formatRfc1123Date() {
for (int i = 0, j = timeStamps.length; i < j; ++i) {
assertEquals(rfc1123text[i], DateUtil.formatRfc1123Date(timeStamps[i]));
}
}
-
+
@Test
public void formatIso8601Date() {
for (int i = 0, j = timeStamps.length; i < j; ++i) {
assertEquals(iso8601text[i], DateUtil.formatIso8601Date(timeStamps[i]));
}
}
-
+
@Test
public void parseMalformedRfc1123() {
assertNull(DateUtil.parseRfc1123Date("Invalid date format"));
}
-
+
@Test
public void parseMalformedIso8691() {
assertNull(DateUtil.parseIso8601DateTime("invalid date format"));
}
-
+
@Test
public void parseWrongTimeZone() {
String expires = "Mon, 12 May 2008 09:23:29 PDT";
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java Sun Feb 26 23:43:20 2012
@@ -30,20 +30,20 @@ public class FakeTimeSource extends Time
public FakeTimeSource() {
this(System.currentTimeMillis());
}
-
+
public FakeTimeSource(long now) {
this.now = now;
}
-
+
@Override
public long currentTimeMillis() {
return now;
}
-
+
public void setCurrentTimeMillis(long now) {
this.now = now;
}
-
+
public void incrementSeconds(int seconds) {
now += seconds*1000;
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java Sun Feb 26 23:43:20 2012
@@ -146,7 +146,7 @@ public class JsonConversionUtilTest exte
return;
}
assertEquals(expectedObject.names().length(), actualObject.names().length());
-
+
for (String key : JSONObject.getNames(expectedObject)) {
assertTrue("missing key " + key, actualObject.has(key));
assertJsonEquals(expectedObject.get(key), actualObject.get(key));
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/config/BasicContainerConfigTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/config/BasicContainerConfigTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/config/BasicContainerConfigTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/config/BasicContainerConfigTest.java Sun Feb 26 23:43:20 2012
@@ -141,11 +141,11 @@ public class BasicContainerConfigTest {
config.newTransaction().addContainer(defaultContainer).addContainer(newContainer).commit();
assertEquals(expectedContainer, config.getProperties("new"));
}
-
+
@Test
public void testNulledPropertiesRemainNulledAfterSeveralTransactions() throws Exception {
- Map<String, Object> defaultContainer = makeContainer("default", "o1", "v1", "o2", "v2", "o3", "v3");
- Map<String, Object> parentContainer = makeContainer("parent", "o3", null);
+ Map<String, Object> defaultContainer = makeContainer("default", "o1", "v1", "o2", "v2", "o3", "v3");
+ Map<String, Object> parentContainer = makeContainer("parent", "o3", null);
Map<String, Object> childContainer = makeContainer("child", "parent", "parent", "o2", null);
config.newTransaction().addContainer(defaultContainer).commit();
config.newTransaction().addContainer(parentContainer).commit();
@@ -218,7 +218,7 @@ public class BasicContainerConfigTest {
assertFalse(config.getContainers().contains("extra"));
EasyMock.verify(observer);
}
-
+
@Test
public void testClearContainerConfig() throws Exception {
ConfigObserver observer = EasyMock.createMock(ContainerConfig.ConfigObserver.class);
@@ -233,7 +233,7 @@ public class BasicContainerConfigTest {
.addContainer(EXTRA_CONTAINER)
.commit();
config.addConfigObserver(observer, false);
-
+
config
.newTransaction()
.clearContainers()
@@ -243,17 +243,17 @@ public class BasicContainerConfigTest {
assertFalse(config.getContainers().contains("extra"));
assertTrue(config.getContainers().contains("additional"));
-
+
EasyMock.verify(observer);
}
-
+
@Test
public void testAddObserverNotifiesImmediately() throws Exception {
ConfigObserver observer = EasyMock.createMock(ContainerConfig.ConfigObserver.class);
observer.containersChanged(EasyMock.isA(ContainerConfig.class),
EasyMock.eq(ImmutableSet.of("default", "extra")), EasyMock.eq(ImmutableSet.<String>of()));
EasyMock.replay(observer);
-
+
config = new BasicContainerConfig();
config
.newTransaction()
@@ -261,10 +261,10 @@ public class BasicContainerConfigTest {
.addContainer(EXTRA_CONTAINER)
.commit();
config.addConfigObserver(observer, true);
-
+
EasyMock.verify(observer);
}
-
+
@Test
public void testAliasesArePopulated() throws Exception {
Map<String, Object> container =
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigLoaderTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigLoaderTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigLoaderTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigLoaderTest.java Sun Feb 26 23:43:20 2012
@@ -90,7 +90,7 @@ public class JsonContainerConfigLoaderTe
JsonContainerConfigLoader
.getTransactionFromFile(containers, "localhost", "8080", "",config).commit();
}
-
+
@Before
public void setUp() {
config = new ExpressionContainerConfig(Expressions.forTesting());
@@ -112,7 +112,7 @@ public class JsonContainerConfigLoaderTe
String nestedValue = nested.get(NESTED_NAME).toString();
assertEquals(NESTED_VALUE, nestedValue);
}
-
+
@Test
public void aliasesArePopulated() throws Exception {
@@ -258,13 +258,13 @@ public class JsonContainerConfigLoaderTe
createConfigForTest(createTemporaryFile(json, ".json").getAbsolutePath());
assertNull(config.getMap("default", "features").get("osapi"));
}
-
+
@Test
public void testNullEntriesOverrideEntriesInParent() throws Exception {
// We use JSON Objects here to guarantee that we're well formed up front.
- JSONObject parent = new JSONObject("{ 'gadgets.container' : ['default'], features : { osapi : 'foo' }}");
- JSONObject child = new JSONObject("{ 'gadgets.container' : ['child'], features : null}");
- JSONObject grand = new JSONObject("{ 'gadgets.container' : ['grand'], parent : 'child'}");
+ JSONObject parent = new JSONObject("{ 'gadgets.container' : ['default'], features : { osapi : 'foo' }}");
+ JSONObject child = new JSONObject("{ 'gadgets.container' : ['child'], features : null}");
+ JSONObject grand = new JSONObject("{ 'gadgets.container' : ['grand'], parent : 'child'}");
createConfigForTest(createTemporaryFile(parent, ".json").getAbsolutePath());
createConfigForTest(createTemporaryFile(child, ".json").getAbsolutePath());
createConfigForTest(createTemporaryFile(grand, ".json").getAbsolutePath());
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java Sun Feb 26 23:43:20 2012
@@ -54,7 +54,7 @@ public class JsonContainerConfigTest {
private static final String ARRAY_NAME = "array value";
private static final String[] ARRAY_VALUE = {"Hello", "World"};
private static final String ARRAY_ALT_VALUE = "Not an array";
-
+
private File createContainer(JSONObject json) throws Exception {
File file = File.createTempFile(getClass().getName(), ".json");
file.deleteOnExit();
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java Sun Feb 26 23:43:20 2012
@@ -42,28 +42,28 @@ public class ExpressionsTest {
public Expressions expressions;
private ELContext context;
private Map<String, Object> variables;
-
+
@Before
public void setUp() {
expressions = Expressions.forTesting();
variables = Maps.newHashMap();
context = expressions.newELContext(new RootELResolver(variables));
}
-
+
@Test
public void arraySupport() {
addVariable("array", new String[]{"foo", "bar"});
String result = evaluate("${array[0]}${array[1]}", String.class);
assertEquals("foobar", result);
}
-
+
@Test
public void listSupport() {
addVariable("list", ImmutableList.of("foo", "bar"));
String result = evaluate("${list[0]}${list[1]}", String.class);
assertEquals("foobar", result);
}
-
+
@Test
public void mapSupport() {
addVariable("map", ImmutableMap.of("foo", "bar"));
@@ -91,7 +91,7 @@ public class ExpressionsTest {
JSONArray expected = new JSONArray("['first', 'second']");
assertEquals(expected.toString(), result.toString());
}
-
+
@Test
public void jsonArrayCoercion() throws Exception {
addVariable("foo", "first,second");
@@ -99,7 +99,7 @@ public class ExpressionsTest {
JSONArray expected = new JSONArray("['first', 'second']");
assertEquals(expected.toString(), result.toString());
}
-
+
@Test
public void missingJsonSubproperty() throws Exception {
addVariable("object", new JSONObject("{foo: 125}"));
@@ -130,7 +130,7 @@ public class ExpressionsTest {
assertTrue(evaluate("${bool}", Boolean.class));
assertFalse(evaluate("${!bool}", Boolean.class));
}
-
+
@Test
public void booleanCoercionOfNumbers() throws Exception{
// Negation tests have been moved to EL subdir
@@ -139,15 +139,15 @@ public class ExpressionsTest {
addVariable("bool", 1);
assertTrue(evaluate("${bool}", Boolean.class));
- }
-
+ }
+
@Test
public void booleanCoercionOfNull() throws Exception{
addVariable("bool", null);
assertFalse(evaluate("${bool}", Boolean.class));
assertTrue(evaluate("${!bool}", Boolean.class));
}
-
+
@Test
public void booleanCoercionOfStrings() throws Exception{
// Negation tests for FALSE and any String have been moved El subdir
@@ -166,33 +166,33 @@ public class ExpressionsTest {
addVariable("bool", "true");
assertTrue(evaluate("${bool}", Boolean.class));
assertFalse(evaluate("${!bool}", Boolean.class));
-
+
addVariable("bool", "booga");
assertTrue(evaluate("${bool}", Boolean.class));
- }
-
-
+ }
+
+
@Test
public void iterableCoercionOfScalar() throws Exception {
addVariable("iter", "foo");
assertEquals(ImmutableList.of("foo"),
evaluate("${iter}", Iterable.class));
}
-
+
@Test
public void iterableCoercionOfNull() throws Exception {
addVariable("iter", null);
assertEquals(ImmutableList.of(),
evaluate("${iter}", Iterable.class));
}
-
+
@Test
public void iterableCoercionOfCollection() throws Exception {
addVariable("iter", ImmutableList.of(1, 2, 3));
assertEquals(ImmutableList.of(1, 2, 3),
evaluate("${iter}", Iterable.class));
}
-
+
@Test
@SuppressWarnings("unchecked")
public void iterableCoercionOfJSONArray() throws Exception {
@@ -200,7 +200,7 @@ public class ExpressionsTest {
assertEquals(ImmutableList.of(1, 2, 3),
ImmutableList.copyOf(evaluate("${iter}", Iterable.class)));
}
-
+
@Test
@SuppressWarnings("unchecked")
public void iterableCoercionOfJSONObjectWithListProperty() throws Exception {
@@ -208,7 +208,7 @@ public class ExpressionsTest {
assertEquals(ImmutableList.of(1, 2, 3),
ImmutableList.copyOf(evaluate("${iter}", Iterable.class)));
}
-
+
@Test
@SuppressWarnings("unchecked")
public void iterableCoercionOfJSONObjectWithoutListProperty() throws Exception {
@@ -217,7 +217,7 @@ public class ExpressionsTest {
assertEquals(ImmutableList.of(json),
ImmutableList.copyOf(evaluate("${iter}", Iterable.class)));
}
-
+
public <T> T evaluate(String expression, Class<T> type) {
ValueExpression expr = expressions.parse(expression, type);
return type.cast(expr.getValue(context));
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/FunctionsTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/FunctionsTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/FunctionsTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/FunctionsTest.java Sun Feb 26 23:43:20 2012
@@ -61,7 +61,7 @@ public class FunctionsTest extends Asser
public void testDefaultBinding() throws Exception {
Injector injector = Guice.createInjector();
functions = injector.getInstance(Functions.class);
-
+
Method toJson = functions.resolveFunction("osx", "parseJson");
Object o = toJson.invoke(null, "{a : 1}");
assertTrue(o instanceof JSONObject);
@@ -73,13 +73,13 @@ public class FunctionsTest extends Asser
Expressions expressions = Expressions.forTesting(functions);
ELContext context = expressions.newELContext();
ValueExpression expression = expressions.parse("${other:bonjour()}", String.class);
-
+
assertEquals("French hello", expression.getValue(context));
-
+
expression = expressions.parse("${test:add(1, 2)}", Integer.class);
assertEquals(3, expression.getValue(context));
}
-
+
/**
* Static function, should be exposed under two names.
*/
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/OpensocialFunctionsTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/OpensocialFunctionsTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/OpensocialFunctionsTest.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/OpensocialFunctionsTest.java Sun Feb 26 23:43:20 2012
@@ -35,7 +35,7 @@ public class OpensocialFunctionsTest ext
private Expressions expressions;
private ELContext context;
private Map<String, Object> vars = Maps.newHashMap();
-
+
@Before
public void setUp() {
Functions functions = new Functions(OpensocialFunctions.class);
@@ -62,7 +62,7 @@ public class OpensocialFunctionsTest ext
String test = "12345";
String encoded = new String(Base64.encodeBase64(test.getBytes("UTF-8")), "UTF-8");
vars.put("encoded", encoded);
-
+
ValueExpression testDecodeBase64 =
expressions.parse("${osx:decodeBase64(encoded)}", String.class);
assertEquals("12345", testDecodeBase64.getValue(context));