GeneratorLoader and some other modification

Author: fakhreddine

pom.xml

@@ -29,6 +29,11 @@
 			<artifactId>jackson-annotations</artifactId>
 			<version>2.8.6</version>
 		</dependency>
+		<dependency>
+			<groupId>org.reflections</groupId>
+			<artifactId>reflections</artifactId>
+			<version>0.9.11</version>
+		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
 			<artifactId>jackson-module-jsonSchema</artifactId>

src/main/java/io/asfjava/ui/schema/generators/DefaultGenerator.java

@@ -7,22 +7,10 @@
 
 import io.asfjava.ui.schema.interfaces.SchemaGenerator;
 
-public final class DefaultGenerator implements SchemaGenerator{
-	
-	private static SchemaGenerator defaultGenerator=new DefaultGenerator();
-	
-	private  DefaultGenerator() {
-		
-	}
-
+public final class DefaultGenerator implements SchemaGenerator {
 	@Override
 	public ArrayNode generate(ObjectNode fieldFormDefinition, ArrayNode formDefinition, Field field) {
 		return formDefinition;
 	}
-	
-	public static SchemaGenerator getDefaultGenerator()
-	{
-		return defaultGenerator;
-	}
 
 }

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

@@ -10,12 +10,6 @@
 
 public final class TextFieldGenerator implements SchemaGenerator {
 
-	private static SchemaGenerator textFieldGenerator = new TextFieldGenerator();
-
-	private TextFieldGenerator() {
-
-	}
-
 	@Override
 	public ArrayNode generate(ObjectNode fieldFormDefinition, ArrayNode formDefinition, Field field) {
 		TextField annotation = field.getAnnotation(TextField.class);
@@ -51,8 +45,4 @@ public ArrayNode generate(ObjectNode fieldFormDefinition, ArrayNode formDefiniti
 		return formDefinition;
 	}
 
-	public static SchemaGenerator getTextFieldGenerator() {
-		return textFieldGenerator;
-	}
-
 }

src/main/java/io/asfjava/ui/schema/generators/factory/GeneratorFactory.java

@@ -1,6 +1,5 @@
 package io.asfjava.ui.schema.generators.factory;
 
-import java.security.GeneralSecurityException;
 import java.util.concurrent.ConcurrentHashMap;
 
 import io.asfjava.ui.schema.generators.DefaultGenerator;
@@ -10,14 +9,16 @@ public class GeneratorFactory {
 
 	private static ConcurrentHashMap<String, SchemaGenerator> generators = new ConcurrentHashMap<>();
 
-	public static SchemaGenerator getGenerator(Class genertor) {
+	private static DefaultGenerator defaultGenerator = new DefaultGenerator();
+
+	public static SchemaGenerator getGenerator(Class<? extends SchemaGenerator>  genertor) {
 		if (!generators.contains(genertor.getName())) {
-			return DefaultGenerator.getDefaultGenerator();
+			return defaultGenerator;
 		}
 		return generators.get(genertor.getName());
 	}
 
-	public static void registerDriver(Class genertor, SchemaGenerator schemaGenerator) {
+	public static void registerDriver(Class<? extends SchemaGenerator>  genertor, SchemaGenerator schemaGenerator) {
 		if (genertor != null && schemaGenerator != null) {
 			generators.put(genertor.getName(), schemaGenerator);
 		}

src/main/java/io/asfjava/ui/schema/generators/loader/GeneratorsLoader.java

@@ -0,0 +1,32 @@
+package io.asfjava.ui.schema.generators.loader;
+
+import java.util.Set;
+
+import org.reflections.Reflections;
+
+import io.asfjava.ui.schema.generators.factory.GeneratorFactory;
+import io.asfjava.ui.schema.interfaces.SchemaGenerator;
+
+public class GeneratorsLoader {
+
+	private static final String PACKAGESCAN = "io.asfjava.ui.schema.generators";
+	private static Reflections reflections = new Reflections(PACKAGESCAN);
+
+	public static void loadGenerators() {
+		Set<Class<? extends SchemaGenerator>> subTypes = reflections.getSubTypesOf(SchemaGenerator.class);
+		for (Class<? extends SchemaGenerator> subtype : subTypes)
+		{   SchemaGenerator schemaGenerator;
+		try {
+			schemaGenerator = (SchemaGenerator) Class.forName(subtype.getName()).newInstance();
+			GeneratorFactory.registerDriver(subtype,schemaGenerator);
+		} catch (InstantiationException e) {
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			e.printStackTrace();
+		} catch (ClassNotFoundException e) {
+			e.printStackTrace();
+		}
+		}
+	}
+
+}