Skip to content

Commit f8134f5

Browse files
committed
🎨 Use Java 8 Features
Use Streams Api and fix some sonar violation
1 parent d781aa5 commit f8134f5

File tree

5 files changed

+11
-17
lines changed

5 files changed

+11
-17
lines changed

demo/src/main/java/io/asfjava/ui/demo/screen/DemoForm.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class DemoForm implements Serializable {
1717
@TextField(title = "First Name", placeHolder = "Your first name", description = "This is a description for your first name field")
1818
private String firstName;
1919

20-
@Tab(title = "Info", index = 1)
20+
// @Tab(title = "Info", index = 1)
2121
@TextField(title = "Last Name", placeHolder = "Your last name")
2222
private String lastName;
2323

@@ -29,23 +29,23 @@ public class DemoForm implements Serializable {
2929
@Number(title = "Number of children", placeHolder = "Number of children", description = "This is a number")
3030
private Integer number;
3131

32-
@Tab(title = "Contact", index = 2)
32+
// @Tab(title = "Contact", index = 2)
3333
@Password(title = "Password", placeHolder = "Please set you password", description = "This is password")
3434
private String password;
3535

3636
@Tab(title = "Info", index = 1)
3737
@ComboBox(title = "Gender", titleMap = GenderTitleMap.class)
3838
private String gender;
3939

40-
@Tab(title = "Additional Info", index = 3)
40+
// @Tab(title = "Additional Info", index = 3)
4141
@ComboBox(title = "Currency", values = { "euro", "dollar" })
4242
private String currency;
4343

4444
@Tab(title = "Additional Info", index = 3)
4545
@RadioBox(title = "Civil State", titleMap = CivilStateTitelsMap.class)
4646
private String civilState;
4747

48-
@Tab(title = "Contact", index = 2)
48+
// @Tab(title = "Contact", index = 2)
4949
@TextArea(title = "Address", placeHolder = "Fill your address please", description = "This is textarea")
5050
private String address;
5151

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ final class GeneratorFactoryLoader {
1717
private static Reflections reflections = new Reflections(PACKAGESCAN);
1818

1919
void load() {
20-
for (Class<? extends FormDefinitionGenerator> subType : reflections
21-
.getSubTypesOf(FormDefinitionGenerator.class)) {
22-
register(subType);
23-
}
20+
reflections.getSubTypesOf(FormDefinitionGenerator.class).forEach(instance::register);
2421
}
2522

2623
private void register(Class<? extends FormDefinitionGenerator> subType) {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ final class SchemaDecoratorLoader {
1919
private static Reflections reflections = new Reflections(PACKAGESCAN);
2020

2121
void load() {
22-
for (Class<? extends SchemaDecorator> subType : reflections.getSubTypesOf(SchemaDecorator.class)) {
23-
register(subType);
24-
}
22+
reflections.getSubTypesOf(SchemaDecorator.class).forEach(instance::register);
2523
}
2624

2725
private void register(Class<? extends SchemaDecorator> subType) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public SchemaFactoryWrapper getWrapper(SerializerProvider p) {
1515
wrapper.setProvider(p);
1616
}
1717
return wrapper;
18-
};
18+
}
1919

2020
@Override
2121
public SchemaFactoryWrapper getWrapper(SerializerProvider p, VisitorContext rvc) {
@@ -26,7 +26,7 @@ public SchemaFactoryWrapper getWrapper(SerializerProvider p, VisitorContext rvc)
2626
wrapper.setVisitorContext(rvc);
2727
return wrapper;
2828
}
29-
};
29+
}
3030

3131
CustomSchemaFactoryWrapper() {
3232
super(new SFSchemaFactoryWrapperFactory());

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public UiForm generate(Class<? extends Serializable> formDto) throws JsonMapping
3434

3535
JsonSchemaGenerator schemaGen = initSchemaGen(mapper);
3636
JsonSchema schema = generateSchema(formDto, schemaGen);
37-
Map<Field, JsonNode> nodes = initFieldFormDefinition(mapper, formDto, declaredFields);
37+
Map<Field, JsonNode> nodes = initFieldFormDefinition(mapper, declaredFields);
3838

3939
handlerGroupedFields();
4040

@@ -67,7 +67,7 @@ private ObjectNode handleTabbedFields(ObjectMapper mapper, Field[] declaredField
6767
ObjectNode tabNode = mapper.createObjectNode();
6868
tabNode.put("title", tabElements.getKey());
6969
ArrayNode tabItems = mapper.createArrayNode();
70-
tabElements.getValue().stream().forEach(fieldNode -> tabItems.add(fieldNode));
70+
tabElements.getValue().stream().forEach(tabItems::add);
7171
tabNode.put("items", tabItems);
7272
tabs.add(tabNode);
7373
});
@@ -79,8 +79,7 @@ private ObjectNode handleTabbedFields(ObjectMapper mapper, Field[] declaredField
7979

8080
}
8181

82-
private Map<Field, JsonNode> initFieldFormDefinition(ObjectMapper mapper, Class<? extends Serializable> formDto,
83-
Field[] declaredFields) {
82+
private Map<Field, JsonNode> initFieldFormDefinition(ObjectMapper mapper, Field[] declaredFields) {
8483
Map<Field, JsonNode> nodes = new HashMap<>();
8584
Arrays.stream(declaredFields).forEach(field -> buildFormDefinition(nodes, mapper, field));
8685
return nodes;

0 commit comments

Comments
 (0)