Apply Activiti code style

activiti-engine/src/main/java/org/activiti/engine/impl/el/JsonNodeELResolver.java

@@ -47,16 +47,18 @@ public class JsonNodeELResolver extends ELResolver {
 	}
 
 	/**
-   * Creates a new BeanELResolver whose read-only status is determined by the given parameter.
+	 * Creates a new BeanELResolver whose read-only status is determined by the
+	 * given parameter.
 	 */
 	public JsonNodeELResolver(boolean readOnly) {
 		this.readOnly = readOnly;
 	}
 
 	/**
-   * If the base object is not null, returns the most general type that this resolver accepts for
-   * the property argument. Otherwise, returns null. Assuming the base is not null, this method
-   * will always return Object.class. This is because any object is accepted as a key and is
+	 * If the base object is not null, returns the most general type that this
+	 * resolver accepts for the property argument. Otherwise, returns null.
+	 * Assuming the base is not null, this method will always return
+	 * Object.class. This is because any object is accepted as a key and is
 	 * coerced into a string.
 	 * 
 	 * @param context
@@ -71,13 +73,15 @@ public class JsonNodeELResolver extends ELResolver {
 	}
 
 	/**
-   * If the base object is not null, returns an Iterator containing the set of JavaBeans
-   * properties available on the given object. Otherwise, returns null. The Iterator returned must
-   * contain zero or more instances of java.beans.FeatureDescriptor. Each info object contains
-   * information about a property in the bean, as obtained by calling the
-   * BeanInfo.getPropertyDescriptors method. The FeatureDescriptor is initialized using the same
-   * fields as are present in the PropertyDescriptor, with the additional required named
-   * attributes "type" and "resolvableAtDesignTime" set as follows:
+	 * If the base object is not null, returns an Iterator containing the set of
+	 * JavaBeans properties available on the given object. Otherwise, returns
+	 * null. The Iterator returned must contain zero or more instances of
+	 * java.beans.FeatureDescriptor. Each info object contains information about
+	 * a property in the bean, as obtained by calling the
+	 * BeanInfo.getPropertyDescriptors method. The FeatureDescriptor is
+	 * initialized using the same fields as are present in the
+	 * PropertyDescriptor, with the additional required named attributes "type"
+	 * and "resolvableAtDesignTime" set as follows:
 	 * <ul>
 	 * <li>{@link ELResolver#TYPE} - The runtime type of the property, from
 	 * PropertyDescriptor.getPropertyType().</li>
@@ -88,8 +92,9 @@ public class JsonNodeELResolver extends ELResolver {
 	 *            The context of this evaluation.
 	 * @param base
 	 *            The bean to analyze.
-   * @return An Iterator containing zero or more FeatureDescriptor objects, each representing a
-   *         property on this bean, or null if the base object is null.
+	 * @return An Iterator containing zero or more FeatureDescriptor objects,
+	 *         each representing a property on this bean, or null if the base
+	 *         object is null.
 	 */
 	@Override
 	public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
