Skip to content

Commit bbe847b

Browse files
marioserrano09marioserrano09
authored
Merge pull request #53
Feature: Migrate to jackson 3
2 parents ef09dd3 + a3d3d9a commit bbe847b

File tree

80 files changed

+2516
-795
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+2516
-795
lines changed

‎examples/demo-zk-books/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<parent>
3333
<groupId>org.springframework.boot</groupId>
3434
<artifactId>spring-boot-starter-parent</artifactId>
35-
<version>4.0.2</version>
35+
<version>4.0.3</version>
3636
<relativePath/> <!-- lookup parent from repository -->
3737
</parent>
3838

@@ -47,7 +47,7 @@
4747
<timestamp>${maven.build.timestamp}</timestamp>
4848
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
4949

50-
<tools.version>26.1</tools.version>
50+
<tools.version>26.3.0</tools.version>
5151

5252
</properties>
5353

‎examples/demo-zk-books/src/main/java/mybookstore/actions/FilterBookByBuyDateAction.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package mybookstore.actions;
2+
3+
import mybookstore.domain.Book;
4+
import tools.dynamia.actions.InstallAction;
5+
import tools.dynamia.crud.AbstractCrudAction;
6+
import tools.dynamia.crud.CrudActionEvent;
7+
import tools.dynamia.ui.UIMessages;
8+
9+
import java.time.LocalDate;
10+
11+
@InstallAction
12+
public class FilterBookByBuyDateAction extends AbstractCrudAction {
13+
14+
public FilterBookByBuyDateAction() {
15+
setName("Filter By Buy Date");
16+
setApplicableClass(Book.class);
17+
setImage("calendar");
18+
setType("primary");
19+
setPosition(1);
20+
}
21+
22+
@Override
23+
public void actionPerformed(CrudActionEvent evt) {
24+
UIMessages.showInput("Select Buy Date", LocalDate.class, date -> {
25+
if (date != null) {
26+
evt.getController().setParemeter("buyDate", date); //set parameter with the selected date
27+
evt.getController().doQuery(); //execute query with the new parameter
28+
}
29+
});
30+
}
31+
}

‎examples/demo-zk-books/src/main/java/mybookstore/actions/FilterBookByPublishDateAction.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package mybookstore.actions;
2+
3+
import mybookstore.domain.Book;
4+
import tools.dynamia.actions.InstallAction;
5+
import tools.dynamia.commons.LocalDateRange;
6+
import tools.dynamia.crud.AbstractCrudAction;
7+
import tools.dynamia.crud.CrudActionEvent;
8+
import tools.dynamia.domain.query.QueryConditions;
9+
import tools.dynamia.zk.actions.LocalDateboxRangeActionRenderer;
10+
11+
@InstallAction
12+
public class FilterBookByPublishDateAction extends AbstractCrudAction {
13+
14+
public FilterBookByPublishDateAction() {
15+
setRenderer(new LocalDateboxRangeActionRenderer()); //use a renderer that provides a date range input
16+
setApplicableClass(Book.class);
17+
setAlwaysVisible(true);
18+
}
19+
20+
@Override
21+
public void actionPerformed(CrudActionEvent evt) {
22+
if(evt.getData() instanceof LocalDateRange dateRange && !dateRange.isNull()){
23+
evt.getController().setParemeter("publishDate", QueryConditions.between(dateRange)); //set parameter with a between condition
24+
evt.getController().doQuery(); //execute query with the new parameter
25+
}
26+
}
27+
}

‎examples/demo-zk-books/src/main/java/mybookstore/domain/Book.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package mybookstore.domain;
1919

