Merge branch 'master' into master

Author: SaifJerbi

src/main/java/io/asfjava/ui/core/logging/ASFUILogger.java

@@ -5,11 +5,12 @@
 
 public final class ASFUILogger {
 
-	private final static Logger LOGGER=LoggerFactory.getLogger("ASFUILogger");
-	public static Logger getLogger(){
+	private final static Logger LOGGER = LoggerFactory.getLogger("ASFUILogger");
+
+	public static Logger getLogger() {
 		return LOGGER;
 	}
-	
+
 	private ASFUILogger() {
 	}
 

src/main/java/io/asfjava/ui/core/logging/ErrorCode.java

@@ -1,9 +1,10 @@
 package io.asfjava.ui.core.logging;
 
 public final class ErrorCode {
-public final static String ASF01="Failure when trying to load Generators";
-public final static String ASF02="Failure when trying to load Decorators";
-private ErrorCode(){
-	
-}
+	public final static String ASF01 = "Failure when trying to load Generators";
+	public final static String ASF02 = "Failure when trying to load Decorators";
+
+	private ErrorCode() {
+
+	}
 }

src/main/java/io/asfjava/ui/core/schema/CustomIntegerSchema.java

@@ -0,0 +1,12 @@
+package io.asfjava.ui.core.schema;
+
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.module.jsonSchema.types.IntegerSchema;
+
+class CustomIntegerSchema extends IntegerSchema {
+	@Override
+	public void enrichWithBeanProperty(BeanProperty beanProperty) {
+		super.enrichWithBeanProperty(beanProperty);
+		SchemaDecoratorUtil.get().decorate(beanProperty, this);
+	}
+}

src/main/java/io/asfjava/ui/core/schema/CustomJsonSchemaFactory.java

@@ -1,11 +1,23 @@
 package io.asfjava.ui.core.schema;
 
 import com.fasterxml.jackson.module.jsonSchema.factories.JsonSchemaFactory;
+import com.fasterxml.jackson.module.jsonSchema.types.IntegerSchema;
+import com.fasterxml.jackson.module.jsonSchema.types.NumberSchema;
 import com.fasterxml.jackson.module.jsonSchema.types.StringSchema;
 
 class CustomJsonSchemaFactory extends JsonSchemaFactory {
 	@Override
 	public StringSchema stringSchema() {
 		return new CustomStringSchema();
 	}
+
+	@Override
+	public NumberSchema numberSchema() {
+		return new CustomNumberSchema();
+	}
+
+	@Override
+	public IntegerSchema integerSchema() {
+		return new CustomIntegerSchema();
+	}
 }

src/main/java/io/asfjava/ui/core/schema/CustomNumberSchema.java

@@ -0,0 +1,12 @@
+package io.asfjava.ui.core.schema;
+
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.module.jsonSchema.types.NumberSchema;
+
+class CustomNumberSchema extends NumberSchema {
+	@Override
+	public void enrichWithBeanProperty(BeanProperty beanProperty) {
+		super.enrichWithBeanProperty(beanProperty);
+		SchemaDecoratorUtil.get().decorate(beanProperty, this);
+	}
+}

src/main/java/io/asfjava/ui/core/schema/CustomSchemaFactoryWrapper.java

@@ -8,14 +8,6 @@
 class CustomSchemaFactoryWrapper extends SchemaFactoryWrapper {
 
 	private static class SFSchemaFactoryWrapperFactory extends WrapperFactory {
-		@Override
-		public SchemaFactoryWrapper getWrapper(SerializerProvider p) {
-			SchemaFactoryWrapper wrapper = new CustomSchemaFactoryWrapper();
-			if (p != null) {
-				wrapper.setProvider(p);
-			}
-			return wrapper;
-		}
 
 		@Override
 		public SchemaFactoryWrapper getWrapper(SerializerProvider p, VisitorContext rvc) {

src/main/java/io/asfjava/ui/core/schema/CustomStringSchema.java

@@ -1,21 +1,14 @@
 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.SchemaDecoratorFactory;
-
 class CustomStringSchema extends StringSchema {
 
 	@Override
 	public void enrichWithBeanProperty(BeanProperty beanProperty) {
 		super.enrichWithBeanProperty(beanProperty);
-		Iterable<Annotation> it = beanProperty.getMember().annotations();
-		it.forEach(
-				annotation -> SchemaDecoratorFactory.getInstance().getDecorator(annotation.annotationType().getName())
-						.ifPresent(decorator -> decorator.customizeSchema(beanProperty, this)));
+		SchemaDecoratorUtil.get().decorate(beanProperty, this);
 	}
 
 }

src/main/java/io/asfjava/ui/core/schema/SchemaDecoratorUtil.java

@@ -0,0 +1,30 @@
+package io.asfjava.ui.core.schema;
+
+import java.lang.annotation.Annotation;
+
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
+
+import io.asfjava.ui.core.SchemaDecoratorFactory;
+
+final class SchemaDecoratorUtil {
+
+	void decorate(BeanProperty beanProperty, JsonSchema simpleTypeSchema) {
+		Iterable<Annotation> it = beanProperty.getMember().annotations();
+		it.forEach(
+				annotation -> SchemaDecoratorFactory.getInstance().getDecorator(annotation.annotationType().getName())
+						.ifPresent(decorator -> decorator.customizeSchema(beanProperty, simpleTypeSchema)));
+	}
+
+	static SchemaDecoratorUtil get() {
+		if (instance == null) {
+			instance = new SchemaDecoratorUtil();
+		}
+		return instance;
+	}
+
+	private static SchemaDecoratorUtil instance;
+
+	private SchemaDecoratorUtil() {
+	}
+}

src/main/java/io/asfjava/ui/core/schema/decorators/NumberSchemaDecorator.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
-import com.fasterxml.jackson.module.jsonSchema.types.StringSchema;
+import com.fasterxml.jackson.module.jsonSchema.types.SimpleTypeSchema;
 
 import io.asfjava.ui.core.form.Number;
 
@@ -12,7 +12,7 @@ public class NumberSchemaDecorator implements SchemaDecorator {
 	public void customizeSchema(BeanProperty property, JsonSchema jsonschema) {
 		Number annotation = property.getAnnotation(Number.class);
 		if (annotation != null && annotation.title() != null) {
-			((StringSchema) jsonschema).setTitle(annotation.title());
+			((SimpleTypeSchema) jsonschema).setTitle(annotation.title());
 		}
 	}
 

src/main/java/io/asfjava/ui/dto/UiForm.java

@@ -11,8 +11,8 @@ public class UiForm implements Serializable {
 	private ArrayNode form;
 
 	public UiForm(JsonSchema schema, ArrayNode form) {
-		this.schema = schema;
-		this.form = form;
+		setSchema(schema);
+		setForm(form);
 	}
 
 	public JsonSchema getSchema() {