Merge pull request #39 from Z7oussem/master

SaifJerbi · web-flow · commit d781aa5f87a0 · 2017-06-10T15:27:59.000+02:00
In order to support the loading of addons generators and decorators. fix sonar violation fix #40 assinged to @Z7oussem
diff --git a/src/main/java/io/asfjava/ui/core/GeneratorFactoryLoader.java b/src/main/java/io/asfjava/ui/core/GeneratorFactoryLoader.java
@@ -2,22 +2,30 @@
 
 import static io.asfjava.ui.core.logging.ErrorCode.ASF01;
 
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import org.reflections.Reflections;
 
 import io.asfjava.ui.core.generators.FormDefinitionGenerator;
 import io.asfjava.ui.core.logging.ASFUILogger;
 
 final class GeneratorFactoryLoader {
-	private static final String PACKAGESCAN = "io.asfjava.ui.core.generators";
+	private static final List<String> PACKAGESCAN = Stream
+			.of("io.asfjava.ui.core.generators", "io.asfjava.ui.addons.generators").collect(Collectors.toList());
 	private static Reflections reflections = new Reflections(PACKAGESCAN);
 
 	void load() {
-		reflections.getSubTypesOf(FormDefinitionGenerator.class).stream().forEach(subtype -> register(subtype));
+		for (Class<? extends FormDefinitionGenerator> subType : reflections
+				.getSubTypesOf(FormDefinitionGenerator.class)) {
+			register(subType);
+		}
 	}
 
-	private void register(Class<? extends FormDefinitionGenerator> subtype) {
+	private void register(Class<? extends FormDefinitionGenerator> subType) {
 		try {
-			FormDefinitionGenerator formDefinitionGenerator = subtype.newInstance();
+			FormDefinitionGenerator formDefinitionGenerator = subType.newInstance();
 			FormDefinitionGeneratorFactory.getInstance().register(formDefinitionGenerator::getAnnotation,
 					formDefinitionGenerator);
 		} catch (InstantiationException | IllegalAccessException e) {
diff --git a/src/main/java/io/asfjava/ui/core/SchemaDecoratorLoader.java b/src/main/java/io/asfjava/ui/core/SchemaDecoratorLoader.java
@@ -2,23 +2,31 @@
 
 import static io.asfjava.ui.core.logging.ErrorCode.ASF01;
 
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import org.reflections.Reflections;
 
 import io.asfjava.ui.core.logging.ASFUILogger;
 import io.asfjava.ui.core.schema.decorators.SchemaDecorator;
 
 final class SchemaDecoratorLoader {
 
-	private static final String PACKAGESCAN = "io.asfjava.ui.core.schema.decorators";
+	private static final List<String> PACKAGESCAN = Stream
+			.of("io.asfjava.ui.core.schema.decorators", "io.asfjava.ui.addons.schema.decorators")
+			.collect(Collectors.toList());
 	private static Reflections reflections = new Reflections(PACKAGESCAN);
 
 	void load() {
-		reflections.getSubTypesOf(SchemaDecorator.class).stream().forEach(subtype -> register(subtype));
+		for (Class<? extends SchemaDecorator> subType : reflections.getSubTypesOf(SchemaDecorator.class)) {
+			register(subType);
+		}
 	}
 
-	private void register(Class<? extends SchemaDecorator> subtype) {
+	private void register(Class<? extends SchemaDecorator> subType) {
 		try {
-			SchemaDecorator decorator = subtype.newInstance();
+			SchemaDecorator decorator = subType.newInstance();
 			SchemaDecoratorFactory.getInstance().register(decorator::getAnnotation, decorator);
 		} catch (InstantiationException | IllegalAccessException e) {
 			ASFUILogger.getLogger().error(ASF01, e);
@@ -30,12 +38,12 @@ void unload() {
 	}
 
 	static SchemaDecoratorLoader getInstance() {
-		if (INSTANCE == null)
-			INSTANCE = new SchemaDecoratorLoader();
-		return INSTANCE;
+		if (instance == null)
+			instance = new SchemaDecoratorLoader();
+		return instance;
 	}
 
-	private static SchemaDecoratorLoader 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
@@ -40,15 +40,18 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
 				fieldFormDefinition.set("titleMap", titlesMap);
 			} catch (InstantiationException | IllegalAccessException e) {
 				ASFUILogger.getLogger().error(e.getMessage());
+				throw new RuntimeException(e);
 			}
 		}
 	}
 
 	private void buildValueDefinition(ObjectMapper checkBoxMapper, ArrayNode titlesMap, String value) {
 		ObjectNode entry = checkBoxMapper.createObjectNode();
-		if (value.equals(value.toUpperCase())) {
+		String upperCasedValue = value.toUpperCase();
+		String lowerCasedValue = value.toLowerCase();
+		if (value.equals(upperCasedValue)) {
 			entry.put("name", value.toLowerCase());
-		} else if (value.equals(value.toLowerCase())) {
+		} else if (value.equals(lowerCasedValue)) {
 			entry.put("name", value.replace(value.substring(0, 1), value.substring(0, 1).toUpperCase()));
 		} else {
 			entry.put("name", value);
diff --git a/src/main/java/io/asfjava/ui/core/generators/ComboBoxGenerator.java b/src/main/java/io/asfjava/ui/core/generators/ComboBoxGenerator.java
@@ -44,16 +44,19 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
 				fieldFormDefinition.set("titleMap", titlesMap);
 			} catch (InstantiationException | IllegalAccessException e) {
 				ASFUILogger.getLogger().error(e.getMessage());
+				throw new RuntimeException(e);
 			}
 		}
 
 	}
 
 	private void buildValueDefinition(ObjectMapper comboMapper, ArrayNode titlesMap, String value) {
 		ObjectNode entry = comboMapper.createObjectNode();
-		if (value.equals(value.toUpperCase())) {
+		String upperCasedValue = value.toUpperCase();
+		String lowerCasedValue = value.toLowerCase();
+		if (value.equals(upperCasedValue)) {
 			entry.put("name", value.toLowerCase());
-		} else if (value.equals(value.toLowerCase())) {
+		} else if (value.equals(lowerCasedValue)) {
 			entry.put("name", value.replace(value.substring(0, 1), value.substring(0, 1).toUpperCase()));
 		} else {
 			entry.put("name", value);
diff --git a/src/main/java/io/asfjava/ui/core/generators/RadioBoxGenerator.java b/src/main/java/io/asfjava/ui/core/generators/RadioBoxGenerator.java
@@ -21,7 +21,7 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
 		fieldFormDefinition.put("readOnly", annotation.readOnly());
 		fieldFormDefinition.put("type", "radios");
 
-		JsonNode radioFieldFormDefinition = ((JsonNode) fieldFormDefinition);
+		JsonNode radioFieldFormDefinition = fieldFormDefinition;
 
 		ObjectMapper radioMapper = new ObjectMapper();
 
@@ -41,6 +41,7 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
 			}
 		} catch (InstantiationException | IllegalAccessException e) {
 			ASFUILogger.getLogger().error(e.getMessage());
+			throw new RuntimeException(e);
 		}
 
 		((ObjectNode) radioFieldFormDefinition).set("titleMap", titlesMap);
diff --git a/src/main/java/io/asfjava/ui/core/logging/ASFUILogger.java b/src/main/java/io/asfjava/ui/core/logging/ASFUILogger.java
@@ -9,4 +9,8 @@ public final class ASFUILogger {
 	public static Logger getLogger(){
 		return LOGGER;
 	}
+	
+	private ASFUILogger() {
+	}
+
 }
diff --git a/src/main/java/io/asfjava/ui/core/schema/UiFormSchemaGenerator.java b/src/main/java/io/asfjava/ui/core/schema/UiFormSchemaGenerator.java
@@ -26,7 +26,7 @@
 
 public final class UiFormSchemaGenerator {
 
-	private static UiFormSchemaGenerator INSTANCE;
+	private static UiFormSchemaGenerator instance;
 
 	public UiForm generate(Class<? extends Serializable> formDto) throws JsonMappingException {
 		Field[] declaredFields = formDto.getDeclaredFields();
@@ -122,10 +122,10 @@ private void buildFieldDefinition(Field field, Annotation annotation, ObjectMapp
 	}
 
 	public static UiFormSchemaGenerator get() {
-		if (INSTANCE == null) {
-			INSTANCE = new UiFormSchemaGenerator();
+		if (instance == null) {
+			instance = new UiFormSchemaGenerator();
 		}
-		return INSTANCE;
+		return instance;
 	}
 
 	private UiFormSchemaGenerator() {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {`
`21`	`21`	`fieldFormDefinition.put("readOnly", annotation.readOnly());`
`22`	`22`	`fieldFormDefinition.put("type", "radios");`
`23`	`23`
`24`		`- JsonNode radioFieldFormDefinition = ((JsonNode) fieldFormDefinition);`
	`24`	`+ JsonNode radioFieldFormDefinition = fieldFormDefinition;`
`25`	`25`
`26`	`26`	`ObjectMapper radioMapper = new ObjectMapper();`
`27`	`27`
`@@ -41,6 +41,7 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {`
`41`	`41`	`}`
`42`	`42`	`} catch (InstantiationException \| IllegalAccessException e) {`
`43`	`43`	`ASFUILogger.getLogger().error(e.getMessage());`
	`44`	`+ throw new RuntimeException(e);`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`((ObjectNode) radioFieldFormDefinition).set("titleMap", titlesMap);`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,8 @@ public final class ASFUILogger {`
`9`	`9`	`public static Logger getLogger(){`
`10`	`10`	`return LOGGER;`
`11`	`11`	`}`
	`12`	`+`
	`13`	`+ private ASFUILogger() {`
	`14`	`+ }`
	`15`	`+`
`12`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`
`27`	`27`	`public final class UiFormSchemaGenerator {`
`28`	`28`
`29`		`- private static UiFormSchemaGenerator INSTANCE;`
	`29`	`+ private static UiFormSchemaGenerator instance;`
`30`	`30`
`31`	`31`	`public UiForm generate(Class<? extends Serializable> formDto) throws JsonMappingException {`
`32`	`32`	`Field[] declaredFields = formDto.getDeclaredFields();`
`@@ -122,10 +122,10 @@ private void buildFieldDefinition(Field field, Annotation annotation, ObjectMapp`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`public static UiFormSchemaGenerator get() {`
`125`		`- if (INSTANCE == null) {`
`126`		`- INSTANCE = new UiFormSchemaGenerator();`
	`125`	`+ if (instance == null) {`
	`126`	`+ instance = new UiFormSchemaGenerator();`
`127`	`127`	`}`
`128`		`- return INSTANCE;`
	`128`	`+ return instance;`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`private UiFormSchemaGenerator() {`