@@ -97,9 +102,12 @@ public class JsonNodeELResolver extends ELResolver {
 			JsonNode node = (JsonNode) base;
 			final Iterator<String> keys = node.fieldNames();
 			return new Iterator<FeatureDescriptor>() {
+				@Override
 				public boolean hasNext() {
 					return keys.hasNext();
 				}
+
+				@Override
 				public FeatureDescriptor next() {
 					Object key = keys.next();
 					FeatureDescriptor feature = new FeatureDescriptor();
@@ -114,6 +122,8 @@ public class JsonNodeELResolver extends ELResolver {
 					return feature;
 
 				}
+
+				@Override
 				public void remove() {
 					throw new UnsupportedOperationException("cannot remove");
 				}
@@ -123,27 +133,30 @@ public class JsonNodeELResolver extends ELResolver {
 	}
 
 	/**
-   * If the base object is a map, returns the most general acceptable type for a value in this
-   * map. If the base is a Map, the propertyResolved property of the ELContext object must be set
-   * to true by this resolver, before returning. If this property is not true after this method is
-   * called, the caller should ignore the return value. Assuming the base is a Map, this method
-   * will always return Object.class. This is because Maps accept any object as the value for a
-   * given key.
+	 * If the base object is a map, returns the most general acceptable type for
+	 * a value in this map. If the base is a Map, the propertyResolved property
+	 * of the ELContext object must be set to true by this resolver, before
+	 * returning. If this property is not true after this method is called, the
+	 * caller should ignore the return value. Assuming the base is a Map, this
+	 * method will always return Object.class. This is because Maps accept any
+	 * object as the value for a given key.
 	 * 
 	 * @param context
 	 *            The context of this evaluation.
 	 * @param base
-   *            The map to analyze. Only bases of type Map are handled by this resolver.
+	 *            The map to analyze. Only bases of type Map are handled by this
+	 *            resolver.
 	 * @param property
-   *            The key to return the acceptable type for. Ignored by this resolver.
-   * @return If the propertyResolved property of ELContext was set to true, then the most general
-   *         acceptable type; otherwise undefined.
+	 *            The key to return the acceptable type for. Ignored by this
+	 *            resolver.
+	 * @return If the propertyResolved property of ELContext was set to true,
+	 *         then the most general acceptable type; otherwise undefined.
 	 * @throws NullPointerException
 	 *             if context is null
 	 * @throws ELException
-   *             if an exception was thrown while performing the property or variable resolution.
-   *             The thrown exception must be included as the cause property of this exception, if
-   *             available.
+	 *             if an exception was thrown while performing the property or
+	 *             variable resolution. The thrown exception must be included as
+	 *             the cause property of this exception, if available.
 	 */
 	@Override
 	public Class<?> getType(ELContext context, Object base, Object property) {
@@ -159,32 +172,38 @@ public class JsonNodeELResolver extends ELResolver {
 	}
 
 	/**
-   * If the base object is a map, returns the value associated with the given key, as specified by
-   * the property argument. If the key was not found, null is returned. If the base is a Map, the
-   * propertyResolved property of the ELContext object must be set to true by this resolver,
-   * before returning. If this property is not true after this method is called, the caller should
-   * ignore the return value. Just as in java.util.Map.get(Object), just because null is returned
-   * doesn't mean there is no mapping for the key; it's also possible that the Map explicitly maps
-   * the key to null.
+	 * If the base object is a map, returns the value associated with the given
+	 * key, as specified by the property argument. If the key was not found,
+	 * null is returned. If the base is a Map, the propertyResolved property of
+	 * the ELContext object must be set to true by this resolver, before
+	 * returning. If this property is not true after this method is called, the
+	 * caller should ignore the return value. Just as in
+	 * java.util.Map.get(Object), just because null is returned doesn't mean
+	 * there is no mapping for the key; it's also possible that the Map
+	 * explicitly maps the key to null.
 	 * 
 	 * @param context
 	 *            The context of this evaluation.
 	 * @param base
-   *            The map to analyze. Only bases of type Map are handled by this resolver.
+	 *            The map to analyze. Only bases of type Map are handled by this
+	 *            resolver.
 	 * @param property
-   *            The key to return the acceptable type for. Ignored by this resolver.
-   * @return If the propertyResolved property of ELContext was set to true, then the value
-   *         associated with the given key or null if the key was not found. Otherwise, undefined.
+	 *            The key to return the acceptable type for. Ignored by this
+	 *            resolver.
+	 * @return If the propertyResolved property of ELContext was set to true,
+	 *         then the value associated with the given key or null if the key
+	 *         was not found. Otherwise, undefined.
 	 * @throws ClassCastException
-   *             if the key is of an inappropriate type for this map (optionally thrown by the
-   *             underlying Map).
+	 *             if the key is of an inappropriate type for this map
+	 *             (optionally thrown by the underlying Map).
 	 * @throws NullPointerException
-   *             if context is null, or if the key is null and this map does not permit null keys
-   *             (the latter is optionally thrown by the underlying Map).
+	 *             if context is null, or if the key is null and this map does
+	 *             not permit null keys (the latter is optionally thrown by the
+	 *             underlying Map).
 	 * @throws ELException
-   *             if an exception was thrown while performing the property or variable resolution.
-   *             The thrown exception must be included as the cause property of this exception, if
-   *             available.
+	 *             if an exception was thrown while performing the property or
+	 *             variable resolution. The thrown exception must be included as
+	 *             the cause property of this exception, if available.
 	 */
 	@Override
 	public Object getValue(ELContext context, Object base, Object property) {
@@ -209,7 +228,8 @@ public class JsonNodeELResolver extends ELResolver {
 
 			} else {
 				if (resultNode.isArray()) {
-          result = Context.getProcessEngineConfiguration().getObjectMapper().convertValue(resultNode, List.class);
+					result = Context.getProcessEngineConfiguration().getObjectMapper().convertValue(resultNode,
+							List.class);
 				} else {
 					result = resultNode;
 				}
@@ -221,30 +241,36 @@ public class JsonNodeELResolver extends ELResolver {
 
 	/**
 	 * If the base object is a map, returns whether a call to
-   * {@link #setValue(ELContext, Object, Object, Object)} will always fail. If the base is a Map,
-   * the propertyResolved property of the ELContext object must be set to true by this resolver,
-   * before returning. If this property is not true after this method is called, the caller should
-   * ignore the return value. If this resolver was constructed in read-only mode, this method will
-   * always return true. If a Map was created using java.util.Collections.unmodifiableMap(Map),
-   * this method must return true. Unfortunately, there is no Collections API method to detect
-   * this. However, an implementation can create a prototype unmodifiable Map and query its
-   * runtime type to see if it matches the runtime type of the base object as a workaround.
+	 * {@link #setValue(ELContext, Object, Object, Object)} will always fail. If
+	 * the base is a Map, the propertyResolved property of the ELContext object
+	 * must be set to true by this resolver, before returning. If this property
+	 * is not true after this method is called, the caller should ignore the
+	 * return value. If this resolver was constructed in read-only mode, this
+	 * method will always return true. If a Map was created using
+	 * java.util.Collections.unmodifiableMap(Map), this method must return true.
+	 * Unfortunately, there is no Collections API method to detect this.
+	 * However, an implementation can create a prototype unmodifiable Map and
+	 * query its runtime type to see if it matches the runtime type of the base
+	 * object as a workaround.
 	 * 
 	 * @param context
 	 *            The context of this evaluation.
 	 * @param base
-   *            The map to analyze. Only bases of type Map are handled by this resolver.
+	 *            The map to analyze. Only bases of type Map are handled by this
+	 *            resolver.
 	 * @param property
-   *            The key to return the acceptable type for. Ignored by this resolver.
-   * @return If the propertyResolved property of ELContext was set to true, then true if calling
-   *         the setValue method will always fail or false if it is possible that such a call may
-   *         succeed; otherwise undefined.
+	 *            The key to return the acceptable type for. Ignored by this
+	 *            resolver.
+	 * @return If the propertyResolved property of ELContext was set to true,
+	 *         then true if calling the setValue method will always fail or
+	 *         false if it is possible that such a call may succeed; otherwise
+	 *         undefined.
 	 * @throws NullPointerException
 	 *             if context is null.
 	 * @throws ELException
-   *             if an exception was thrown while performing the property or variable resolution.
-   *             The thrown exception must be included as the cause property of this exception, if
-   *             available.
+	 *             if an exception was thrown while performing the property or
+	 *             variable resolution. The thrown exception must be included as
+	 *             the cause property of this exception, if available.
 	 */
 	@Override
 	public boolean isReadOnly(ELContext context, Object base, Object property) {
@@ -258,40 +284,45 @@ public class JsonNodeELResolver extends ELResolver {
 	}
 
 	/**
-   * If the base object is a map, attempts to set the value associated with the given key, as
-   * specified by the property argument. If the base is a Map, the propertyResolved property of
-   * the ELContext object must be set to true by this resolver, before returning. If this property
-   * is not true after this method is called, the caller can safely assume no value was set. If
-   * this resolver was constructed in read-only mode, this method will always throw
-   * PropertyNotWritableException. If a Map was created using
+	 * If the base object is a map, attempts to set the value associated with
+	 * the given key, as specified by the property argument. If the base is a
+	 * Map, the propertyResolved property of the ELContext object must be set to
+	 * true by this resolver, before returning. If this property is not true
+	 * after this method is called, the caller can safely assume no value was
+	 * set. If this resolver was constructed in read-only mode, this method will
+	 * always throw PropertyNotWritableException. If a Map was created using
 	 * java.util.Collections.unmodifiableMap(Map), this method must throw
-   * PropertyNotWritableException. Unfortunately, there is no Collections API method to detect
-   * this. However, an implementation can create a prototype unmodifiable Map and query its
-   * runtime type to see if it matches the runtime type of the base object as a workaround.
+	 * PropertyNotWritableException. Unfortunately, there is no Collections API
+	 * method to detect this. However, an implementation can create a prototype
+	 * unmodifiable Map and query its runtime type to see if it matches the
+	 * runtime type of the base object as a workaround.
 	 * 
 	 * @param context
 	 *            The context of this evaluation.
 	 * @param base
-   *            The map to analyze. Only bases of type Map are handled by this resolver.
+	 *            The map to analyze. Only bases of type Map are handled by this
+	 *            resolver.
 	 * @param property
-   *            The key to return the acceptable type for. Ignored by this resolver.
+	 *            The key to return the acceptable type for. Ignored by this
+	 *            resolver.
 	 * @param value
 	 *            The value to be associated with the specified key.
 	 * @throws ClassCastException
-   *             if the class of the specified key or value prevents it from being stored in this
-   *             map.
+	 *             if the class of the specified key or value prevents it from
+	 *             being stored in this map.
 	 * @throws NullPointerException
-   *             if context is null, or if this map does not permit null keys or values, and the
-   *             specified key or value is null.
+	 *             if context is null, or if this map does not permit null keys
+	 *             or values, and the specified key or value is null.
 	 * @throws IllegalArgumentException
-   *             if some aspect of this key or value prevents it from being stored in this map.
+	 *             if some aspect of this key or value prevents it from being
+	 *             stored in this map.
 	 * @throws PropertyNotWritableException
-   *             if this resolver was constructed in read-only mode, or if the put operation is
-   *             not supported by the underlying map.
+	 *             if this resolver was constructed in read-only mode, or if the
+	 *             put operation is not supported by the underlying map.
 	 * @throws ELException
-   *             if an exception was thrown while performing the property or variable resolution.
-   *             The thrown exception must be included as the cause property of this exception, if
-   *             available.
+	 *             if an exception was thrown while performing the property or
+	 *             variable resolution. The thrown exception must be included as
+	 *             the cause property of this exception, if available.
 	 */
 	@Override
 	public void setValue(ELContext context, Object base, Object property, Object value) {
@@ -331,7 +362,8 @@ public class JsonNodeELResolver extends ELResolver {
 	 * @param base
 	 *            The bean to analyze.
 	 * @param property
-   *            The name of the property to analyze. Will be coerced to a String.
+	 *            The name of the property to analyze. Will be coerced to a
+	 *            String.
 	 * @return base != null
 	 */
 	private final boolean isResolvable(Object base) {

activiti-engine/src/main/java/org/activiti/engine/impl/el/VariableScopeElResolver.java

@@ -28,14 +28,14 @@ import org.activiti.engine.impl.persistence.entity.VariableInstance;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
-
-
 /**
- * Implementation of an {@link ELResolver} that resolves expressions with the process variables of a given {@link VariableScope} as context. <br>
- * Also exposes the currently logged in username to be used in expressions (if any)
+ * Implementation of an {@link ELResolver} that resolves expressions with the
+ * process variables of a given {@link VariableScope} as context. <br>
+ * Also exposes the currently logged in username to be used in expressions (if
+ * any)
+ * 
+ * 
  * 
-
-
  */
 public class VariableScopeElResolver extends ELResolver {
 
@@ -49,12 +49,15 @@ public class VariableScopeElResolver extends ELResolver {
 		this.variableScope = variableScope;
 	}
 
+	@Override
 	public Object getValue(ELContext context, Object base, Object property) {
 
 		if (base == null) {
-      String variable = (String) property; // according to javadoc, can only be a String
+			String variable = (String) property; // according to javadoc, can
+													// only be a String
 
-      if ((EXECUTION_KEY.equals(property) && variableScope instanceof ExecutionEntity) || (TASK_KEY.equals(property) && variableScope instanceof TaskEntity)) {
+			if ((EXECUTION_KEY.equals(property) && variableScope instanceof ExecutionEntity)
+					|| (TASK_KEY.equals(property) && variableScope instanceof TaskEntity)) {
 				context.setPropertyResolved(true);
 				return variableScope;
 			} else if (EXECUTION_KEY.equals(property) && variableScope instanceof TaskEntity) {
@@ -65,11 +68,17 @@ public class VariableScopeElResolver extends ELResolver {
 				return Authentication.getAuthenticatedUserId();
 			} else {
 				if (variableScope.hasVariable(variable)) {
-          context.setPropertyResolved(true); // if not set, the next elResolver in the CompositeElResolver will be called
+					context.setPropertyResolved(true); // if not set, the next
+														// elResolver in the
+														// CompositeElResolver
+														// will be called
 					VariableInstance variableInstance = variableScope.getVariableInstance(variable);
 					Object value = variableInstance.getValue();
-          if ( ("json".equals(variableInstance.getTypeName()) || "longJson".equals(variableInstance.getTypeName())) && (value instanceof JsonNode) && ((JsonNode)value).isArray() ) {
-            return Context.getProcessEngineConfiguration().getObjectMapper().convertValue(value, List.class);
+					if (("json".equals(variableInstance.getTypeName())
+							|| "longJson".equals(variableInstance.getTypeName())) && (value instanceof JsonNode)
+							&& ((JsonNode) value).isArray()) {
+						return Context.getProcessEngineConfiguration().getObjectMapper().convertValue(value,
+								List.class);
 					} else {
 						return value;
 					}
@@ -84,6 +93,7 @@ public class VariableScopeElResolver extends ELResolver {
 		return null;
 	}
 
+	@Override
 	public boolean isReadOnly(ELContext context, Object base, Object property) {
 		if (base == null) {
 			String variable = (String) property;
@@ -92,6 +102,7 @@ public class VariableScopeElResolver extends ELResolver {
 		return true;
 	}
 
+	@Override
 	public void setValue(ELContext context, Object base, Object property, Object value) {
 		if (base == null) {
 			String variable = (String) property;
@@ -101,14 +112,17 @@ public class VariableScopeElResolver extends ELResolver {
 		}
 	}
 
+	@Override
 	public Class<?> getCommonPropertyType(ELContext arg0, Object arg1) {
 		return Object.class;
 	}
 
+	@Override
 	public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext arg0, Object arg1) {
 		return null;
 	}
 
+	@Override
 	public Class<?> getType(ELContext arg0, Object arg1, Object arg2) {
 		return Object.class;
 	}