Author: julien(a)jboss.com Date: 2008-04-14 20:21:17 -0400 (Mon, 14 Apr 2008) New Revision: 10584 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferenceInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferencesInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletPreferencesImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyMap.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/Property.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyChange.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyMap.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ValueMapAssert.java Log: remove usage of org.jboss.portal.common.value.* and use instead List<String> type Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -30,8 +30,6 @@ import org.jboss.portal.common.i18n.ResourceBundleManager; import org.jboss.portal.common.reflect.NoSuchClassException; import org.jboss.portal.common.util.ConversionException; -import org.jboss.portal.common.value.StringValue; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.LifeCyclePhase; import org.jboss.portal.portlet.impl.metadata.ListenerMetaData; import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; @@ -911,7 +909,7 @@ // for (PortletPreferenceMetaData portletPreferenceMD : preferencesMD.getPortletPreferences().values()) { - Value value = new StringValue(portletPreferenceMD.getValue()); + List<String> value = portletPreferenceMD.getValue(); LocalizedString displayName = bundleMgr.getLocalizedValue("javax.portlet.preference.name." + portletPreferenceMD.getName(), portletPreferenceMD.getName()); LocalizedString description = bundleMgr.getLocalizedValue("javax.portlet.preference.description." + portletPreferenceMD.getName(), portletPreferenceMD.getName()); containerPreferences.addContainerPreference(portletPreferenceMD.getName(), value, portletPreferenceMD.isReadOnly(), displayName, description); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferenceInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferenceInfo.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferenceInfo.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -23,9 +23,10 @@ package org.jboss.portal.portlet.impl.info; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.info.PreferenceInfo; +import java.util.List; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6818 $ @@ -37,9 +38,9 @@ private LocalizedString displayName; private LocalizedString description; private Boolean readOnly; - private Value value; + private List<String> value; - public ContainerPreferenceInfo(String key, LocalizedString displayName, LocalizedString description, boolean readOnly, Value value) + public ContainerPreferenceInfo(String key, LocalizedString displayName, LocalizedString description, boolean readOnly, List<String> value) { this.key = key; this.displayName = displayName; @@ -73,7 +74,7 @@ * * @return the preference value associated with this preference meta data */ - public Value getDefaultValue() + public List<String> getDefaultValue() { return value; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferencesInfo.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferencesInfo.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferencesInfo.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -23,7 +23,6 @@ package org.jboss.portal.portlet.impl.info; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.info.PreferenceInfo; import org.jboss.portal.portlet.info.PreferencesInfo; @@ -31,6 +30,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -72,7 +72,7 @@ public void addContainerPreference( String name, - Value value, + List<String> value, boolean readOnly, LocalizedString displayName, LocalizedString description) Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletPreferencesImpl.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletPreferencesImpl.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletPreferencesImpl.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -23,8 +23,6 @@ package org.jboss.portal.portlet.impl.jsr168.api; import org.apache.log4j.Logger; -import org.jboss.portal.common.value.StringValue; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.state.PropertyChange; import org.jboss.portal.portlet.state.PropertyContext; import org.jboss.portal.portlet.info.PreferenceInfo; @@ -44,6 +42,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -119,9 +118,9 @@ return Collections.enumeration(names); } - private Value getValue(String key) + private List<String> getValue(String key) { - Value value = null; + List<String> value = null; PropertyChange change = updates.get(key); if (change != null) { @@ -180,14 +179,14 @@ { throw new IllegalArgumentException("key must not be null"); } - Value value = getValue(key); + List<String> value = getValue(key); if (value == null || value.isEmpty()) { return def; } else { - return value.asString(); + return value.get(0); } } @@ -197,22 +196,14 @@ { throw new IllegalArgumentException("key must not be null"); } - Value value = getValue(key); -// if (value != null) -// { -// return value.asStringArray(); -// } -// else -// { -// return def; -// } + List<String> value = getValue(key); if (value == null || value.isEmpty()) { return def; } else { - return value.asStringArray(); + return value.toArray(new String[value.size()]); } } @@ -258,8 +249,7 @@ { throw new ReadOnlyException("Key " + key + " cannot be written"); } - Value value_ = new StringValue(value); - updates.put(key, PropertyChange.newUpdate(key, value_)); + updates.put(key, PropertyChange.newUpdate(key, value)); } public void setValues(String key, String[] values) throws IllegalArgumentException, ReadOnlyException @@ -276,8 +266,7 @@ { values = new String[1]; } - Value value_ = new StringValue(values); - updates.put(key, PropertyChange.newUpdate(key, value_)); + updates.put(key, PropertyChange.newUpdate(key, values)); } public void store() throws IOException, ValidatorException @@ -301,7 +290,7 @@ } // - PropertyChange[] changes = (PropertyChange[])updates.values().toArray(new PropertyChange[updates.size()]); + PropertyChange[] changes = updates.values().toArray(new PropertyChange[updates.size()]); prefs.update(changes); // Clear the updates @@ -321,19 +310,17 @@ // for (String key : containerPrefs.getKeys()) { - String[] value = containerPrefs.getContainerPreference(key).getDefaultValue().asStringArray(); - String[] clone = new String[value.length]; - System.arraycopy(value, 0, clone, 0, value.length); - super.put(key, clone); + List<String> defaultValue = containerPrefs.getContainerPreference(key).getDefaultValue(); + String[] value = defaultValue.toArray(new String[defaultValue.size()]); + super.put(key, value); } // for (String key : prefs.getKeys()) { - String[] value = prefs.getValue(key).asStringArray(); - String[] clone = new String[value.length]; - System.arraycopy(value, 0, clone, 0, value.length); - super.put(key, clone); + List<String> persistentValue = prefs.getValue(key); + String[] value = persistentValue.toArray(new String[persistentValue.size()]); + super.put(key, value); } // @@ -347,10 +334,9 @@ } else { - String[] value = change.getValue().asStringArray(); - String[] clone = new String[value.length]; - System.arraycopy(value, 0, clone, 0, value.length); - super.put(key, clone); + List<String> updatedValue = change.getValue(); + String[] value = updatedValue.toArray(new String[updatedValue.size()]); + super.put(key, value); } } } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.state; -import org.jboss.portal.common.value.StringValue; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; import org.jboss.portal.portlet.state.StateConversionException; @@ -35,8 +33,9 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.util.Iterator; import java.util.Map; +import java.util.List; +import java.util.Arrays; /** * <p>An implementation that relies on the <code>DataInputStream</code> and <code>DataOutputStream</code> to marshall @@ -75,17 +74,15 @@ dos.writeUTF(state.getPortletId()); PropertyMap map = state.getProperties(); dos.writeInt(map.size()); - for (Iterator<Map.Entry<String, Value>> i = map.entrySet().iterator(); i.hasNext();) + for (Map.Entry<String, List<String>> entry : map.entrySet()) { - Map.Entry<String, Value> entry = (Map.Entry<String, Value>)i.next(); - String key = (String)entry.getKey(); - StringValue value = (StringValue)entry.getValue(); - String[] strings = (String[])value.asObjectArray(); + String key = entry.getKey(); + List<String> value = entry.getValue(); + String[] strings = value.toArray(new String[value.size()]); dos.writeUTF(key); dos.writeInt(strings.length); - for (int j = 0; j < strings.length; j++) + for (String string : strings) { - String string = strings[j]; if (string == null) { dos.writeBoolean(true); @@ -143,7 +140,7 @@ strings[i] = string; } } - StringValue value = new StringValue(strings); + List<String> value = Arrays.asList(strings.clone()); properties.setProperty(key, value); } return new PortletState(portletId, properties); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,10 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; -import org.jboss.portal.common.value.Value; - import java.util.Collections; import java.util.Set; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -115,7 +114,7 @@ return prefs.keySet(); } - public Value getValue(String key) throws IllegalArgumentException + public List<String> getValue(String key) throws IllegalArgumentException { if (prefs == null) { Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyMap.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyMap.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -23,23 +23,23 @@ package org.jboss.portal.portlet.state; import org.jboss.portal.common.util.TypedMap; -import org.jboss.portal.common.value.Value; import java.util.Map; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6643 $ */ -public class AbstractPropertyMap<IK, IV> extends TypedMap<String, Value, IK, IV> implements PropertyMap +public class AbstractPropertyMap<IK, IV> extends TypedMap<String, List<String>, IK, IV> implements PropertyMap { - public AbstractPropertyMap(Map<IK, IV> map, Converter<String, IK> keyConverter, Converter<Value, IV> valueConverter) + public AbstractPropertyMap(Map<IK, IV> map, Converter<String, IK> keyConverter, Converter<List<String>, IV> valueConverter) { super(map, keyConverter, valueConverter); } - public Value getProperty(String key) throws IllegalArgumentException + public List<String> getProperty(String key) throws IllegalArgumentException { if (key == null) { @@ -48,7 +48,7 @@ return get(key); } - public void setProperty(String key, Value value) throws IllegalArgumentException + public void setProperty(String key, List<String> value) throws IllegalArgumentException { if (key == null) { Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/Property.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/Property.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/Property.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; -import org.jboss.portal.common.value.Value; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -35,9 +35,9 @@ protected String name; /** The property value. */ - protected Value value; + protected List<String> value; - public Property(String name, Value value) + public Property(String name, List<String> value) { this.name = name; this.value = value; @@ -48,7 +48,7 @@ return name; } - public Value getValue() + public List<String> getValue() { return value; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyChange.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyChange.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyChange.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,7 +22,10 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; -import org.jboss.portal.common.value.Value; +import java.util.List; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Arrays; /** * A property change. The class is immutable @@ -42,26 +45,54 @@ /** The key. */ private final String key; - /** The value. */ - private final Value value; + /** The immutable value. */ + private final List<String> value; /** - * Create a new property update. + * Create a new property update, the list of values will be clone for safety. * * @param key the property key * @param value the property value * @return an instance representing a property update */ - public static PropertyChange newUpdate(String key, Value value) + public static PropertyChange newUpdate(String key, String value) { + return new PropertyChange(key, Collections.singletonList(value)); + } + + /** + * Create a new property update, the list of values will be clone for safety. + * + * @param key the property key + * @param value the property value + * @return an instance representing a property update + */ + public static PropertyChange newUpdate(String key, String[] value) + { if (value == null) { throw new IllegalArgumentException("No value provided"); } - return new PropertyChange(key, value); + return new PropertyChange(key, Collections.unmodifiableList(Arrays.asList(value.clone()))); } /** + * Create a new property update, the list of values will be clone for safety. + * + * @param key the property key + * @param value the property value + * @return an instance representing a property update + */ + public static PropertyChange newUpdate(String key, List<String> value) + { + if (value == null) + { + throw new IllegalArgumentException("No value provided"); + } + return new PropertyChange(key, Collections.unmodifiableList(new ArrayList<String>(value))); + } + + /** * Create a new property reset. * * @param key the property key @@ -72,7 +103,7 @@ return new PropertyChange(key, null); } - private PropertyChange(String key, Value value) + private PropertyChange(String key, List<String> value) { if (key == null) { @@ -85,7 +116,7 @@ /** * Return the property change type. * - * @return the proeprty change type + * @return the property change type */ public int getType() { @@ -107,7 +138,7 @@ * * @return the property value */ - public Value getValue() + public List<String> getValue() { return value; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyContext.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyContext.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyContext.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,9 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; -import org.jboss.portal.common.value.Value; - import java.util.Set; +import java.util.List; /** * Exposes to the portlet the interface to deal with the personalization state. @@ -34,29 +33,29 @@ */ public interface PropertyContext { + /** The attribute name under which the preferences can be accessed. */ String PREFERENCES_ATTRIBUTE = "preferences"; /** - * Return the key set. + * Return an immutable set of keys. * * @return the set of keys */ Set<String> getKeys(); /** - * Return for a specified key its value or null if the value does not exist. + * Return for a specified key an immutable list of its values or null if the value does not exist. * * @param key the lookup key * @return the key value or null if it does not exist * @throws IllegalArgumentException if the key is null */ - Value getValue(String key) throws IllegalArgumentException; + List<String> getValue(String key) throws IllegalArgumentException; /** - * Return true if the preferences are globally read only. The value returned by - * this method is valid only during the action request. Any call to this method - * during the render request will produce a non accurate value. + * Return true if the preferences are globally read only. The value returned by this method is valid only during + * the action request. Any call to this method during the render request will produce a non accurate value. * * @return true if the preferences are read only * @throws IllegalStateException if this is called during render phase @@ -66,6 +65,7 @@ /** * Update the preferences. * + * @param changes the list of changes * @throws IllegalStateException if the preferences is not writable * @throws IllegalArgumentException if any change is not valid */ Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyMap.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyMap.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,15 +22,14 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; -import org.jboss.portal.common.value.Value; - import java.util.Map; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6643 $ */ -public interface PropertyMap extends Map<String, Value> +public interface PropertyMap extends Map<String, List<String>> { /** * Return the value for the given key or null if it does not exist. @@ -39,7 +38,7 @@ * @return the requested value or null if it does not exist * @throws IllegalArgumentException if the key is null */ - Value getProperty(String key) throws IllegalArgumentException; + List<String> getProperty(String key) throws IllegalArgumentException; /** * Update the value of the given key. If the value object is null it means that the entry must be removed. @@ -50,5 +49,5 @@ * @throws UnsupportedOperationException if the operation is not supported * @throws IllegalArgumentException if the key is null */ - void setProperty(String key, Value value) throws IllegalArgumentException, UnsupportedOperationException; + void setProperty(String key, List<String> value) throws IllegalArgumentException, UnsupportedOperationException; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,16 +22,15 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; -import org.jboss.portal.common.value.Value; - import java.util.HashMap; import java.util.Map; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 6643 $ */ -public class SimplePropertyMap extends AbstractPropertyMap<String, Value> +public class SimplePropertyMap extends AbstractPropertyMap<String, List<String>> { private static final Converter<String, String> KEY_CONVERTER = new Converter<String, String>() @@ -50,17 +49,17 @@ } }; - private static Converter<Value, Value> VALUE_CONVERTER = new Converter<Value, Value>() + private static Converter<List<String>, List<String>> VALUE_CONVERTER = new Converter<List<String>, List<String>>() { - protected Value getInternal(Value value) throws IllegalArgumentException, ClassCastException + protected List<String> getInternal(List<String> value) throws IllegalArgumentException, ClassCastException { return value; } - protected Value getExternal(Value value) + protected List<String> getExternal(List<String> value) { return value; } - protected boolean equals(Value value, Value value1) + protected boolean equals(List<String> value, List<String> value1) { return value.equals(value1); } @@ -68,17 +67,17 @@ public SimplePropertyMap() { - this(new HashMap<String, Value>()); + this(new HashMap<String, List<String>>()); } public SimplePropertyMap(int size) { - this(new HashMap<String, Value>(size)); + this(new HashMap<String, List<String>>(size)); } public SimplePropertyMap(PropertyMap that) { - this(new HashMap<String, Value>()); + this(new HashMap<String, List<String>>()); // if (that == null) @@ -90,7 +89,7 @@ putAll(that); } - public SimplePropertyMap(Map<String, Value> map) + public SimplePropertyMap(Map<String, List<String>> map) { super(map, KEY_CONVERTER, VALUE_CONVERTER); } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -23,7 +23,6 @@ package org.jboss.portal.portlet.state.producer; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.InvalidPortletIdException; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; @@ -659,11 +658,11 @@ // Get the missing or read only properties from the referenced portlet properties // and add them to the actual state PropertyMap refPreferencesInfo = portletInvoker.getProperties(portletContext, keys); - for (Map.Entry<String, Value> entry : refPreferencesInfo.entrySet()) + for (Map.Entry<String, List<String>> entry : refPreferencesInfo.entrySet()) { String key = entry.getKey(); - Value value = entry.getValue(); - props.setProperty(key, value.clone()); + List<String> value = entry.getValue(); + props.setProperty(key, new ArrayList<String>(value)); } } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -35,13 +35,13 @@ import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; import org.jboss.portal.portlet.state.DestroyCloneFailure; -import org.jboss.portal.common.value.Value; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.ArrayList; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -173,10 +173,10 @@ PropertyMap props = new SimplePropertyMap(); for (String key : keys) { - Value value = internalPortlet.state.get(key); + List<String> value = internalPortlet.state.get(key); if (value != null) { - props.put(key, value.clone()); + props.put(key, new ArrayList<String>(value)); } } return props; @@ -188,10 +188,10 @@ PropertyMap props = new SimplePropertyMap(); for (String key: internalPortlet.state.keySet()) { - Value value = internalPortlet.state.get(key); + List<String> value = internalPortlet.state.get(key); if (value != null) { - props.put(key, value.clone()); + props.put(key, new ArrayList<String>(value)); } } return props; Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -32,12 +32,12 @@ import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.common.value.Value; import static org.jboss.unit.api.Assert.*; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -53,7 +53,7 @@ boolean valid; /** . */ - final Map<String, Value> state; + final Map<String, List<String>> state; /** . */ private int invocationCount; @@ -78,17 +78,17 @@ // this.portletContext = PortletContext.createPortletContext(portletId); this.valid = true; - this.state = new HashMap<String, Value>(); + this.state = new HashMap<String, List<String>>(); this.info = info; } - public void addPreference(String key, Value value) + public void addPreference(String key, List<String> value) { info.getPreferences().addPreference(key); state.put(key, value); } - public void addPreference(String key, Value value, Boolean readOnly) + public void addPreference(String key, List<String> value, Boolean readOnly) { info.getPreferences().addPreference(key, readOnly); state.put(key, value); Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.info; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.info.PreferenceInfo; import org.jboss.portal.portlet.info.PreferencesInfo; Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -31,6 +31,8 @@ import java.util.Locale; import java.util.Set; +import java.util.List; +import java.util.Arrays; /** * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> @@ -71,29 +73,29 @@ // prefInfo = prefsInfo.getContainerPreference("single_pref"); assertEquals("single_pref", prefInfo.getKey()); - String[] values = prefInfo.getDefaultValue().asStringArray(); - assertEquals(new String[]{"single_pref_value"}, values); + List<String> values = prefInfo.getDefaultValue(); + assertEquals(Arrays.asList("single_pref_value"), values); assertTrue(!prefInfo.isReadOnly().booleanValue()); // prefInfo = prefsInfo.getContainerPreference("multi_pref"); assertEquals("multi_pref", prefInfo.getKey()); - values = prefInfo.getDefaultValue().asStringArray(); - assertEquals(new String[]{"multi_pref_value_1", "multi_pref_value_2"}, values); + values = prefInfo.getDefaultValue(); + assertEquals(Arrays.asList("multi_pref_value_1", "multi_pref_value_2"), values); assertTrue(!prefInfo.isReadOnly().booleanValue()); // prefInfo = prefsInfo.getContainerPreference("single_pref_bis"); assertEquals("single_pref_bis", prefInfo.getKey()); - values = prefInfo.getDefaultValue().asStringArray(); - assertEquals(new String[]{"single_pref_value"}, values); + values = prefInfo.getDefaultValue(); + assertEquals(Arrays.asList("single_pref_value"), values); assertTrue(prefInfo.isReadOnly().booleanValue()); // prefInfo = prefsInfo.getContainerPreference("multi_pref_bis"); assertEquals("multi_pref_bis", prefInfo.getKey()); - values = prefInfo.getDefaultValue().asStringArray(); - assertEquals(new String[]{"multi_pref_value_1", "multi_pref_value_2"}, values); + values = prefInfo.getDefaultValue(); + assertEquals(Arrays.asList("multi_pref_value_1", "multi_pref_value_2"), values); assertTrue(prefInfo.isReadOnly().booleanValue()); } } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -24,8 +24,6 @@ import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.common.value.StringValue; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.InvalidPortletIdException; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; @@ -163,12 +161,12 @@ /** * */ - protected abstract void addPreference(PortletContext popRef, String key, Value defaultValue); + protected abstract void addPreference(PortletContext popRef, String key, List<String> defaultValue); /** * */ - protected abstract void addPreference(PortletContext popRef, String key, Value defaultValue, Boolean readOnly); + protected abstract void addPreference(PortletContext popRef, String key, List<String> defaultValue, Boolean readOnly); /** * @@ -314,7 +312,7 @@ PortletInfoSupport info = new PortletInfoSupport(); info.getMeta().setDisplayName("MyPortlet"); PortletContext popCtx = createPOPRef(info); - addPreference(popCtx, "abc", new StringValue("def")); + addPreference(popCtx, "abc", Arrays.asList("def")); // PortletContext ccp1Ctx = createClone(popCtx); @@ -322,7 +320,7 @@ // Check state PropertyMap expected = new SimplePropertyMap(); - expected.setProperty("abc", new StringValue("def")); + expected.setProperty("abc", Arrays.asList("def")); PropertyMap ccp1Props = getProperties(ccp1Ctx); ValueMapAssert.assertEquals(expected, ccp1Props); @@ -333,7 +331,7 @@ _assertEquals(ccp1Ctx, ccp1.getContext()); // Update state - PropertyChange[] changes = new PropertyChange[]{PropertyChange.newUpdate("ghi", new StringValue("jkl"))}; + PropertyChange[] changes = new PropertyChange[]{PropertyChange.newUpdate("ghi", Arrays.asList("jkl"))}; ccp1Ctx = setProperties(ccp1Ctx, changes); // Clone a CCP @@ -341,8 +339,8 @@ // Check state expected = new SimplePropertyMap(); - expected.setProperty("abc", new StringValue("def")); - expected.setProperty("ghi", new StringValue("jkl")); + expected.setProperty("abc", Arrays.asList("def")); + expected.setProperty("ghi", Arrays.asList("jkl")); PropertyMap ccp2Props = getProperties(ccp2Ctx); ValueMapAssert.assertEquals(expected, ccp2Props); @@ -616,20 +614,20 @@ { PortletInfoSupport info = new PortletInfoSupport(); PortletContext popCtx = createPOPRef(info); - addPreference(popCtx, "abc", new StringValue("def")); - addPreference(popCtx, "ghi", new StringValue("jkl"), Boolean.TRUE); + addPreference(popCtx, "abc", Arrays.asList("def")); + addPreference(popCtx, "ghi", Arrays.asList("jkl"), Boolean.TRUE); // PropertyMap props = getProperties(popCtx); PropertyMap expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("abc", new StringValue("def")); - expectedProps.setProperty("ghi", new StringValue("jkl")); + expectedProps.setProperty("abc", Arrays.asList("def")); + expectedProps.setProperty("ghi", Arrays.asList("jkl")); ValueMapAssert.assertEquals(expectedProps, props); // props = getProperties(popCtx, Tools.toSet("abc", "mno")); expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("abc", new StringValue("def")); + expectedProps.setProperty("abc", Arrays.asList("def")); ValueMapAssert.assertEquals(expectedProps, props); } @@ -638,33 +636,33 @@ { PortletInfoSupport info = new PortletInfoSupport(); PortletContext popCtx = createPOPRef(info); - addPreference(popCtx, "abc", new StringValue("def")); - addPreference(popCtx, "ghi", new StringValue("jkl")); - addPreference(popCtx, "mno", new StringValue("pqr"), Boolean.TRUE); - addPreference(popCtx, "stu", new StringValue("vwx"), Boolean.TRUE); + addPreference(popCtx, "abc", Arrays.asList("def")); + addPreference(popCtx, "ghi", Arrays.asList("jkl")); + addPreference(popCtx, "mno", Arrays.asList("pqr"), Boolean.TRUE); + addPreference(popCtx, "stu", Arrays.asList("vwx"), Boolean.TRUE); // PortletContext ccpCtx = createClone(popCtx); ccpCtx = setProperties(ccpCtx, new PropertyChange[]{ - PropertyChange.newUpdate("abc", new StringValue("_def")), + PropertyChange.newUpdate("abc", Arrays.asList("_def")), PropertyChange.newReset("gho"), - PropertyChange.newUpdate("mno", new StringValue("_pqr")), + PropertyChange.newUpdate("mno", Arrays.asList("_pqr")), PropertyChange.newReset("stu")}); // PropertyMap props = getProperties(ccpCtx); PropertyMap expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("abc", new StringValue("_def")); - expectedProps.setProperty("ghi", new StringValue("jkl")); - expectedProps.setProperty("mno", new StringValue("pqr")); - expectedProps.setProperty("stu", new StringValue("vwx")); + expectedProps.setProperty("abc", Arrays.asList("_def")); + expectedProps.setProperty("ghi", Arrays.asList("jkl")); + expectedProps.setProperty("mno", Arrays.asList("pqr")); + expectedProps.setProperty("stu", Arrays.asList("vwx")); ValueMapAssert.assertEquals(expectedProps, props); // props = getProperties(ccpCtx, Tools.toSet("abc", "mno", "yz")); expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("abc", new StringValue("_def")); - expectedProps.setProperty("mno", new StringValue("pqr")); + expectedProps.setProperty("abc", Arrays.asList("_def")); + expectedProps.setProperty("mno", Arrays.asList("pqr")); ValueMapAssert.assertEquals(expectedProps, props); } @@ -728,52 +726,52 @@ { PortletInfoSupport info = new PortletInfoSupport(); PortletContext popCtx = createPOPRef(info); - addPreference(popCtx, "override_update", new StringValue("override_update_portlet_value")); - addPreference(popCtx, "override_reset", new StringValue("override_reset_portlet_value")); - addPreference(popCtx, "override_create", new StringValue("override_create_portlet_value")); - addPreference(popCtx, "readonly_create", new StringValue("readonly_create_portlet_value"), Boolean.TRUE); + addPreference(popCtx, "override_update", Arrays.asList("override_update_portlet_value")); + addPreference(popCtx, "override_reset", Arrays.asList("override_reset_portlet_value")); + addPreference(popCtx, "override_create", Arrays.asList("override_create_portlet_value")); + addPreference(popCtx, "readonly_create", Arrays.asList("readonly_create_portlet_value"), Boolean.TRUE); // PortletContext ccpCtx = createClone(popCtx); ccpCtx = setProperties(ccpCtx, new PropertyChange[]{ - PropertyChange.newUpdate("override_update", new StringValue("override_update_clone_value")), - PropertyChange.newUpdate("override_reset", new StringValue("override_reset_clone_value")), - PropertyChange.newUpdate("dynamic_update", new StringValue("dynamic_update_clone_value")), - PropertyChange.newUpdate("dynamic_reset", new StringValue("dynamic_reset_clone_value")), + PropertyChange.newUpdate("override_update", Arrays.asList("override_update_clone_value")), + PropertyChange.newUpdate("override_reset", Arrays.asList("override_reset_clone_value")), + PropertyChange.newUpdate("dynamic_update", Arrays.asList("dynamic_update_clone_value")), + PropertyChange.newUpdate("dynamic_reset", Arrays.asList("dynamic_reset_clone_value")), }); // PropertyMap expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("override_update", new StringValue("override_update_clone_value")); - expectedProps.setProperty("override_reset", new StringValue("override_reset_clone_value")); - expectedProps.setProperty("override_create", new StringValue("override_create_portlet_value")); - expectedProps.setProperty("readonly_create", new StringValue("readonly_create_portlet_value")); - expectedProps.setProperty("dynamic_update", new StringValue("dynamic_update_clone_value")); - expectedProps.setProperty("dynamic_reset", new StringValue("dynamic_reset_clone_value")); + expectedProps.setProperty("override_update", Arrays.asList("override_update_clone_value")); + expectedProps.setProperty("override_reset", Arrays.asList("override_reset_clone_value")); + expectedProps.setProperty("override_create", Arrays.asList("override_create_portlet_value")); + expectedProps.setProperty("readonly_create", Arrays.asList("readonly_create_portlet_value")); + expectedProps.setProperty("dynamic_update", Arrays.asList("dynamic_update_clone_value")); + expectedProps.setProperty("dynamic_reset", Arrays.asList("dynamic_reset_clone_value")); PropertyMap ccpProps = getProperties(ccpCtx); ValueMapAssert.assertEquals(expectedProps, ccpProps); // PropertyChange[] changes = new PropertyChange[] { - PropertyChange.newUpdate("override_update", new StringValue("override_update_clone_value_2")), + PropertyChange.newUpdate("override_update", Arrays.asList("override_update_clone_value_2")), PropertyChange.newReset("override_reset"), - PropertyChange.newUpdate("override_create", new StringValue("override_create_clone_value_2")), - PropertyChange.newUpdate("dynamic_update", new StringValue("dynamic_update_clone_value_2")), + PropertyChange.newUpdate("override_create", Arrays.asList("override_create_clone_value_2")), + PropertyChange.newUpdate("dynamic_update", Arrays.asList("dynamic_update_clone_value_2")), PropertyChange.newReset("dynamic_reset"), - PropertyChange.newUpdate("dynamic_create", new StringValue("dynamic_create_clone_value_2")), - PropertyChange.newUpdate("readonly_create", new StringValue("readonly_create_clone_value_2")), + PropertyChange.newUpdate("dynamic_create", Arrays.asList("dynamic_create_clone_value_2")), + PropertyChange.newUpdate("readonly_create", Arrays.asList("readonly_create_clone_value_2")), }; ccpCtx = setProperties(ccpCtx, changes); // expectedProps.clear(); - expectedProps.setProperty("override_update", new StringValue("override_update_clone_value_2")); - expectedProps.setProperty("override_create", new StringValue("override_create_clone_value_2")); - expectedProps.setProperty("override_reset", new StringValue("override_reset_portlet_value")); - expectedProps.setProperty("dynamic_update", new StringValue("dynamic_update_clone_value_2")); - expectedProps.setProperty("dynamic_create", new StringValue("dynamic_create_clone_value_2")); - expectedProps.setProperty("readonly_create", new StringValue("readonly_create_portlet_value")); + expectedProps.setProperty("override_update", Arrays.asList("override_update_clone_value_2")); + expectedProps.setProperty("override_create", Arrays.asList("override_create_clone_value_2")); + expectedProps.setProperty("override_reset", Arrays.asList("override_reset_portlet_value")); + expectedProps.setProperty("dynamic_update", Arrays.asList("dynamic_update_clone_value_2")); + expectedProps.setProperty("dynamic_create", Arrays.asList("dynamic_create_clone_value_2")); + expectedProps.setProperty("readonly_create", Arrays.asList("readonly_create_portlet_value")); ccpProps = getProperties(ccpCtx); ValueMapAssert.assertEquals(expectedProps, ccpProps); } @@ -799,7 +797,7 @@ public PortletInvocationResponse invoke(PortletInvocation invocation) { AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); - props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", new StringValue("_def"))}); + props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", Arrays.asList("_def"))}); return null; } }; @@ -810,7 +808,7 @@ PortletContext popCtx = createPOPRef(info); PortletSupport portletSupport = getPortletSupport(popCtx); portletSupport.addHandler(handler); - addPreference(popCtx, "abc", new StringValue("def")); + addPreference(popCtx, "abc", Arrays.asList("def")); ctx = popCtx; } else @@ -818,7 +816,7 @@ PortletContext popCtx = createPOPRef(info); PortletSupport portletSupport = getPortletSupport(popCtx); portletSupport.addHandler(handler); - addPreference(popCtx, "abc", new StringValue("def")); + addPreference(popCtx, "abc", Arrays.asList("def")); PortletContext ccpCtx = createClone(popCtx); ctx = ccpCtx; } @@ -834,7 +832,7 @@ // PropertyMap blah = getProperties(cloneRef); PropertyMap expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("abc", new StringValue("_def")); + expectedProps.setProperty("abc", Arrays.asList("_def")); ValueMapAssert.assertEquals(expectedProps, blah); // Now we test the clone destruction @@ -858,7 +856,7 @@ try { AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); - props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", new StringValue("_def"))}); + props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", Arrays.asList("_def"))}); return null; } catch (IllegalStateException e) @@ -873,7 +871,7 @@ PortletContext popCtx = createPOPRef(info); PortletSupport portletSupport = getPortletSupport(popCtx); portletSupport.addHandler(handler); - addPreference(popCtx, "abc", new StringValue("def")); + addPreference(popCtx, "abc", Arrays.asList("def")); // ActionInvocation invocation = createAction(popCtx, AccessMode.READ_ONLY); @@ -894,14 +892,14 @@ public PortletInvocationResponse invoke(PortletInvocation invocation) { AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE); - props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", new StringValue("_def"))}); + props.update(new PropertyChange[]{PropertyChange.newUpdate("abc", Arrays.asList("_def"))}); return null; } }; PortletContext popCtx = createPOPRef(info); PortletSupport portletSupport = getPortletSupport(popCtx); portletSupport.addHandler(handler); - addPreference(popCtx, "abc", new StringValue("def")); + addPreference(popCtx, "abc", Arrays.asList("def")); // PortletContext ccpCtx = createClone(popCtx); @@ -917,7 +915,7 @@ // PropertyMap blah = getProperties(ccpCtx); PropertyMap expectedProps = new SimplePropertyMap(); - expectedProps.setProperty("abc", new StringValue("_def")); + expectedProps.setProperty("abc", Arrays.asList("_def")); ValueMapAssert.assertEquals(expectedProps, blah); } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -43,7 +43,6 @@ import org.jboss.portal.portlet.state.consumer.ConsumerPortlet; import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker; import org.jboss.portal.portlet.state.producer.ProducerPortlet; -import org.jboss.portal.common.value.Value; import static org.jboss.unit.api.Assert.*; import org.jboss.unit.api.pojo.annotations.Create; @@ -166,12 +165,12 @@ return cloneRef; } - protected void addPreference(PortletContext popRef, String key, Value defaultValue) + protected void addPreference(PortletContext popRef, String key, List<String> defaultValue) { container.getPortlet(popRef.getId()).addPreference(key, defaultValue); } - protected void addPreference(PortletContext popRef, String key, Value defaultValue, Boolean readOnly) + protected void addPreference(PortletContext popRef, String key, List<String> defaultValue, Boolean readOnly) { container.getPortlet(popRef.getId()).addPreference(key, defaultValue, readOnly); } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -40,7 +40,6 @@ import org.jboss.portal.portlet.support.info.PortletInfoSupport; import org.jboss.portal.portlet.support.PortletInvokerSupport; import org.jboss.portal.portlet.support.PortletSupport; -import org.jboss.portal.common.value.Value; import static org.jboss.unit.api.Assert.*; import org.jboss.unit.api.pojo.annotations.Create; @@ -131,12 +130,12 @@ return cloneContext; } - protected void addPreference(PortletContext popRef, String key, Value defaultValue) + protected void addPreference(PortletContext popRef, String key, List<String> defaultValue) { container.getPortlet(popRef.getId()).addPreference(key, defaultValue); } - protected void addPreference(PortletContext popRef, String key, Value defaultValue, Boolean readOnly) + protected void addPreference(PortletContext popRef, String key, List<String> defaultValue, Boolean readOnly) { container.getPortlet(popRef.getId()).addPreference(key, defaultValue, readOnly); } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import org.jboss.portal.common.value.StringValue; import org.jboss.portal.portlet.impl.state.StateConverterV0; import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; @@ -33,6 +32,9 @@ import static org.jboss.unit.api.Assert.*; import org.jboss.unit.api.pojo.annotations.Test; +import java.util.Arrays; +import java.util.ArrayList; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ @@ -104,13 +106,13 @@ // PropertyMap props = new SimplePropertyMap(); - props.setProperty("ab", new StringValue("cd")); - props.setProperty("ef", new StringValue(new String[0])); - props.setProperty("gh", new StringValue(new String[]{""})); - props.setProperty("ij", new StringValue(new String[]{"kl"})); - props.setProperty("mn", new StringValue(new String[]{"op", null})); - props.setProperty("qr", new StringValue(new String[]{null, "st"})); - props.setProperty("uv", new StringValue(new String[]{"wx", null, "yz"})); + props.setProperty("ab", Arrays.asList("cd")); + props.setProperty("ef", new ArrayList<String>()); + props.setProperty("gh", Arrays.asList("")); + props.setProperty("ij", Arrays.asList("kl")); + props.setProperty("mn", Arrays.asList("op", null)); + props.setProperty("qr", Arrays.asList(null, "st")); + props.setProperty("uv", Arrays.asList("wx", null, "yz")); assertWorks(new PortletState("bar", props)); } Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ValueMapAssert.java =================================================================== --- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ValueMapAssert.java 2008-04-14 17:51:29 UTC (rev 10583) +++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ValueMapAssert.java 2008-04-15 00:21:17 UTC (rev 10584) @@ -22,11 +22,10 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.state.PropertyMap; import java.util.HashSet; -import java.util.Iterator; +import java.util.List; import org.jboss.unit.api.Assert; @@ -51,12 +50,11 @@ { Assert.fail("Value map should not be null"); } - Assert.assertEquals("Value maps don't have the same keys", new HashSet(vm1.keySet()), new HashSet(vm2.keySet())); - for (Iterator i = vm1.keySet().iterator(); i.hasNext();) + Assert.assertEquals("Value maps don't have the same keys", new HashSet<String>(vm1.keySet()), new HashSet<String>(vm2.keySet())); + for (String key : vm1.keySet()) { - String key = (String)i.next(); - Value v1 = vm1.getProperty(key); - Value v2 = vm2.getProperty(key); + List<String> v1 = vm1.getProperty(key); + List<String> v2 = vm2.getProperty(key); Assert.assertEquals("Values for key " + key + " are not equals", v1, v2); } }