WW-5352 Enable annotations for showcase

kusalk · kusalk · commit 4c60f39c7acb · 2024-01-09T17:21:21.000+11:00
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
@@ -24,9 +24,15 @@
 import com.opensymphony.xwork2.Validateable;
 import com.opensymphony.xwork2.util.ValueStack;
 import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  */
@@ -89,6 +95,7 @@ public List getLeftSideCartoonCharacters() {
 		return leftSideCartoonCharacters;
 	}
 
+	@StrutsParameter
 	public void setLeftSideCartoonCharacters(List leftSideCartoonCharacters) {
 		this.leftSideCartoonCharacters = leftSideCartoonCharacters;
 	}
@@ -98,6 +105,7 @@ public List getRightSideCartoonCharacters() {
 		return rightSideCartoonCharacters;
 	}
 
+	@StrutsParameter
 	public void setRightSideCartoonCharacters(List rightSideCartoonCharacters) {
 		this.rightSideCartoonCharacters = rightSideCartoonCharacters;
 	}
@@ -107,6 +115,7 @@ public String getFavouriteVehicalType() {
 		return favouriteVehicalType;
 	}
 
+	@StrutsParameter
 	public void setFavouriteVehicalType(String favouriteVehicalType) {
 		this.favouriteVehicalType = favouriteVehicalType;
 	}
@@ -115,6 +124,7 @@ public String getFavouriteVehicalSpecific() {
 		return favouriteVehicalSpecific;
 	}
 
+	@StrutsParameter
 	public void setFavouriteVehicalSpecific(String favouriteVehicalSpecific) {
 		this.favouriteVehicalSpecific = favouriteVehicalSpecific;
 	}
@@ -145,6 +155,7 @@ public String getName() {
 		return name;
 	}
 
+	@StrutsParameter
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -153,6 +164,7 @@ public Date getBirthday() {
 		return birthday;
 	}
 
+	@StrutsParameter
 	public void setBirthday(Date birthday) {
 		this.birthday = birthday;
 	}
@@ -161,6 +173,7 @@ public String getBio() {
 		return bio;
 	}
 
+	@StrutsParameter
 	public void setBio(String bio) {
 		this.bio = bio;
 	}
@@ -169,6 +182,7 @@ public String getFavouriteColor() {
 		return favouriteColor;
 	}
 
+	@StrutsParameter
 	public void setFavouriteColor(String favoriteColor) {
 		this.favouriteColor = favoriteColor;
 	}
@@ -177,6 +191,7 @@ public List getFriends() {
 		return friends;
 	}
 
+	@StrutsParameter
 	public void setFriends(List friends) {
 		this.friends = friends;
 	}
@@ -193,6 +208,7 @@ public boolean isLegalAge() {
 		return legalAge;
 	}
 
+	@StrutsParameter
 	public void setLegalAge(boolean legalAge) {
 		this.legalAge = legalAge;
 	}
@@ -201,6 +217,7 @@ public String getState() {
 		return state;
 	}
 
+	@StrutsParameter
 	public void setState(String state) {
 		this.state = state;
 	}
@@ -209,6 +226,7 @@ public String getRegion() {
 		return region;
 	}
 
+	@StrutsParameter
 	public void setRegion(String region) {
 		this.region = region;
 	}
@@ -229,6 +247,7 @@ public void setPictureFileName(String pictureFileName) {
 		this.pictureFileName = pictureFileName;
 	}
 
+	@StrutsParameter
 	public void setFavouriteLanguage(String favouriteLanguage) {
 		this.favouriteLanguage = favouriteLanguage;
 	}
@@ -237,7 +256,7 @@ public String getFavouriteLanguage() {
 		return favouriteLanguage;
 	}
 
-
+	@StrutsParameter
 	public void setThoughts(String thoughts) {
 		this.thoughts = thoughts;
 	}
@@ -250,6 +269,7 @@ public Date getWakeup() {
 		return wakeup;
 	}
 