20+
import com.fasterxml.jackson.annotation.JsonIgnore;
2021
import jakarta.persistence.*;
2122
import jakarta.validation.constraints.NotEmpty;
2223
import jakarta.validation.constraints.NotNull;
@@ -72,6 +73,7 @@ public class Book extends BaseEntity {
7273
private double discount;//percent
7374

7475
@Transient
76+
@JsonIgnore
7577
private boolean selected;
7678

7779

‎examples/demo-zk-books/src/main/resources/META-INF/descriptors/CategoryJson.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ fields:
66
name:
77
description:
88
subcategories:
9+
parent.id:
10+
911

1012
params:
1113
conditions:

‎examples/demo-zk-books/src/test/api/categories.http‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
@baseUrl=http://localhost:8484/api/library/categories
2+
3+
### List categories
4+
GET {{baseUrl}}
5+
6+
### Create category
7+
POST {{baseUrl}}
8+
content-type: application/json
9+
10+
{
11+
"name": "{{$random.book.genre}}",
12+
"parent": {
13+
"id": 1
14+
}
15+
}
16+
17+
### Get category by id
18+
GET {{baseUrl}}/1
19+
20+
21+
### Get category by id not found
22+
GET {{baseUrl}}/133333333
23+
24+
25+
### List categories metadata
26+
GET {{baseUrl}}?_metadata
27+
28+
29+
### Filter categories by name
30+
GET {{baseUrl}}?name=Programmin

‎extensions/dashboard/sources/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>tools.dynamia.modules</groupId>
2525
<artifactId>tools.dynamia.modules.parent</artifactId>
26-
<version>26.2.3</version>
26+
<version>26.3.0</version>
2727
<relativePath>../../pom.xml</relativePath>
2828
</parent>
2929

@@ -38,12 +38,12 @@
3838
<dependency>
3939
<groupId>tools.dynamia</groupId>
4040
<artifactId>tools.dynamia.zk</artifactId>
41-
<version>26.2.3</version>
41+
<version>26.3.0</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>tools.dynamia.modules</groupId>
4545
<artifactId>tools.dynamia.modules.saas.api</artifactId>
46-
<version>26.2.3</version>
46+
<version>26.3.0</version>
4747
</dependency>
4848
</dependencies>
4949

‎extensions/email-sms/sources/core/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>tools.dynamia.modules.email.parent</artifactId>
2525
<groupId>tools.dynamia.modules</groupId>
26-
<version>26.2.3</version>
26+
<version>26.3.0</version>
2727
</parent>
2828

2929
<artifactId>tools.dynamia.modules.email</artifactId>
@@ -50,12 +50,12 @@
5050
<dependency>
5151
<groupId>tools.dynamia</groupId>
5252
<artifactId>tools.dynamia.domain.jpa</artifactId>
53-
<version>26.2.3</version>
53+
<version>26.3.0</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>tools.dynamia</groupId>
5757
<artifactId>tools.dynamia.templates</artifactId>
58-
<version>26.2.3</version>
58+
<version>26.3.0</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>org.springframework</groupId>

‎extensions/email-sms/sources/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>tools.dynamia.modules</groupId>
2525
<artifactId>tools.dynamia.modules.parent</artifactId>
26-
<version>26.2.3</version>
26+
<version>26.3.0</version>
2727
<relativePath>../../pom.xml</relativePath>
2828
</parent>
2929

@@ -85,7 +85,7 @@
8585
<dependency>
8686
<groupId>tools.dynamia.modules</groupId>
8787
<artifactId>tools.dynamia.modules.saas.jpa</artifactId>
88-
<version>26.2.3</version>
88+
<version>26.3.0</version>
8989
</dependency>
9090

9191

‎extensions/email-sms/sources/ui/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>tools.dynamia.modules.email.parent</artifactId>
2424
<groupId>tools.dynamia.modules</groupId>
25-
<version>26.2.3</version>
25+
<version>26.3.0</version>
2626
</parent>
2727

2828
<name>DynamiaModules - Email UI</name>
@@ -34,12 +34,12 @@
3434
<dependency>
3535
<groupId>tools.dynamia</groupId>
3636
<artifactId>tools.dynamia.zk</artifactId>
37-
<version>26.2.3</version>
37+
<version>26.3.0</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>tools.dynamia.modules</groupId>
4141
<artifactId>tools.dynamia.modules.email</artifactId>
42-
<version>26.2.3</version>
42+
<version>26.3.0</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>tools.dynamia.zk.addons</groupId>

0 commit comments

Comments
 (0)