Merge pull request #37 from Fakhreddine10/master

SaifJerbi · web-flow · commit 072fd86cd787 · 2017-06-08T22:07:46.000+02:00
Schema Decorator
diff --git a/demo/src/main/java/io/asfjava/ui/demo/screen/DemoForm.java b/demo/src/main/java/io/asfjava/ui/demo/screen/DemoForm.java
@@ -101,6 +101,16 @@ public String getCivilState() {
 	public void setCivilState(String civilState) {
 		this.civilState = civilState;
 	}
+	
+
+	public String getCurrency() {
+		return currency;
+	}
+
+	public String getColor() {
+		return color;
+	}
+
 
 	private static final long serialVersionUID = -5073515619469444978L;
 }
diff --git a/src/main/java/io/asfjava/ui/core/GeneratorFactoryInitializer.java b/src/main/java/io/asfjava/ui/core/GeneratorFactoryInitializer.java
@@ -10,6 +10,7 @@ class GeneratorFactoryInitializer implements ServletContextListener {
 	@Override
 	public final void contextInitialized(final ServletContextEvent sce) {
 		GeneratorFactoryLoader.getInstance().load();
+		SchemaDecoratorLoader.getInstance().load();
 	}
 
 	@Override
diff --git a/src/main/java/io/asfjava/ui/core/SchemaDecoratorFactory.java b/src/main/java/io/asfjava/ui/core/SchemaDecoratorFactory.java
@@ -0,0 +1,30 @@
+package io.asfjava.ui.core;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import io.asfjava.ui.schema.decorator.SchemaDecorator;
+
+public final class SchemaDecoratorFactory {
+	public SchemaDecorator getGenerator(String annotationName) {
+		return GENERATORS.get(annotationName);
+	}
+
+	void register(String annotationName, SchemaDecorator generator) {
+		GENERATORS.put(annotationName, generator);
+	}
+
+	public static SchemaDecoratorFactory getInstance() {
+		if (INSTANCE == null) {
+			INSTANCE = new SchemaDecoratorFactory();
+		}
+		return INSTANCE;
+	}
+
+	private static final Map<String, SchemaDecorator> GENERATORS = new ConcurrentHashMap<>();
+
+	private static SchemaDecoratorFactory INSTANCE;
+
+	private SchemaDecoratorFactory() {
+	}
+}
diff --git a/src/main/java/io/asfjava/ui/core/SchemaDecoratorLoader.java b/src/main/java/io/asfjava/ui/core/SchemaDecoratorLoader.java
@@ -0,0 +1,49 @@
+package io.asfjava.ui.core;
+
+import java.util.Set;
+
+import org.reflections.Reflections;
+
+import io.asfjava.ui.schema.decorator.SchemaDecorator;
+
+
+
+final class SchemaDecoratorLoader {
+
+	private static final String PACKAGESCAN = "io.asfjava.ui.schema.decorator";
+	private static Reflections reflections = new Reflections(PACKAGESCAN);
+	void load() {
+
+		Set<Class<? extends SchemaDecorator>> subTypes = reflections
+				.getSubTypesOf(SchemaDecorator.class);
+		for (Class<? extends SchemaDecorator> subtype : subTypes) {
+			SchemaDecorator schemaDecorator;
+			try {
+				schemaDecorator = (SchemaDecorator) Class.forName(subtype.getName()).newInstance();
+				SchemaDecoratorFactory.getInstance().register(schemaDecorator.getAnnotation(),
+						schemaDecorator);
+			} catch (InstantiationException e) {
+				e.printStackTrace();
+			} catch (IllegalAccessException e) {
+				e.printStackTrace();
+			} catch (ClassNotFoundException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	void unload() {
+		System.out.println("I'm unloader");
+	}
+
+	static SchemaDecoratorLoader getInstance() {
+		if (INSTANCE == null)
+			INSTANCE = new SchemaDecoratorLoader();
+		return INSTANCE;
+	}
+
+	private static SchemaDecoratorLoader INSTANCE;
+
+	private SchemaDecoratorLoader() {
+	}
+}
diff --git a/src/main/java/io/asfjava/ui/core/generators/CheckBoxGenerator.java b/src/main/java/io/asfjava/ui/core/generators/CheckBoxGenerator.java
@@ -20,7 +20,7 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
 		fieldFormDefinition.put("type", "checkboxes");
 		fieldFormDefinition.put("multiple", annotation.multiple());
 		fieldFormDefinition.put("required", annotation.required());
-		fieldFormDefinition.put("title", annotation.title());
+//		fieldFormDefinition.put("title", annotation.title());
 
 		ObjectMapper checkBoxMapper = new ObjectMapper();
 		ArrayNode titlesMap = checkBoxMapper.createArrayNode();
diff --git a/src/main/java/io/asfjava/ui/core/generators/ComboBoxGenerator.java b/src/main/java/io/asfjava/ui/core/generators/ComboBoxGenerator.java
@@ -23,7 +23,7 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
 		fieldFormDefinition.put("multiple", annotation.multiple());
 		fieldFormDefinition.put("required", annotation.required());
 		fieldFormDefinition.put("size", annotation.size());
-		fieldFormDefinition.put("title", annotation.title());
+//		fieldFormDefinition.put("title", annotation.title());
 
 		ObjectMapper comboMapper = new ObjectMapper();
 		ArrayNode titlesMap = comboMapper.createArrayNode();
diff --git a/src/main/java/io/asfjava/ui/core/generators/PasswordGenerator.java b/src/main/java/io/asfjava/ui/core/generators/PasswordGenerator.java
@@ -12,7 +12,7 @@ public class PasswordGenerator implements FormDefinitionGenerator {
 	public void generate(ObjectNode fieldFormDefinition, Field field) {
 		Password annotation = field.getAnnotation(Password.class);
 		fieldFormDefinition.put("key", field.getName());
-		fieldFormDefinition.put("title", annotation.title());
+//		fieldFormDefinition.put("title", annotation.title());
 		fieldFormDefinition.put("type", "password");
 
 		String description = annotation.description();
diff --git a/src/main/java/io/asfjava/ui/core/generators/RadioBoxGenerator.java b/src/main/java/io/asfjava/ui/core/generators/RadioBoxGenerator.java
@@ -19,7 +19,7 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
 		fieldFormDefinition.put("key", field.getName());
 		fieldFormDefinition.put("readOnly", annotation.readOnly());
 		fieldFormDefinition.put("type", "radios");
-		fieldFormDefinition.put("title", annotation.title());
+//		fieldFormDefinition.put("title", annotation.title());
 
 		JsonNode radioFieldFormDefinition = ((JsonNode) fieldFormDefinition);
 
diff --git a/src/main/java/io/asfjava/ui/core/generators/TextAreaGenerator.java b/src/main/java/io/asfjava/ui/core/generators/TextAreaGenerator.java
@@ -12,7 +12,7 @@ public class TextAreaGenerator implements FormDefinitionGenerator {
 	public void generate(ObjectNode fieldFormDefinition, Field field) {
 		TextArea annotation = field.getAnnotation(TextArea.class);
 		fieldFormDefinition.put("key", field.getName());
-		fieldFormDefinition.put("title", annotation.title());
+//		fieldFormDefinition.put("title", annotation.title());
 		fieldFormDefinition.put("type", "textarea");
 
 		String description = annotation.description();
diff --git a/src/main/java/io/asfjava/ui/core/generators/TextFieldGenerator.java b/src/main/java/io/asfjava/ui/core/generators/TextFieldGenerator.java
@@ -13,7 +13,7 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
 		TextField annotation = field.getAnnotation(TextField.class);
 
 		fieldFormDefinition.put("key", field.getName());
-		fieldFormDefinition.put("title", annotation.title());
+//		fieldFormDefinition.put("title", annotation.title());
 
 		String description = annotation.description();
 		if (!description.isEmpty()) {
diff --git a/src/main/java/io/asfjava/ui/core/schema/CustomStringSchema.java b/src/main/java/io/asfjava/ui/core/schema/CustomStringSchema.java
@@ -1,19 +1,21 @@
 package io.asfjava.ui.core.schema;
 
+import java.lang.annotation.Annotation;
+
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.module.jsonSchema.types.StringSchema;
 
-import io.asfjava.ui.core.form.TextField;
+import io.asfjava.ui.core.SchemaDecoratorFactory;
 
 class CustomStringSchema extends StringSchema {
 
 	@Override
 	public void enrichWithBeanProperty(BeanProperty beanProperty) {
-		super.enrichWithBeanProperty(beanProperty);
-		TextField annotation = beanProperty.getAnnotation(TextField.class);
-		if (annotation != null && !annotation.pattern().isEmpty()) {
-			this.setPattern(annotation.pattern());
-		}
+		super.enrichWithBeanProperty(beanProperty);	
+		Iterable<Annotation> it = beanProperty.getMember().annotations();
+		String anno = it.iterator().next().annotationType().getName();
+		SchemaDecoratorFactory.getInstance().getGenerator(anno).customizeSchema(beanProperty, this);
+
 	}
 
 }
diff --git a/src/main/java/io/asfjava/ui/schema/decorator/CheckBoxSchemaDecorator.java b/src/main/java/io/asfjava/ui/schema/decorator/CheckBoxSchemaDecorator.java
@@ -0,0 +1,24 @@
+package io.asfjava.ui.schema.decorator;
+
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
+import com.fasterxml.jackson.module.jsonSchema.types.StringSchema;
+
+import io.asfjava.ui.core.form.CheckBox;
+
+public class CheckBoxSchemaDecorator implements SchemaDecorator {
+
+	@Override
+	public void customizeSchema(BeanProperty property, JsonSchema jsonschema) {
+		CheckBox annotation = property.getAnnotation(CheckBox.class);
+		if (annotation != null && annotation.title() != null) {
+			((StringSchema) jsonschema).setTitle(annotation.title());
+		}
+	}
+
+	@Override
+	public String getAnnotation() {
+		return CheckBox.class.getName();
+	}
+
+}
diff --git a/src/main/java/io/asfjava/ui/schema/decorator/ComboBoxSchemaDecorator.java b/src/main/java/io/asfjava/ui/schema/decorator/ComboBoxSchemaDecorator.java
@@ -0,0 +1,24 @@
+package io.asfjava.ui.schema.decorator;
+
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
+import com.fasterxml.jackson.module.jsonSchema.types.StringSchema;
+
+import io.asfjava.ui.core.form.ComboBox;
+
+public class ComboBoxSchemaDecorator implements SchemaDecorator {
+
+	@Override
+	public void customizeSchema(BeanProperty property, JsonSchema jsonschema) {
+		ComboBox annotation = property.getAnnotation(ComboBox.class);
+		if (annotation != null && annotation.title() != null) {
+			((StringSchema) jsonschema).setTitle(annotation.title());
+		}
+	}
+
+	@Override
+	public String getAnnotation() {
+		return ComboBox.class.getName();
+	}
+
+}
diff --git a/src/main/java/io/asfjava/ui/schema/decorator/PasswordSchemaDecorator.java b/src/main/java/io/asfjava/ui/schema/decorator/PasswordSchemaDecorator.java
@@ -0,0 +1,24 @@
+package io.asfjava.ui.schema.decorator;
+
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
+import com.fasterxml.jackson.module.jsonSchema.types.StringSchema;
+
+import io.asfjava.ui.core.form.Password;
+
+public class PasswordSchemaDecorator implements SchemaDecorator {
+
+	@Override
+	public void customizeSchema(BeanProperty property, JsonSchema jsonschema) {
+		Password annotation = property.getAnnotation(Password.class);
+		if (annotation != null && annotation.title() != null) {
+			((StringSchema) jsonschema).setTitle(annotation.title());
+		}
+	}
+
+	@Override
+	public String getAnnotation() {
+		return Password.class.getName();
+	}
+
+}
diff --git a/src/main/java/io/asfjava/ui/schema/decorator/RadioBoxSchemaDecorator.java b/src/main/java/io/asfjava/ui/schema/decorator/RadioBoxSchemaDecorator.java
@@ -0,0 +1,25 @@
+package io.asfjava.ui.schema.decorator;
+
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
+import com.fasterxml.jackson.module.jsonSchema.types.StringSchema;
+
+import io.asfjava.ui.core.form.Password;
+import io.asfjava.ui.core.form.RadioBox;
+
+public class RadioBoxSchemaDecorator implements SchemaDecorator {
+
+	@Override
+	public void customizeSchema(BeanProperty property, JsonSchema jsonschema) {
+		RadioBox annotation = property.getAnnotation(RadioBox.class);
+		if (annotation != null && annotation.title() != null) {
+			((StringSchema) jsonschema).setTitle(annotation.title());
+		}
+	}
+
+	@Override
+	public String getAnnotation() {
+		return RadioBox.class.getName();
+	}
+
+}
diff --git a/src/main/java/io/asfjava/ui/schema/decorator/SchemaDecorator.java b/src/main/java/io/asfjava/ui/schema/decorator/SchemaDecorator.java
@@ -0,0 +1,10 @@
+package io.asfjava.ui.schema.decorator;
+
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
+
+public interface SchemaDecorator {
+
+	void customizeSchema(BeanProperty property,JsonSchema jsonschema);
+	String getAnnotation();
+}
diff --git a/src/main/java/io/asfjava/ui/schema/decorator/TextAreaSchemaDecorator.java b/src/main/java/io/asfjava/ui/schema/decorator/TextAreaSchemaDecorator.java
@@ -0,0 +1,24 @@
+package io.asfjava.ui.schema.decorator;
+
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
+import com.fasterxml.jackson.module.jsonSchema.types.StringSchema;
+
+import io.asfjava.ui.core.form.TextArea;
+
+public class TextAreaSchemaDecorator implements SchemaDecorator {
+
+	@Override
+	public void customizeSchema(BeanProperty property, JsonSchema jsonschema) {
+		TextArea annotation = property.getAnnotation(TextArea.class);
+		if (annotation != null && annotation.title() != null) {
+			((StringSchema) jsonschema).setTitle(annotation.title());
+		}
+	}
+
+	@Override
+	public String getAnnotation() {
+		return TextArea.class.getName();
+	}
+
+}
diff --git a/src/main/java/io/asfjava/ui/schema/decorator/TextFieldSchemaDecorator.java b/src/main/java/io/asfjava/ui/schema/decorator/TextFieldSchemaDecorator.java
@@ -0,0 +1,30 @@
+package io.asfjava.ui.schema.decorator;
+
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
+import com.fasterxml.jackson.module.jsonSchema.types.StringSchema;
+
+import io.asfjava.ui.core.form.TextField;
+
+public class TextFieldSchemaDecorator implements SchemaDecorator{
+
+	@Override
+	public void customizeSchema(BeanProperty property, JsonSchema jsonschema) {
+		TextField annotation = property.getAnnotation(TextField.class);
+		if (annotation != null) {
+			if(annotation.title()!=null){
+			((StringSchema) jsonschema).setTitle(annotation.title());
+			}
+			if(annotation.pattern()!=null)
+			{
+			((StringSchema) jsonschema).setPattern(annotation.pattern());
+			}
+		}
+	}
+
+	@Override
+	public String getAnnotation() {
+		return TextField.class.getName();
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ class GeneratorFactoryInitializer implements ServletContextListener {`
`10`	`10`	`@Override`
`11`	`11`	`public final void contextInitialized(final ServletContextEvent sce) {`
`12`	`12`	`GeneratorFactoryLoader.getInstance().load();`
	`13`	`+ SchemaDecoratorLoader.getInstance().load();`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`@Override`