Skip to content

Commit 32d4516

Browse files
marioserrano09marioserrano09
authored
Merge pull request #44 from dynamiatools/5.4.x
Long Operations Improvements
2 parents adfb8bf + 8976cc3 commit 32d4516

File tree

32 files changed

+969
-535
lines changed

32 files changed

+969
-535
lines changed

‎actions/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
<parent>
2424
<groupId>tools.dynamia</groupId>
2525
<artifactId>tools.dynamia.parent</artifactId>
26-
<version>5.4.11</version>
26+
<version>5.4.12</version>
2727
</parent>
2828

2929
<artifactId>tools.dynamia.actions</artifactId>
30-
<version>5.4.11</version>
30+
<version>5.4.12</version>
3131
<name>DynamiaTools - Actions</name>
3232
<url>https://dynamia.tools/docs/actions</url>
3333

@@ -65,12 +65,12 @@
6565
<dependency>
6666
<groupId>tools.dynamia</groupId>
6767
<artifactId>tools.dynamia.integration</artifactId>
68-
<version>5.4.11</version>
68+
<version>5.4.12</version>
6969
</dependency>
7070
<dependency>
7171
<groupId>tools.dynamia</groupId>
7272
<artifactId>tools.dynamia.commons</artifactId>
73-
<version>5.4.11</version>
73+
<version>5.4.12</version>
7474
</dependency>
7575

7676
</dependencies>

‎app/pom.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
<parent>
2424
<groupId>tools.dynamia</groupId>
2525
<artifactId>tools.dynamia.parent</artifactId>
26-
<version>5.4.11</version>
26+
<version>5.4.12</version>
2727
</parent>
2828

2929
<artifactId>tools.dynamia.app</artifactId>
30-
<version>5.4.11</version>
30+
<version>5.4.12</version>
3131
<name>DynamiaTools - App</name>
3232
<url>https://dynamia.tools/docs/app</url>
3333

@@ -74,58 +74,58 @@
7474
<dependency>
7575
<groupId>tools.dynamia</groupId>
7676
<artifactId>tools.dynamia.actions</artifactId>
77-
<version>5.4.11</version>
77+
<version>5.4.12</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>tools.dynamia</groupId>
8181
<artifactId>tools.dynamia.commons</artifactId>
82-
<version>5.4.11</version>
82+
<version>5.4.12</version>
8383
</dependency>
8484
<dependency>
8585
<groupId>tools.dynamia</groupId>
8686
<artifactId>tools.dynamia.crud</artifactId>
87-
<version>5.4.11</version>
87+
<version>5.4.12</version>
8888
</dependency>
8989
<dependency>
9090
<groupId>tools.dynamia</groupId>
9191
<artifactId>tools.dynamia.domain</artifactId>
92-
<version>5.4.11</version>
92+
<version>5.4.12</version>
9393
</dependency>
9494
<dependency>
9595
<groupId>tools.dynamia</groupId>
9696
<artifactId>tools.dynamia.integration</artifactId>
97-
<version>5.4.11</version>
97+
<version>5.4.12</version>
9898
</dependency>
9999
<dependency>
100100
<groupId>tools.dynamia</groupId>
101101
<artifactId>tools.dynamia.io</artifactId>
102-
<version>5.4.11</version>
102+
<version>5.4.12</version>
103103
</dependency>
104104
<dependency>
105105
<groupId>tools.dynamia</groupId>
106106
<artifactId>tools.dynamia.navigation</artifactId>
107-
<version>5.4.11</version>
107+
<version>5.4.12</version>
108108
</dependency>
109109
<dependency>
110110
<groupId>tools.dynamia</groupId>
111111
<artifactId>tools.dynamia.reports</artifactId>
112-
<version>5.4.11</version>
112+
<version>5.4.12</version>
113113
</dependency>
114114
<dependency>
115115
<groupId>tools.dynamia</groupId>
116116
<artifactId>tools.dynamia.templates</artifactId>
117-
<version>5.4.11</version>
117+
<version>5.4.12</version>
118118
</dependency>
119119

120120
<dependency>
121121
<groupId>tools.dynamia</groupId>
122122
<artifactId>tools.dynamia.viewers</artifactId>
123-
<version>5.4.11</version>
123+
<version>5.4.12</version>
124124
</dependency>
125125
<dependency>
126126
<groupId>tools.dynamia</groupId>
127127
<artifactId>tools.dynamia.web</artifactId>
128-
<version>5.4.11</version>
128+
<version>5.4.12</version>
129129
</dependency>
130130
<dependency>
131131
<groupId>org.springframework.data</groupId>
@@ -208,7 +208,7 @@
208208
<dependency>
209209
<groupId>tools.dynamia</groupId>
210210
<artifactId>tools.dynamia.domain.jpa</artifactId>
211-
<version>5.4.11</version>
211+
<version>5.4.12</version>
212212
<scope>test</scope>
213213
</dependency>
214214
<dependency>

