Add FieldAddon support to TextArea

Add FieldAddon support to TextArea

Author: ahdbk

src/main/java/io/asfjava/ui/core/form/TextArea.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/generators/TextAreaGenerator.java

@@ -14,6 +14,16 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
 		fieldFormDefinition.put("key", field.getName());
 		fieldFormDefinition.put("type", "textarea");
 
+		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/test/java/io/asfjava/ui/core/schema/UiFormSchemaGeneratorTest.java

@@ -246,6 +246,46 @@ public void testGenerate_TextArea() throws JsonProcessingException {
 		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='address')].notitle", hasItem(true)));
 		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='address')].readonly", hasItem(true)));
 
+	}
+	
+	public void testGenerate_TextArea_WithFieldAddOnLeft() throws JsonProcessingException {
+		UiForm ui = UiFormSchemaGenerator.get().generate(TextAreaForm2.class);
+
+		String json = new ObjectMapper().writeValueAsString(ui);
+		Assert.assertThat(json, hasJsonPath("$.schema.properties.address.title", equalTo("Address")));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='address')]", hasSize(1)));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='address')].description", hasItem("This is textarea")));
+		Assert.assertThat(json,
+				hasJsonPath("$.form[?(@.key=='address')].placeholder", hasItem("Fill your address please")));
+		Assert.assertThat(json,
+				hasJsonPath("$.form[?(@.key=='address')].validationMessage", hasItem("this is a validation msg")));
+		// Assert.assertThat(json,
+		// hasJsonPath("$.form[?(@.key=='password')].type",hasItem("textArea")));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='address')].notitle", hasItem(true)));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='address')].readonly", hasItem(true)));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='address')].fieldAddonLeft", hasItem("@")));
+
+
+	}
+	
+	public void testGenerate_TextArea_WithFieldAddOnRight() throws JsonProcessingException {
+		UiForm ui = UiFormSchemaGenerator.get().generate(TextAreaForm3.class);
+
+		String json = new ObjectMapper().writeValueAsString(ui);
+		Assert.assertThat(json, hasJsonPath("$.schema.properties.address.title", equalTo("Address")));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='address')]", hasSize(1)));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='address')].description", hasItem("This is textarea")));
+		Assert.assertThat(json,
+				hasJsonPath("$.form[?(@.key=='address')].placeholder", hasItem("Fill your address please")));
+		Assert.assertThat(json,
+				hasJsonPath("$.form[?(@.key=='address')].validationMessage", hasItem("this is a validation msg")));
+		// Assert.assertThat(json,
+		// hasJsonPath("$.form[?(@.key=='password')].type",hasItem("textArea")));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='address')].notitle", hasItem(true)));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='address')].readonly", hasItem(true)));
+		Assert.assertThat(json, hasJsonPath("$.form[?(@.key=='address')].fieldAddonRight", hasItem("@")));
+
+
 	}
 
 	@Test
@@ -446,6 +486,26 @@ public String getPassword() {
 	}
 }
 
+class TextAreaForm2 implements Serializable {
+
+	@TextArea(title = "Address", placeHolder = "Fill your address please", fieldAddonLeft = "@", description = "This is textarea", noTitle = true, validationMessage = "this is a validation msg", readOnly = true)
+	private String address;
+
+	public String getAddress() {
+		return address;
+	}
+}
+
+class TextAreaForm3 implements Serializable {
+
+	@TextArea(title = "Address", placeHolder = "Fill your address please",fieldAddonRight = "@", description = "This is textarea", noTitle = true, validationMessage = "this is a validation msg", readOnly = true)
+	private String address;
+
+	public String getAddress() {
+		return address;
+	}
+}
+
 class TextAreaForm implements Serializable {
 
 	@TextArea(title = "Address", placeHolder = "Fill your address please", description = "This is textarea", noTitle = true, validationMessage = "this is a validation msg", readOnly = true)