+	@StrutsParameter
 	public void setWakeup(Date wakeup) {
 		this.wakeup = wakeup;
 	}
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.java
@@ -21,6 +21,7 @@
 import com.opensymphony.xwork2.Preparable;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 import org.apache.struts2.showcase.dao.Dao;
 import org.apache.struts2.showcase.dao.SkillDao;
 import org.apache.struts2.showcase.model.Skill;
@@ -71,6 +72,7 @@ protected Dao getDao() {
 		return skillDao;
 	}
 
+	@StrutsParameter(depth = 1)
 	public Skill getCurrentSkill() {
 		return currentSkill;
 	}
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/async/ChatRoomAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/async/ChatRoomAction.java
@@ -19,6 +19,7 @@
 package org.apache.struts2.showcase.async;
 
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,10 +35,12 @@ public class ChatRoomAction extends ActionSupport {
 
     private static final List<String> messages = new ArrayList<>();
 
+    @StrutsParameter
     public void setMessage(String message) {
         this.message = message;
     }
 
+    @StrutsParameter
     public void setLastIndex(Integer lastIndex) {
         this.lastIndex = lastIndex;
     }
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java
@@ -21,6 +21,7 @@
 package org.apache.struts2.showcase.conversion;
 
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -30,7 +31,7 @@
  */
 public class AddressAction extends ActionSupport {
 
-	private Set<Address> addresses = new LinkedHashSet<Address>();
+	private Set<Address> addresses = new LinkedHashSet<>();
 
 	public String input() throws Exception {
 		return SUCCESS;
@@ -41,6 +42,7 @@ public String submit() throws Exception {
 		return SUCCESS;
 	}
 
+	@StrutsParameter(depth = 2)
 	public Set<Address> getAddresses() {
 		return addresses;
 	}
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java
@@ -21,6 +21,7 @@
 package org.apache.struts2.showcase.conversion;
 
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -47,6 +48,7 @@ public List<OperationsEnum> getSelectedOperations() {
 		return this.selectedOperations;
 	}
 
+	@StrutsParameter
 	public void setSelectedOperations(List<OperationsEnum> selectedOperations) {
 		this.selectedOperations = selectedOperations;
 	}
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction.java
@@ -21,6 +21,7 @@
 package org.apache.struts2.showcase.conversion;
 
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.List;
 
@@ -36,6 +37,7 @@ public String submit() throws Exception {
 		return SUCCESS;
 	}
 
+	@StrutsParameter(depth = 2)
 	public List<Person> getPersons() {
 		return persons;
 	}
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
@@ -22,6 +22,7 @@
 
 import com.opensymphony.xwork2.Action;
 import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.io.InputStream;
 
@@ -38,6 +39,7 @@ public String execute() throws Exception {
 		return SUCCESS;
 	}
 
+	@StrutsParameter
 	public void setInputPath(String value) {
 		inputPath = sanitizeInputPath(value);
 	}
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/FileUploadAction.java
@@ -23,6 +23,7 @@
 import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.action.UploadedFilesAware;
 import org.apache.struts2.dispatcher.multipart.UploadedFile;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 import java.util.List;
 
@@ -65,6 +66,7 @@ public String getCaption() {
         return caption;
     }
 
+    @StrutsParameter
     public void setCaption(String caption) {
         this.caption = caption;
     }
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.java
@@ -20,6 +20,8 @@
  */
 package org.apache.struts2.showcase.validation;
 
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
+
 import java.sql.Date;
 
 /**
@@ -44,6 +46,7 @@ public Date getDateValidatorField() {
         return dateValidatorField;
     }
 
+    @StrutsParameter
     public void setDateValidatorField(Date dateValidatorField) {
         this.dateValidatorField = dateValidatorField;
     }
@@ -52,6 +55,7 @@ public String getEmailValidatorField() {
         return emailValidatorField;
     }
 
+    @StrutsParameter
     public void setEmailValidatorField(String emailValidatorField) {
         this.emailValidatorField = emailValidatorField;
     }
@@ -60,6 +64,7 @@ public Integer getIntegerValidatorField() {
         return integerValidatorField;
     }
 
+    @StrutsParameter
     public void setIntegerValidatorField(Integer integerValidatorField) {
         this.integerValidatorField = integerValidatorField;
     }
@@ -68,6 +73,7 @@ public String getRegexValidatorField() {
         return regexValidatorField;
     }
 
+    @StrutsParameter
     public void setRegexValidatorField(String regexValidatorField) {
         this.regexValidatorField = regexValidatorField;
     }
@@ -76,6 +82,7 @@ public String getRequiredStringValidatorField() {
         return requiredStringValidatorField;
     }
 
+    @StrutsParameter
     public void setRequiredStringValidatorField(String requiredStringValidatorField) {
         this.requiredStringValidatorField = requiredStringValidatorField;
     }
@@ -84,6 +91,7 @@ public String getRequiredValidatorField() {
         return requiredValidatorField;
     }
 
+    @StrutsParameter
     public void setRequiredValidatorField(String requiredValidatorField) {
         this.requiredValidatorField = requiredValidatorField;
     }
@@ -92,6 +100,7 @@ public String getStringLengthValidatorField() {
         return stringLengthValidatorField;
     }
 
+    @StrutsParameter
     public void setStringLengthValidatorField(String stringLengthValidatorField) {
         this.stringLengthValidatorField = stringLengthValidatorField;
     }
@@ -100,6 +109,7 @@ public String getFieldExpressionValidatorField() {
         return fieldExpressionValidatorField;
     }
 
+    @StrutsParameter
     public void setFieldExpressionValidatorField(
             String fieldExpressionValidatorField) {
         this.fieldExpressionValidatorField = fieldExpressionValidatorField;
@@ -109,6 +119,7 @@ public String getUrlValidatorField() {
         return urlValidatorField;
     }
 
+    @StrutsParameter
     public void setUrlValidatorField(String urlValidatorField) {
         this.urlValidatorField = urlValidatorField;
     }
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/wait/LongProcessAction.java
@@ -21,6 +21,7 @@
 package org.apache.struts2.showcase.wait;
 
 import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.parameter.StrutsParameter;
 
 /**
  * Example to illustrate the <code>execAndWait</code> interceptor.
@@ -41,6 +42,7 @@ public int getTime() {
 		return time;
 	}
 
+	@StrutsParameter
 	public void setTime(int time) {
 		this.time = time;
 	}
diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml
@@ -35,17 +35,7 @@
     <constant name="struts.action.extension" value="action,," />
 
     <constant name="struts.allowlist.enable" value="true" />
-    <constant name="struts.allowlist.packageNames"
-              value="
-                org.apache.struts2.showcase.model,
-                org.apache.struts2.showcase.conversion
-    "/>
-    <constant name="struts.allowlist.classes"
-              value="
-                org.apache.struts2.showcase.UITagExample$Language,
-                org.apache.struts2.showcase.UITagExample$VehicalType,
-                org.apache.struts2.showcase.UITagExample$VehicalSpecific
-    "/>
+    <constant name="struts.parameters.requireAnnotations" value="true" />
 
     <constant name="struts.convention.package.locators.basePackage" value="org.apache.struts2.showcase" />
     <constant name="struts.convention.result.path" value="/WEB-INF" />

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,15 @@`
`24`	`24`	`import com.opensymphony.xwork2.Validateable;`
`25`	`25`	`import com.opensymphony.xwork2.util.ValueStack;`
`26`	`26`	`import org.apache.struts2.ServletActionContext;`
	`27`	`+import org.apache.struts2.interceptor.parameter.StrutsParameter;`
`27`	`28`
`28`	`29`	`import java.io.File;`
`29`		`-import java.util.*;`
	`30`	`+import java.util.ArrayList;`
	`31`	`+import java.util.Collections;`
	`32`	`+import java.util.Date;`
	`33`	`+import java.util.HashMap;`
	`34`	`+import java.util.List;`
	`35`	`+import java.util.Map;`
`30`	`36`
`31`	`37`	`/**`
`32`	`38`	`*/`
`@@ -89,6 +95,7 @@ public List getLeftSideCartoonCharacters() {`
`89`	`95`	`return leftSideCartoonCharacters;`
`90`	`96`	`}`
`91`	`97`
	`98`	`+ @StrutsParameter`
`92`	`99`	`public void setLeftSideCartoonCharacters(List leftSideCartoonCharacters) {`
`93`	`100`	`this.leftSideCartoonCharacters = leftSideCartoonCharacters;`
`94`	`101`	`}`
`@@ -98,6 +105,7 @@ public List getRightSideCartoonCharacters() {`
`98`	`105`	`return rightSideCartoonCharacters;`
`99`	`106`	`}`
`100`	`107`
	`108`	`+ @StrutsParameter`
`101`	`109`	`public void setRightSideCartoonCharacters(List rightSideCartoonCharacters) {`
`102`	`110`	`this.rightSideCartoonCharacters = rightSideCartoonCharacters;`
`103`	`111`	`}`
`@@ -107,6 +115,7 @@ public String getFavouriteVehicalType() {`
`107`	`115`	`return favouriteVehicalType;`
`108`	`116`	`}`
`109`	`117`
	`118`	`+ @StrutsParameter`
`110`	`119`	`public void setFavouriteVehicalType(String favouriteVehicalType) {`
`111`	`120`	`this.favouriteVehicalType = favouriteVehicalType;`
`112`	`121`	`}`
`@@ -115,6 +124,7 @@ public String getFavouriteVehicalSpecific() {`
`115`	`124`	`return favouriteVehicalSpecific;`
`116`	`125`	`}`
`117`	`126`
	`127`	`+ @StrutsParameter`
`118`	`128`	`public void setFavouriteVehicalSpecific(String favouriteVehicalSpecific) {`
`119`	`129`	`this.favouriteVehicalSpecific = favouriteVehicalSpecific;`
`120`	`130`	`}`
`@@ -145,6 +155,7 @@ public String getName() {`
`145`	`155`	`return name;`
`146`	`156`	`}`
`147`	`157`
	`158`	`+ @StrutsParameter`
`148`	`159`	`public void setName(String name) {`
`149`	`160`	`this.name = name;`
`150`	`161`	`}`
`@@ -153,6 +164,7 @@ public Date getBirthday() {`
`153`	`164`	`return birthday;`
`154`	`165`	`}`
`155`	`166`
	`167`	`+ @StrutsParameter`
`156`	`168`	`public void setBirthday(Date birthday) {`
`157`	`169`	`this.birthday = birthday;`
`158`	`170`	`}`
`@@ -161,6 +173,7 @@ public String getBio() {`
`161`	`173`	`return bio;`
`162`	`174`	`}`
`163`	`175`
	`176`	`+ @StrutsParameter`
`164`	`177`	`public void setBio(String bio) {`
`165`	`178`	`this.bio = bio;`
`166`	`179`	`}`
`@@ -169,6 +182,7 @@ public String getFavouriteColor() {`
`169`	`182`	`return favouriteColor;`
`170`	`183`	`}`
`171`	`184`
	`185`	`+ @StrutsParameter`
`172`	`186`	`public void setFavouriteColor(String favoriteColor) {`
`173`	`187`	`this.favouriteColor = favoriteColor;`
`174`	`188`	`}`
`@@ -177,6 +191,7 @@ public List getFriends() {`
`177`	`191`	`return friends;`
`178`	`192`	`}`
`179`	`193`
	`194`	`+ @StrutsParameter`
`180`	`195`	`public void setFriends(List friends) {`
`181`	`196`	`this.friends = friends;`
`182`	`197`	`}`
`@@ -193,6 +208,7 @@ public boolean isLegalAge() {`
`193`	`208`	`return legalAge;`
`194`	`209`	`}`
`195`	`210`
	`211`	`+ @StrutsParameter`
`196`	`212`	`public void setLegalAge(boolean legalAge) {`
`197`	`213`	`this.legalAge = legalAge;`
`198`	`214`	`}`
`@@ -201,6 +217,7 @@ public String getState() {`
`201`	`217`	`return state;`
`202`	`218`	`}`
`203`	`219`
	`220`	`+ @StrutsParameter`
`204`	`221`	`public void setState(String state) {`
`205`	`222`	`this.state = state;`
`206`	`223`	`}`
`@@ -209,6 +226,7 @@ public String getRegion() {`
`209`	`226`	`return region;`
`210`	`227`	`}`
`211`	`228`
	`229`	`+ @StrutsParameter`
`212`	`230`	`public void setRegion(String region) {`
`213`	`231`	`this.region = region;`
`214`	`232`	`}`
`@@ -229,6 +247,7 @@ public void setPictureFileName(String pictureFileName) {`
`229`	`247`	`this.pictureFileName = pictureFileName;`
`230`	`248`	`}`
`231`	`249`
	`250`	`+ @StrutsParameter`
`232`	`251`	`public void setFavouriteLanguage(String favouriteLanguage) {`
`233`	`252`	`this.favouriteLanguage = favouriteLanguage;`
`234`	`253`	`}`
`@@ -237,7 +256,7 @@ public String getFavouriteLanguage() {`
`237`	`256`	`return favouriteLanguage;`
`238`	`257`	`}`
`239`	`258`
`240`		`-`
	`259`	`+ @StrutsParameter`
`241`	`260`	`public void setThoughts(String thoughts) {`
`242`	`261`	`this.thoughts = thoughts;`
`243`	`262`	`}`
`@@ -250,6 +269,7 @@ public Date getWakeup() {`
`250`	`269`	`return wakeup;`
`251`	`270`	`}`
`252`	`271`
	`272`	`+ @StrutsParameter`
`253`	`273`	`public void setWakeup(Date wakeup) {`
`254`	`274`	`this.wakeup = wakeup;`
`255`	`275`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`import com.opensymphony.xwork2.Preparable;`
`22`	`22`	`import org.apache.logging.log4j.LogManager;`
`23`	`23`	`import org.apache.logging.log4j.Logger;`
	`24`	`+import org.apache.struts2.interceptor.parameter.StrutsParameter;`
`24`	`25`	`import org.apache.struts2.showcase.dao.Dao;`
`25`	`26`	`import org.apache.struts2.showcase.dao.SkillDao;`
`26`	`27`	`import org.apache.struts2.showcase.model.Skill;`
`@@ -71,6 +72,7 @@ protected Dao getDao() {`
`71`	`72`	`return skillDao;`
`72`	`73`	`}`
`73`	`74`
	`75`	`+ @StrutsParameter(depth = 1)`
`74`	`76`	`public Skill getCurrentSkill() {`
`75`	`77`	`return currentSkill;`
`76`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`
`23`	`23`	`import com.opensymphony.xwork2.Action;`
`24`	`24`	`import org.apache.struts2.ServletActionContext;`
	`25`	`+import org.apache.struts2.interceptor.parameter.StrutsParameter;`
`25`	`26`
`26`	`27`	`import java.io.InputStream;`
`27`	`28`
`@@ -38,6 +39,7 @@ public String execute() throws Exception {`
`38`	`39`	`return SUCCESS;`
`39`	`40`	`}`
`40`	`41`
	`42`	`+ @StrutsParameter`
`41`	`43`	`public void setInputPath(String value) {`
`42`	`44`	`inputPath = sanitizeInputPath(value);`
`43`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`import com.opensymphony.xwork2.ActionSupport;`
`24`	`24`	`import org.apache.struts2.action.UploadedFilesAware;`
`25`	`25`	`import org.apache.struts2.dispatcher.multipart.UploadedFile;`
	`26`	`+import org.apache.struts2.interceptor.parameter.StrutsParameter;`
`26`	`27`
`27`	`28`	`import java.util.List;`
`28`	`29`
`@@ -65,6 +66,7 @@ public String getCaption() {`
`65`	`66`	`return caption;`
`66`	`67`	`}`
`67`	`68`
	`69`	`+ @StrutsParameter`
`68`	`70`	`public void setCaption(String caption) {`
`69`	`71`	`this.caption = caption;`
`70`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`*/`
`21`	`21`	`package org.apache.struts2.showcase.validation;`
`22`	`22`
	`23`	`+import org.apache.struts2.interceptor.parameter.StrutsParameter;`
	`24`	`+`
`23`	`25`	`import java.sql.Date;`
`24`	`26`
`25`	`27`	`/**`
`@@ -44,6 +46,7 @@ public Date getDateValidatorField() {`
`44`	`46`	`return dateValidatorField;`
`45`	`47`	`}`
`46`	`48`
	`49`	`+ @StrutsParameter`
`47`	`50`	`public void setDateValidatorField(Date dateValidatorField) {`
`48`	`51`	`this.dateValidatorField = dateValidatorField;`
`49`	`52`	`}`
`@@ -52,6 +55,7 @@ public String getEmailValidatorField() {`
`52`	`55`	`return emailValidatorField;`
`53`	`56`	`}`
`54`	`57`
	`58`	`+ @StrutsParameter`
`55`	`59`	`public void setEmailValidatorField(String emailValidatorField) {`
`56`	`60`	`this.emailValidatorField = emailValidatorField;`
`57`	`61`	`}`
`@@ -60,6 +64,7 @@ public Integer getIntegerValidatorField() {`
`60`	`64`	`return integerValidatorField;`
`61`	`65`	`}`
`62`	`66`
	`67`	`+ @StrutsParameter`
`63`	`68`	`public void setIntegerValidatorField(Integer integerValidatorField) {`
`64`	`69`	`this.integerValidatorField = integerValidatorField;`
`65`	`70`	`}`
`@@ -68,6 +73,7 @@ public String getRegexValidatorField() {`
`68`	`73`	`return regexValidatorField;`
`69`	`74`	`}`
`70`	`75`
	`76`	`+ @StrutsParameter`
`71`	`77`	`public void setRegexValidatorField(String regexValidatorField) {`
`72`	`78`	`this.regexValidatorField = regexValidatorField;`
`73`	`79`	`}`
`@@ -76,6 +82,7 @@ public String getRequiredStringValidatorField() {`
`76`	`82`	`return requiredStringValidatorField;`
`77`	`83`	`}`
`78`	`84`
	`85`	`+ @StrutsParameter`
`79`	`86`	`public void setRequiredStringValidatorField(String requiredStringValidatorField) {`
`80`	`87`	`this.requiredStringValidatorField = requiredStringValidatorField;`
`81`	`88`	`}`
`@@ -84,6 +91,7 @@ public String getRequiredValidatorField() {`
`84`	`91`	`return requiredValidatorField;`
`85`	`92`	`}`
`86`	`93`
	`94`	`+ @StrutsParameter`
`87`	`95`	`public void setRequiredValidatorField(String requiredValidatorField) {`
`88`	`96`	`this.requiredValidatorField = requiredValidatorField;`
`89`	`97`	`}`
`@@ -92,6 +100,7 @@ public String getStringLengthValidatorField() {`
`92`	`100`	`return stringLengthValidatorField;`
`93`	`101`	`}`
`94`	`102`
	`103`	`+ @StrutsParameter`
`95`	`104`	`public void setStringLengthValidatorField(String stringLengthValidatorField) {`
`96`	`105`	`this.stringLengthValidatorField = stringLengthValidatorField;`
`97`	`106`	`}`
`@@ -100,6 +109,7 @@ public String getFieldExpressionValidatorField() {`
`100`	`109`	`return fieldExpressionValidatorField;`
`101`	`110`	`}`
`102`	`111`
	`112`	`+ @StrutsParameter`
`103`	`113`	`public void setFieldExpressionValidatorField(`
`104`	`114`	`String fieldExpressionValidatorField) {`
`105`	`115`	`this.fieldExpressionValidatorField = fieldExpressionValidatorField;`
`@@ -109,6 +119,7 @@ public String getUrlValidatorField() {`
`109`	`119`	`return urlValidatorField;`
`110`	`120`	`}`
`111`	`121`
	`122`	`+ @StrutsParameter`
`112`	`123`	`public void setUrlValidatorField(String urlValidatorField) {`
`113`	`124`	`this.urlValidatorField = urlValidatorField;`
`114`	`125`	`}`