adding allfieldsDisplay support #75

cleaner solution

Author: SaifJerbi

demo/pom.xml

@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>io.sfjava.ui</groupId>
 			<artifactId>sf-java-ui</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

demo/src/main/java/io/asfjava/ui/demo/renderer/UiDemoRenderer.java

@@ -6,11 +6,12 @@
 
 import io.asfjava.ui.core.schema.UiFormSchemaGenerator;
 import io.asfjava.ui.demo.screen.DemoForm;
+import io.asfjava.ui.demo.screen.dto.Event;
 import io.asfjava.ui.dto.UiForm;
 
 @Service
 public class UiDemoRenderer {
 	public UiForm renderForm() throws JsonMappingException {
-		return UiFormSchemaGenerator.get().generate(DemoForm.class);
+		return UiFormSchemaGenerator.get().generate(Event.class);
 	}
 }

demo/src/main/java/io/asfjava/ui/demo/screen/dto/Event.java

@@ -0,0 +1,46 @@
+package io.asfjava.ui.demo.screen.dto;
+
+import java.io.Serializable;
+
+import io.asfjava.ui.core.form.DisplayAllFields;
+import io.asfjava.ui.core.form.Index;
+import io.asfjava.ui.core.form.TextField;
+
+@DisplayAllFields
+public class Event implements Serializable {
+
+	@Index(0)
+	@TextField(title = "Title", placeHolder = "Event's title")
+	private String title;
+
+	@Index(2)
+	@TextField(title = "Location", placeHolder = "Event's location")
+	private String location;
+
+	@Index(1)
+	private Speaker speaker;
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getLocation() {
+		return location;
+	}
+
+	public void setLocation(String location) {
+		this.location = location;
+	}
+
+	public Speaker getSpeaker() {
+		return speaker;
+	}
+
+	public void setSpeaker(Speaker speaker) {
+		this.speaker = speaker;
+	}
+}

demo/src/main/java/io/asfjava/ui/demo/screen/dto/Speaker.java

@@ -0,0 +1,31 @@
+package io.asfjava.ui.demo.screen.dto;
+
+public class Speaker {
+	private String fullName;
+	private String nationality;
+	private String description;
+
+	public String getFullName() {
+		return fullName;
+	}
+
+	public void setFullName(String fullName) {
+		this.fullName = fullName;
+	}
+
+	public String getNationality() {
+		return nationality;
+	}
+
+	public void setNationality(String nationality) {
+		this.nationality = nationality;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+}

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>io.sfjava.ui</groupId>
 	<artifactId>sf-java-ui</artifactId>
-	<version>1.0.1-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>sf-java-ui</name>

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

@@ -13,7 +13,6 @@
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -62,25 +61,21 @@ public UiForm generate(Class<? extends Serializable> formDto) throws JsonMapping
 
 		ArrayNode formDefinition = mapper.createArrayNode();
 		tabbedFields.ifPresent(formDefinition::add);
-		sortedNodes.entrySet().stream().forEach(nodesElement -> formDefinition.add(nodesElement.getValue()));
-
-		if (formDto.getDeclaredAnnotation(DisplayAllFields.class) != null) {
-			// check if fields is not handled and haven't jackson json ignore annotation
-			List<Field> unannotatedFiedls = Arrays.stream(declaredFields)
-					.filter(field -> !nodes.containsKey(field) && !field.isAnnotationPresent(JsonIgnore.class))
-					.collect(Collectors.toList());
-			handleUnAnnotatedFields(formDefinition, unannotatedFiedls);
-		}
+
+		sortedNodes.entrySet().stream().forEach(nodesElement -> {
+			if (nodesElement.getValue() != null) {
+				formDefinition.add(nodesElement.getValue());
+			} else if (formDto.getDeclaredAnnotation(DisplayAllFields.class) != null) {
+				// if no definition it must be added as key to the form definition
+				formDefinition.add(nodesElement.getKey().getName());
+			}
+		});
 
 		handleActionsAnnotation(mapper, formDto, formDefinition);
 
 		return new UiForm(schema, formDefinition);
 	}
 
-	private void handleUnAnnotatedFields(ArrayNode formDefinition, List<Field> unannotatedFiedls) {
-		unannotatedFiedls.stream().forEach(field -> formDefinition.add(field.getName()));
-	}
-
 	private void handleActionsAnnotation(ObjectMapper mapper, Class<? extends Serializable> formDto,
 			ArrayNode formDefinition) {
 		ObjectNode groupedActionsNode = mapper.createObjectNode();
@@ -180,6 +175,12 @@ private Map<Field, JsonNode> initFieldsFormDefinition(ObjectMapper mapper, Field
 
 		Arrays.stream(declaredFields).forEach(field -> buildFormDefinition(nodes, mapper, field));
 
+		// check if fields is not handled and haven't jackson json ignore annotation it
+		// must be added
+		Arrays.stream(declaredFields)
+				.filter(field -> !nodes.containsKey(field) && !field.isAnnotationPresent(JsonIgnore.class))
+				.forEach(field -> nodes.put(field, null));
+
 		return nodes;
 	}
 
@@ -229,9 +230,9 @@ private Map<Field, JsonNode> reorderFieldsBasedOnIndex(Map<Field, JsonNode> node
 					field2Index != null ? field2Index.value() : Integer.MAX_VALUE);
 		};
 
-		return nodes.entrySet().stream().sorted(tabIndexComparator).collect(Collectors.toMap(Map.Entry::getKey,
-				Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new));
-
+		return nodes.entrySet().stream().sorted(tabIndexComparator).collect(LinkedHashMap::new,
+				(result, currentElement) -> result.put(currentElement.getKey(), currentElement.getValue()),
+				Map::putAll);
 	}
 
 	public static UiFormSchemaGenerator get() {