Create SimpleFactory to remove some duplication between existing factories

Author: Imed Ben Heni

src/main/java/io/asfjava/ui/core/FormDefinitionGeneratorFactory.java

@@ -1,13 +1,8 @@
 package io.asfjava.ui.core;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
-
 import io.asfjava.ui.core.generators.FormDefinitionGenerator;
 
-public final class FormDefinitionGeneratorFactory {
+public final class FormDefinitionGeneratorFactory extends SimpleFactory<String, FormDefinitionGenerator> {
 
 	private static FormDefinitionGeneratorFactory instance;
 
@@ -17,15 +12,5 @@ public static FormDefinitionGeneratorFactory getInstance() {
 				: instance;
 	}
 
-	private final Map<String, FormDefinitionGenerator> generators = new ConcurrentHashMap<>();
-
 	private FormDefinitionGeneratorFactory() {}
-
-	public Optional<FormDefinitionGenerator> getGenerator(String annotationName) {
-		return Optional.ofNullable(generators.get(annotationName));
-	}
-
-	void register(Supplier<String> annotationName, FormDefinitionGenerator generator) {
-		generators.put(annotationName.get(), generator);
-	}
 }

src/main/java/io/asfjava/ui/core/SchemaDecoratorFactory.java

@@ -2,12 +2,7 @@
 
 import io.asfjava.ui.core.schema.decorators.SchemaDecorator;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
-
-public final class SchemaDecoratorFactory {
+public final class SchemaDecoratorFactory extends SimpleFactory<String, SchemaDecorator> {
 
 	private static SchemaDecoratorFactory instance;
 
@@ -17,15 +12,5 @@ public static SchemaDecoratorFactory getInstance() {
 				: instance;
 	}
 
-	private final Map<String, SchemaDecorator> decorators = new ConcurrentHashMap<>();
-
 	private SchemaDecoratorFactory() {}
-
-	public Optional<SchemaDecorator> getDecorator(String annotationName) {
-		return Optional.ofNullable(decorators.get(annotationName));
-	}
-
-	void register(Supplier<String> annotationName, SchemaDecorator generator) {
-		decorators.put(annotationName.get(), generator);
-	}
 }

src/main/java/io/asfjava/ui/core/SimpleFactory.java

@@ -0,0 +1,19 @@
+package io.asfjava.ui.core;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
+
+public abstract class SimpleFactory<K, V> {
+
+    private final Map<K, V> map = new ConcurrentHashMap<>();
+
+    public Optional<V> get(K key) {
+        return Optional.ofNullable(map.get(key));
+    }
+
+    void register(Supplier<K> key, V value) {
+        map.put(key.get(), value);
+    }
+}

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

@@ -12,7 +12,7 @@ final class SchemaDecoratorUtil {
 	void decorate(BeanProperty beanProperty, JsonSchema simpleTypeSchema) {
 		Iterable<Annotation> it = beanProperty.getMember().annotations();
 		it.forEach(
-				annotation -> SchemaDecoratorFactory.getInstance().getDecorator(annotation.annotationType().getName())
+				annotation -> SchemaDecoratorFactory.getInstance().get(annotation.annotationType().getName())
 						.ifPresent(decorator -> decorator.customizeSchema(beanProperty, simpleTypeSchema)));
 	}
 

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

@@ -212,7 +212,7 @@ private void buildFormDefinition(Map<Field, JsonNode> nodes, ObjectMapper mapper
 	private void buildFieldDefinition(Field field, Annotation annotation, ObjectMapper mapper,
 			Map<Field, JsonNode> nodes) {
 		ObjectNode fieldFormDefinition = mapper.createObjectNode();
-		FormDefinitionGeneratorFactory.getInstance().getGenerator(annotation.annotationType().getName())
+		FormDefinitionGeneratorFactory.getInstance().get(annotation.annotationType().getName())
 				.ifPresent(generator -> {
 					generator.generate(fieldFormDefinition, field);
 					nodes.put(field, fieldFormDefinition);