Merge pull request #80 from JsonSchema-JavaUI/patch-1.0.1

🐛 Patch 1.0.1

Author: SaifJerbi

pom.xml

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

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

@@ -3,6 +3,7 @@
 importjava.io.Serializable;
 importjava.lang.annotation.Annotation;
 importjava.lang.reflect.Field;
+importjava.lang.reflect.Modifier;
 importjava.util.ArrayList;
 importjava.util.Arrays;
 importjava.util.Comparator;
@@ -12,9 +13,12 @@
 importjava.util.Map;
 importjava.util.Map.Entry;
 importjava.util.Optional;
+importjava.util.Set;
 importjava.util.function.Predicate;
 importjava.util.stream.Collectors;
 
+importorg.reflections.ReflectionUtils;
+
 importcom.fasterxml.jackson.databind.JsonMappingException;
 importcom.fasterxml.jackson.databind.JsonNode;
 importcom.fasterxml.jackson.databind.ObjectMapper;
@@ -43,7 +47,8 @@ public final class UiFormSchemaGenerator {
 privatestaticUiFormSchemaGeneratorinstance;
 
 publicUiFormgenerate(Class<? extendsSerializable> formDto) throwsJsonMappingException {
-Field[] declaredFields = formDto.getDeclaredFields();
+Set<Field> declaredFields = ReflectionUtils.getAllFields(formDto,
+field -> !Modifier.isStatic(field.getModifiers()));
 ObjectMappermapper = newObjectMapper();
 
 JsonSchemaGeneratorschemaGen = initSchemaGen(mapper);
@@ -105,13 +110,13 @@ private ObjectNode buildActionNode(ObjectMapper mapper, Action action) {
 returnnode;
  }
 
-privateObjectNodehandlerGroupedFields(ObjectMappermapper, Field[]declaredFields,
+privateObjectNodehandlerGroupedFields(ObjectMappermapper, Set<Field>declaredFields,
 Map<Field, JsonNode> sortedNodes) {
 Predicate<? superField> checkFieldSetAnnotation = field -> field.isAnnotationPresent(FieldSet.class);
 
 Map<String, List<JsonNode>> groupedFields = newLinkedHashMap<>();
 
-Arrays.stream(declaredFields).filter(checkFieldSetAnnotation)
+declaredFields.stream().filter(checkFieldSetAnnotation)
  .forEach(field -> groupFieldsByTab(sortedNodes, field, groupedFields));
 
 ArrayNodegroups = mapper.createArrayNode();
@@ -123,7 +128,7 @@ private ObjectNode handlerGroupedFields(ObjectMapper mapper, Field[] declaredFie
 
  }
 
-privateObjectNodehandleTabbedFields(ObjectMappermapper, Field[]declaredFields, Map<Field, JsonNode> nodes) {
+privateObjectNodehandleTabbedFields(ObjectMappermapper, Set<Field>declaredFields, Map<Field, JsonNode> nodes) {
 Predicate<? superField> checkTabAnnotation = field -> field.isAnnotationPresent(Tab.class);
 
 Comparator<? superField> tabIndexComparator = (field1, field2) -> Integer
@@ -138,7 +143,7 @@ private ObjectNode handleTabbedFields(ObjectMapper mapper, Field[] declaredField
 
 Map<String, List<JsonNode>> groupedFieldsByTab = newLinkedHashMap<>();
 
-Arrays.stream(declaredFields).filter(checkTabAnnotation).sorted(fieldIndexComparator).sorted(tabIndexComparator)
+declaredFields.stream().filter(checkTabAnnotation).sorted(fieldIndexComparator).sorted(tabIndexComparator)
  .forEach(field -> groupFieldsByTab(nodes, field, groupedFieldsByTab));
 
 ArrayNodetabs = mapper.createArrayNode();
@@ -161,10 +166,10 @@ private ObjectNode handleTabbedFields(ObjectMapper mapper, Field[] declaredField
 
  }
 
-privateMap<Field, JsonNode> initFieldsFormDefinition(ObjectMappermapper, Field[]declaredFields) {
+privateMap<Field, JsonNode> initFieldsFormDefinition(ObjectMappermapper, Set<Field>declaredFields) {
 Map<Field, JsonNode> nodes = newHashMap<>();
 
-Arrays.stream(declaredFields).forEach(field -> buildFormDefinition(nodes, mapper, field));
+declaredFields.forEach(field -> buildFormDefinition(nodes, mapper, field));
 
 returnnodes;
  }