Commit a3df3ff

authored

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

🐛 Patch 1.0.1

2 parents e300f8c + d321354 commit a3df3ffCopy full SHA for a3df3ff

File tree

2 files changed

+13

-8

lines changed

pom.xml
src/main/java/io/asfjava/ui/core/schema
- UiFormSchemaGenerator.java

2 files changed

+13

-8

lines changed

`‎pom.xml`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`<groupId>io.sfjava.ui</groupId>`
`5`	`5`	`<artifactId>sf-java-ui</artifactId>`
`6`		`- <version>1.0.1-SNAPSHOT</version>`
	`6`	`+ <version>1.0.2-SNAPSHOT</version>`
`7`	`7`	`<packaging>jar</packaging>`
`8`	`8`
`9`	`9`	`<name>sf-java-ui</name>`

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

Lines changed: 12 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import java.io.Serializable;`
`4`	`4`	`import java.lang.annotation.Annotation;`
`5`	`5`	`import java.lang.reflect.Field;`
	`6`	`+import java.lang.reflect.Modifier;`
`6`	`7`	`import java.util.ArrayList;`
`7`	`8`	`import java.util.Arrays;`
`8`	`9`	`import java.util.Comparator;`
`@@ -12,9 +13,12 @@`
`12`	`13`	`import java.util.Map;`
`13`	`14`	`import java.util.Map.Entry;`
`14`	`15`	`import java.util.Optional;`
	`16`	`+import java.util.Set;`
`15`	`17`	`import java.util.function.Predicate;`
`16`	`18`	`import java.util.stream.Collectors;`
`17`	`19`
	`20`	`+import org.reflections.ReflectionUtils;`
	`21`	`+`
`18`	`22`	`import com.fasterxml.jackson.databind.JsonMappingException;`
`19`	`23`	`import com.fasterxml.jackson.databind.JsonNode;`
`20`	`24`	`import com.fasterxml.jackson.databind.ObjectMapper;`
`@@ -43,7 +47,8 @@ public final class UiFormSchemaGenerator {`
`43`	`47`	`private static UiFormSchemaGenerator instance;`
`44`	`48`
`45`	`49`	`public UiForm generate(Class<? extends Serializable> formDto) throws JsonMappingException {`
`46`		`- Field[] declaredFields = formDto.getDeclaredFields();`
	`50`	`+ Set<Field> declaredFields = ReflectionUtils.getAllFields(formDto,`
	`51`	`+ field -> !Modifier.isStatic(field.getModifiers()));`
`47`	`52`	`ObjectMapper mapper = new ObjectMapper();`
`48`	`53`
`49`	`54`	`JsonSchemaGenerator schemaGen = initSchemaGen(mapper);`
`@@ -105,13 +110,13 @@ private ObjectNode buildActionNode(ObjectMapper mapper, Action action) {`
`105`	`110`	`return node;`
`106`	`111`	`}`
`107`	`112`
`108`		`- private ObjectNode handlerGroupedFields(ObjectMapper mapper, Field[] declaredFields,`
	`113`	`+ private ObjectNode handlerGroupedFields(ObjectMapper mapper, Set<Field> declaredFields,`
`109`	`114`	`Map<Field, JsonNode> sortedNodes) {`
`110`	`115`	`Predicate<? super Field> checkFieldSetAnnotation = field -> field.isAnnotationPresent(FieldSet.class);`
`111`	`116`
`112`	`117`	`Map<String, List<JsonNode>> groupedFields = new LinkedHashMap<>();`
`113`	`118`
`114`		`- Arrays.stream(declaredFields).filter(checkFieldSetAnnotation)`
	`119`	`+ declaredFields.stream().filter(checkFieldSetAnnotation)`
`115`	`120`	`.forEach(field -> groupFieldsByTab(sortedNodes, field, groupedFields));`
`116`	`121`
`117`	`122`	`ArrayNode groups = mapper.createArrayNode();`
`@@ -123,7 +128,7 @@ private ObjectNode handlerGroupedFields(ObjectMapper mapper, Field[] declaredFie`
`123`	`128`
`124`	`129`	`}`
`125`	`130`
`126`		`- private ObjectNode handleTabbedFields(ObjectMapper mapper, Field[] declaredFields, Map<Field, JsonNode> nodes) {`
	`131`	`+ private ObjectNode handleTabbedFields(ObjectMapper mapper, Set<Field> declaredFields, Map<Field, JsonNode> nodes) {`
`127`	`132`	`Predicate<? super Field> checkTabAnnotation = field -> field.isAnnotationPresent(Tab.class);`
`128`	`133`
`129`	`134`	`Comparator<? super Field> tabIndexComparator = (field1, field2) -> Integer`
`@@ -138,7 +143,7 @@ private ObjectNode handleTabbedFields(ObjectMapper mapper, Field[] declaredField`
`138`	`143`
`139`	`144`	`Map<String, List<JsonNode>> groupedFieldsByTab = new LinkedHashMap<>();`
`140`	`145`
`141`		`- Arrays.stream(declaredFields).filter(checkTabAnnotation).sorted(fieldIndexComparator).sorted(tabIndexComparator)`
	`146`	`+ declaredFields.stream().filter(checkTabAnnotation).sorted(fieldIndexComparator).sorted(tabIndexComparator)`
`142`	`147`	`.forEach(field -> groupFieldsByTab(nodes, field, groupedFieldsByTab));`
`143`	`148`
`144`	`149`	`ArrayNode tabs = mapper.createArrayNode();`
`@@ -161,10 +166,10 @@ private ObjectNode handleTabbedFields(ObjectMapper mapper, Field[] declaredField`
`161`	`166`
`162`	`167`	`}`
`163`	`168`
`164`		`- private Map<Field, JsonNode> initFieldsFormDefinition(ObjectMapper mapper, Field[] declaredFields) {`
	`169`	`+ private Map<Field, JsonNode> initFieldsFormDefinition(ObjectMapper mapper, Set<Field> declaredFields) {`
`165`	`170`	`Map<Field, JsonNode> nodes = new HashMap<>();`
`166`	`171`
`167`		`- Arrays.stream(declaredFields).forEach(field -> buildFormDefinition(nodes, mapper, field));`
	`172`	`+ declaredFields.forEach(field -> buildFormDefinition(nodes, mapper, field));`
`168`	`173`
`169`	`174`	`return nodes;`
`170`	`175`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a3df3ff

File tree

2 files changed

2 files changed

`‎pom.xml`

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

0 commit comments