Merge pull request #202 from lukaszlenart/limitable-extendable

WW-4909: Renames a constant and adds a test

Author: yasserzamani

core/src/main/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessor.java

@@ -28,6 +28,7 @@
 import ognl.ListPropertyAccessor;
 import ognl.OgnlException;
 import ognl.PropertyAccessor;
+import org.apache.struts2.StrutsConstants;
 
 import java.util.Collection;
 import java.util.List;
@@ -49,12 +50,18 @@ public class XWorkListPropertyAccessor extends ListPropertyAccessor {
     private ObjectTypeDeterminer objectTypeDeterminer;
     private OgnlUtil ognlUtil;
     private int autoGrowCollectionLimit = 255;
-    
+
+    @Deprecated()
     @Inject(value = "xwork.autoGrowCollectionLimit", required = false)
-	public void setAutoGrowCollectionLimit(String value) {
-		this.autoGrowCollectionLimit = Integer.valueOf(value);
-	}
+    public void setDeprecatedAutoGrowCollectionLimit(String value) {
+        this.autoGrowCollectionLimit = Integer.valueOf(value);
+    }
 
+    @Inject(value = StrutsConstants.STRUTS_OGNL_AUTO_GROWTH_COLLECTION_LIMIT, required = false)
+    public void setAutoGrowCollectionLimit(String value) {
+        this.autoGrowCollectionLimit = Integer.parseInt(value);
+    }
+
     @Inject("java.util.Collection")
     public void setXWorkCollectionPropertyAccessor(PropertyAccessor acc) {
         this._sAcc = (XWorkCollectionPropertyAccessor) acc;

core/src/main/java/org/apache/struts2/StrutsConstants.java

@@ -328,4 +328,6 @@ public final class StrutsConstants {
     public static final String STRUTS_LOCALIZED_TEXT_PROVIDER = "struts.localizedTextProvider";
 
     public static final String STRUTS_DISALLOW_PROXY_MEMBER_ACCESS = "struts.disallowProxyMemberAccess";
+
+    public static final String STRUTS_OGNL_AUTO_GROWTH_COLLECTION_LIMIT = "struts.ognl.autoGrowthCollectionLimit";
 }

core/src/test/java/com/opensymphony/xwork2/ognl/accessor/XWorkListPropertyAccessorTest.java

@@ -22,6 +22,8 @@
 import com.opensymphony.xwork2.XWorkTestCase;
 import com.opensymphony.xwork2.util.ListHolder;
 import com.opensymphony.xwork2.util.ValueStack;
+import ognl.ListPropertyAccessor;
+import ognl.PropertyAccessor;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -61,4 +63,43 @@ public void testCanAccessListSizeProperty() {
         assertEquals(new Integer(myList.size()), vs.findValue("strings.size()"));
         assertEquals(new Integer(myList.size()), vs.findValue("strings.size"));
     }
+
+    public void testAutoGrowthCollectionLimit() {
+        PropertyAccessor accessor = container.getInstance(PropertyAccessor.class, ArrayList.class.getName());
+        ((XWorkListPropertyAccessor) accessor).setAutoGrowCollectionLimit("2");
+
+        List<String> myList = new ArrayList<>();
+        ListHolder listHolder = new ListHolder();
+        listHolder.setStrings(myList);
+
+        ValueStack vs = ActionContext.getContext().getValueStack();
+        vs.push(listHolder);
+
+        vs.setValue("strings[0]", "a");
+        vs.setValue("strings[1]", "b");
+        vs.setValue("strings[2]", "c");
+        vs.setValue("strings[3]", "d");
+
+        assertEquals(3, vs.findValue("strings.size()"));
+    }
+
+    public void testDeprecatedAutoGrowCollectionLimit() {
+        PropertyAccessor accessor = container.getInstance(PropertyAccessor.class, ArrayList.class.getName());
+        ((XWorkListPropertyAccessor) accessor).setDeprecatedAutoGrowCollectionLimit("2");
+
+        List<String> myList = new ArrayList<>();
+        ListHolder listHolder = new ListHolder();
+        listHolder.setStrings(myList);
+
+        ValueStack vs = ActionContext.getContext().getValueStack();
+        vs.push(listHolder);
+
+        vs.setValue("strings[0]", "a");
+        vs.setValue("strings[1]", "b");
+        vs.setValue("strings[2]", "c");
+        vs.setValue("strings[3]", "d");
+
+        assertEquals(3, vs.findValue("strings.size()"));
+    }
+
 }