‎app/src/main/java/tools/dynamia/app/controllers/CrudServiceRestController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package tools.dynamia.app.controllers;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
4-
import com.fasterxml.jackson.databind.ObjectMapper;
4+
import com.fasterxml.jackson.databind.json.JsonMapper;
55
import io.swagger.v3.oas.annotations.tags.Tag;
66
import org.springframework.http.ResponseEntity;
77
import org.springframework.web.bind.annotation.*;
@@ -43,7 +43,7 @@ public class CrudServiceRestController {
4343
/**
4444
* JSON object mapper for entity serialization/deserialization.
4545
*/
46-
private final ObjectMapper mapper = StringPojoParser.createJsonMapper();
46+
private final JsonMapper mapper = StringPojoParser.createJsonMapper();
4747

4848
/**
4949
* Constructs a new {@code CrudServiceRestController} with the given CRUD service.

‎commons/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@
2222

2323
<artifactId>tools.dynamia.commons</artifactId>
2424
<packaging>jar</packaging>
25-
<version>5.4.11</version>
2625
<parent>
2726
<groupId>tools.dynamia</groupId>
2827
<artifactId>tools.dynamia.parent</artifactId>
29-
<version>5.4.11</version>
28+
<version>5.4.12</version>
3029
</parent>
3130
<name>DynamiaTools - Commons</name>
3231
<url>https://dynamia.tools/docs/common</url>

‎commons/src/main/java/tools/dynamia/commons/StringPojoParser.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.fasterxml.jackson.core.JsonProcessingException;
2121
import com.fasterxml.jackson.core.type.TypeReference;
2222
import com.fasterxml.jackson.databind.JavaType;
23-
import com.fasterxml.jackson.databind.ObjectMapper;
2423
import com.fasterxml.jackson.databind.SerializationFeature;
2524
import com.fasterxml.jackson.databind.json.JsonMapper;
2625
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
@@ -53,19 +52,19 @@ public static String convertMapToJson(Map map) {
5352
if (map == null || map.isEmpty()) {
5453
return "";
5554
}
56-
ObjectMapper jsonMapper = createJsonMapper();
55+
var jsonMapper = createJsonMapper();
5756
return jsonMapper.writeValueAsString(map);
5857
} catch (JsonProcessingException e) {
5958
throw new JsonParsingException(e);
6059
}
6160
}
6261

6362
/**
64-
* Creates a configured JSON {@link ObjectMapper} with indentation, disabled empty beans, and JavaTimeModule support.
63+
* Creates a configured JSON {@link JsonMapper} with indentation, disabled empty beans, and JavaTimeModule support.
6564
*
6665
* @return the configured JSON ObjectMapper
6766
*/
68-
public static ObjectMapper createJsonMapper() {
67+
public static JsonMapper createJsonMapper() {
6968
return JsonMapper.builder()
7069
.enable(SerializationFeature.INDENT_OUTPUT)
7170
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
@@ -85,7 +84,7 @@ public static String convertPojoToJson(Object pojo) {
8584
if (pojo == null) {
8685
return "";
8786
}
88-
ObjectMapper jsonMapper = createJsonMapper();
87+
var jsonMapper = createJsonMapper();
8988
return jsonMapper.writeValueAsString(pojo);
9089
} catch (JsonProcessingException e) {
9190
throw new JsonParsingException(e);
@@ -141,7 +140,7 @@ public static <T> T parseJsonToPojo(String json, Class<T> pojoType) {
141140
return null;
142141
}
143142

144-
ObjectMapper jsonMapper = createJsonMapper();
143+
var jsonMapper = createJsonMapper();
145144
return jsonMapper.readerFor(pojoType).readValue(json);
146145
} catch (IOException e) {
147146
throw new JsonParsingException(e);
@@ -161,7 +160,7 @@ public static <T> T parseJsonToPojo(Map map, Class<T> pojoType) {
161160
return null;
162161
}
163162

164-
ObjectMapper jsonMapper = createJsonMapper();
163+
var jsonMapper = createJsonMapper();
165164
return jsonMapper.convertValue(map, pojoType);
166165
} catch (IllegalArgumentException e) {
167166
throw new JsonParsingException(e);
@@ -184,12 +183,12 @@ public static String convertPojoToXml(Object pojo) {
184183
}
185184

186185
/**
187-
* Create a xml {@link ObjectMapper} with enable IDENT_OUTPUT and disabled FAIL_ON_EMPTY_BEANS. Also add support
186+
* Create a xml {@link XmlMapper} with enable IDENT_OUTPUT and disabled FAIL_ON_EMPTY_BEANS. Also add support
188187
* to {@link JavaTimeModule} from JSR310 dependency
189188
*
190-
* @return xml ObjectMapper
189+
* @return xml mapper
191190
*/
192-
public static ObjectMapper createXmlMapper() {
191+
public static XmlMapper createXmlMapper() {
193192
return XmlMapper.builder()
194193
.enable(SerializationFeature.INDENT_OUTPUT)
195194
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
@@ -244,7 +243,7 @@ public static <T> String convertListToJson(List<T> list) {
244243
if (list == null || list.isEmpty()) {
245244
return "";
246245
}
247-
ObjectMapper jsonMapper = createJsonMapper();
246+
var jsonMapper = createJsonMapper();
248247
return jsonMapper.writeValueAsString(list);
249248
} catch (JsonProcessingException e) {
250249
throw new JsonParsingException(e);

0 commit comments

Comments
 (0)