Add fieldAddon support

demo/src/main/java/io/asfjava/ui/demo/screen/DemoForm.java

@@ -13,6 +13,17 @@
 
 public class DemoForm implements Serializable {
 
+
+	@TextField(title = "Pesonal Website",fieldAddonLeft="http://", description = "This is TextField with fieldAddonLeft")
+	private String webSite;
+
+	@TextField(title = "Your Github Mail",fieldAddonRight="@github.com", description = "This is TextField with fieldAddonRight")
+	private String gitHub;
+
+//	@Tab(title = "Contact", index = 2)
+	@Password(title = "Password", placeHolder = "Please set you password", description = "This is password")
+	private String password;
+
 	@Tab(title = "Info", index = 1)
 	@TextField(title = "First Name", placeHolder = "Your first name", description = "This is a description for your first name field")
 	private String firstName;
@@ -29,9 +40,6 @@ public class DemoForm implements Serializable {
 	@Number(title = "Number of children", placeHolder = "Number of children", description = "This is a number")
 	private Integer number;
 
-//	@Tab(title = "Contact", index = 2)
-	@Password(title = "Password", placeHolder = "Please set you password", description = "This is password")
-	private String password;
 
 	@Tab(title = "Info", index = 1)
 	@ComboBox(title = "Gender", titleMap = GenderTitleMap.class)
@@ -72,6 +80,22 @@ public void setEmail(String eMail) {
 	public String getEmail() {
 		return email;
 	}
+
+	public void setGitHub(String github) {
+		this.gitHub = github;
+	}
+
+	public String getGitHub() {
+		return gitHub;
+	}
+
+	public void setWebSite(String website) {
+		this.webSite = website;
+	}
+
+	public String getWebSite() {
+		return webSite;
+	}
 
 	public void setLastName(String lastName) {
 		this.lastName = lastName;

src/main/java/io/asfjava/ui/core/form/Number.java

@@ -13,7 +13,11 @@
 
 	String placeHolder() default "";
 
-	String description() default "";
+	String description() default "";	
+
+	String fieldAddonLeft() default"";
+
+	String fieldAddonRight() default"";
 
 	boolean noTitle() default false;
 

src/main/java/io/asfjava/ui/core/form/Password.java

@@ -14,6 +14,10 @@
 	String placeHolder() default "";
 
 	String description() default "";
+
+	String fieldAddonLeft() default"";
+
+	String fieldAddonRight() default"";
 
 	boolean noTitle() default false;
 

src/main/java/io/asfjava/ui/core/form/TextField.java

@@ -15,6 +15,10 @@
 
 	String description() default "";
 
+	String fieldAddonLeft() default"";
+
+	String fieldAddonRight() default"";
+
 	String pattern() default "";
 
 	boolean noTitle() default false;

src/main/java/io/asfjava/ui/core/generators/NumberGenerator.java

@@ -19,6 +19,16 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
 			fieldFormDefinition.put("title", title);
 		}
 
+		String fieldAddonLeft = annotation.fieldAddonLeft();
+		if (!fieldAddonLeft.isEmpty()) {
+			fieldFormDefinition.put("fieldAddonLeft", fieldAddonLeft);
+		}
+
+		String fieldAddonRight = annotation.fieldAddonRight();
+		if (!fieldAddonRight.isEmpty()) {
+			fieldFormDefinition.put("fieldAddonRight", fieldAddonRight);
+		}
+
 		String description = annotation.description();
 		if (!description.isEmpty()) {
 			fieldFormDefinition.put("description", description);

src/main/java/io/asfjava/ui/core/generators/PasswordGenerator.java

@@ -18,6 +18,17 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
 		if (!description.isEmpty()) {
 			fieldFormDefinition.put("description", description);
 		}
+
+		String fieldAddonLeft = annotation.fieldAddonLeft();
+		if (!fieldAddonLeft.isEmpty()) {
+			fieldFormDefinition.put("fieldAddonLeft", fieldAddonLeft);
+		}
+
+		String fieldAddonRight = annotation.fieldAddonRight();
+		if (!fieldAddonRight.isEmpty()) {
+			fieldFormDefinition.put("fieldAddonRight", fieldAddonRight);
+		}
+
 		String placeHolder = annotation.placeHolder();
 		if (!placeHolder.isEmpty()) {
 			fieldFormDefinition.put("placeholder", placeHolder);

src/main/java/io/asfjava/ui/core/generators/TextFieldGenerator.java

@@ -17,6 +17,16 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
 		if (!description.isEmpty()) {
 			fieldFormDefinition.put("description", description);
 		}
+
+		String fieldAddonLeft = annotation.fieldAddonLeft();
+		if (!fieldAddonLeft.isEmpty()) {
+			fieldFormDefinition.put("fieldAddonLeft", fieldAddonLeft);
+		}
+
+		String fieldAddonRight = annotation.fieldAddonRight();
+		if (!fieldAddonRight.isEmpty()) {
+			fieldFormDefinition.put("fieldAddonRight", fieldAddonRight);
+		}
 
 		String placeHolder = annotation.placeHolder();
 		if (!placeHolder.isEmpty()) {

src/test/java/io/asfjava/ui/core/schema/UiFormSchemaGeneratorTest.java

@@ -46,6 +46,38 @@ public void testGenerate_textField() throws JsonProcessingException {
 		//Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='firstName')].type",hasItem("textField")));
 
 	}
+
+	@Test
+	public void testGenerate_textField_WithFieldAddonRight() throws JsonProcessingException {
+		UiForm ui = UiFormSchemaGenerator.get().generate(TextFieldForm2.class);
+		String json = new ObjectMapper().writeValueAsString(ui);
+
+
+		Assert.assertThat(json, hasJsonPath("$.schema.properties.firstName.title",equalTo("First Name")));
+		Assert.assertThat(json, hasJsonPath("$.schema.properties.firstName.pattern",equalTo("[a-z]")));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='firstName')]",hasSize(1)));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='firstName')].description",hasItem("This is a description for your first name field")));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='firstName')].placeholder",hasItem("Your first name")));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='firstName')].validationMessage",hasItem("this is a validation msg")));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='firstName')].fieldAddonRight",hasItem("@")));
+
+	}
+
+	@Test
+	public void testGenerate_textField_WithFieldAddonLeft() throws JsonProcessingException {
+		UiForm ui = UiFormSchemaGenerator.get().generate(TextFieldForm3.class);
+		String json = new ObjectMapper().writeValueAsString(ui);
+
+
+		Assert.assertThat(json, hasJsonPath("$.schema.properties.firstName.title",equalTo("First Name")));
+		Assert.assertThat(json, hasJsonPath("$.schema.properties.firstName.pattern",equalTo("[a-z]")));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='firstName')]",hasSize(1)));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='firstName')].description",hasItem("This is a description for your first name field")));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='firstName')].placeholder",hasItem("Your first name")));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='firstName')].validationMessage",hasItem("this is a validation msg")));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='firstName')].fieldAddonLeft",hasItem("@")));
+
+	}
 
 	@Test
 	public void testGenerate_Number() throws JsonProcessingException {
@@ -163,6 +195,8 @@ public void testGenerate_ComboBox_WithCustomValuesContainer() throws JsonProcess
 		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='gender')].titleMap[?(@.name=='Female')].value",hasItem("female")));
 
 	}
+
+
 
 }
 
@@ -177,6 +211,28 @@ public String getFirstName() {
 
 }
 
+class TextFieldForm2 implements Serializable {
+
+	@TextField(title = "First Name", placeHolder = "Your first name", fieldAddonRight = "@", pattern = "[a-z]", noTitle = true, validationMessage = "this is a validation msg", description = "This is a description for your first name field")
+	private String firstName;
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+}
+
+class TextFieldForm3 implements Serializable {
+
+	@TextField(title = "First Name", placeHolder = "Your first name", fieldAddonLeft = "@", pattern = "[a-z]", noTitle = true, validationMessage = "this is a validation msg", description = "This is a description for your first name field")
+	private String firstName;
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+}
+
 class NumberForm implements Serializable {
 
 	@Number(title = "Number of children", placeHolder = "Number of children", description = "This is a number", noTitle = true, validationMessage = "this is a validation msg", readOnly = true)