🎨 Use Java 8 Features

Use java.util.Optional.ifPresent method in order to avoid
nullPointerException

Author: SaifJerbi

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

@@ -1,14 +1,15 @@
 package io.asfjava.ui.core;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
 import io.asfjava.ui.core.generators.FormDefinitionGenerator;
 
 public final class FormDefinitionGeneratorFactory {
 
-	public FormDefinitionGenerator getGenerator(String annotationName) {
-		return GENERATORS.get(annotationName);
+	public Optional<FormDefinitionGenerator> getGenerator(String annotationName) {
+		return Optional.ofNullable(GENERATORS.get(annotationName));
 	}
 
 	void register(String annotationName, FormDefinitionGenerator generator) {

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

@@ -13,7 +13,6 @@
 import com.fasterxml.jackson.module.jsonSchema.JsonSchemaGenerator;
 
 import io.asfjava.ui.core.FormDefinitionGeneratorFactory;
-import io.asfjava.ui.core.generators.FormDefinitionGenerator;
 import io.asfjava.ui.dto.UiForm;
 
 public final class UiFormSchemaGenerator {
@@ -40,12 +39,11 @@ private void buildFormDefinition(ObjectMapper mapper, ArrayNode formDefinitions,
 	private void buildFieldDefinition(Field field, Annotation annotation, ObjectMapper mapper,
 			ArrayNode formDefinitions) {
 		ObjectNode fieldFormDefinition = mapper.createObjectNode();
-		FormDefinitionGenerator generator = FormDefinitionGeneratorFactory.getInstance()
-				.getGenerator(annotation.annotationType().getName());
-		if (generator != null) {
-			generator.generate(fieldFormDefinition, field);
-			formDefinitions.add(fieldFormDefinition);
-		}
+		FormDefinitionGeneratorFactory.getInstance().getGenerator(annotation.annotationType().getName())
+				.ifPresent(generator -> {
+					generator.generate(fieldFormDefinition, field);
+					formDefinitions.add(fieldFormDefinition);
+				});
 	}
 
 	public static UiFormSchemaGenerator get() {