Skip to content

Commit f81c7d1

Browse files
renovate[bot]gjong
andauthored
Update Non-major dependency updates (#65)
* Update Non-major dependency updates * Refactor JsonRecordSerializer and add canHandle method Streamline the JSON serialization process by removing redundant variable declarations and adding object type name. Introduce the canHandle method to enhance validation logic for typed values, ensuring only supported types are processed. --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Gerben Jongerius <g.jongerius@jong-soft.com>
1 parent 5b2db85 commit f81c7d1

File tree

2 files changed

+26
-15
lines changed

2 files changed

+26
-15
lines changed

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/camunda/JsonRecordSerializer.java

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,15 @@ public String getSerializationDataformat() {
3939
public TypedValue convertToTypedValue(UntypedValueImpl untypedValue) {
4040
logger.trace("Converting untyped value to typed value: {}", untypedValue.getValue().getClass().getSimpleName());
4141

42-
var importJobSettings = (Record) untypedValue.getValue();
43-
String jsonString;
4442
try {
45-
jsonString = objectMapper.writeValueAsString(importJobSettings);
43+
var jsonString = objectMapper.writeValueAsString(untypedValue.getValue());
44+
return Variables.serializedObjectValue(jsonString)
45+
.objectTypeName(supportedClass.getName())
46+
.serializationDataFormat("application/json")
47+
.create();
4648
} catch (IOException e) {
4749
throw new RuntimeException("Could not serialize ImportJobSettings", e);
4850
}
49-
50-
return Variables.serializedObjectValue(jsonString)
51-
.serializationDataFormat("application/json")
52-
.create();
5351
}
5452

5553
@Override
@@ -72,9 +70,22 @@ public TypedValue readValue(ValueFields valueFields, boolean b, boolean b1) {
7270
}
7371
}
7472

73+
@Override
74+
public boolean canHandle(TypedValue value) {
75+
if (value instanceof ObjectValue objectValue) {
76+
return supportedClass.getName().equals(objectValue.getObjectTypeName());
77+
}
78+
79+
return canWriteValue(value);
80+
}
81+
7582
@Override
7683
protected boolean canWriteValue(TypedValue typedValue) {
77-
logger.trace("Checking if value can be written: {}", typedValue.getValue().getClass().getSimpleName());
78-
return supportedClass.isInstance(typedValue.getValue());
84+
if (typedValue instanceof UntypedValueImpl) {
85+
logger.trace("Checking if un-typed value can be written: {}", typedValue.getValue().getClass().getSimpleName());
86+
return supportedClass.isInstance(typedValue.getValue());
87+
}
88+
89+
return false;
7990
}
8091
}

settings.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ rootProject.name="Pledger"
33
pluginManagement {
44
plugins {
55
id("java")
6-
id("io.micronaut.library").version("4.4.3")
7-
id("io.micronaut.application").version("4.4.3")
6+
id("io.micronaut.library").version("4.4.4")
7+
id("io.micronaut.application").version("4.4.4")
88
id("io.freefair.lombok").version("8.10.2")
99
id("org.sonarqube").version("5.1.0.4882")
1010
id("org.openapi.generator").version("7.9.0")
@@ -25,14 +25,14 @@ dependencyResolutionManagement {
2525
library("lang", "com.jongsoft.lang", "language").version("1.1.6")
2626
library("lang.xml", "com.jongsoft.lang", "language-fasterxml").version("1.1.0")
2727
library("otp", "dev.samstevens.totp", "totp").version("1.7.1")
28-
library("camunda", "org.camunda.bpm", "camunda-engine").version("7.21.0")
29-
library("bouncy", "org.bouncycastle", "bcprov-jdk18on").version("1.78.1")
30-
library("bcpkix", "org.bouncycastle", "bcpkix-jdk18on").version("1.78.1")
28+
library("camunda", "org.camunda.bpm", "camunda-engine").version("7.22.0")
29+
library("bouncy", "org.bouncycastle", "bcprov-jdk18on").version("1.79")
30+
library("bcpkix", "org.bouncycastle", "bcpkix-jdk18on").version("1.79")
3131
library("bcrypt", "at.favre.lib", "bcrypt").version("0.10.2")
3232
library("csv", "com.opencsv", "opencsv").version("5.9")
3333

3434
// testing dependencies
35-
version("junit.version", "5.11.2")
35+
version("junit.version", "5.11.3")
3636
library("junit.jupiter", "org.junit.jupiter", "junit-jupiter-api").versionRef("junit.version")
3737
library("assertj","org.assertj", "assertj-core").version("3.26.3")
3838
library("mockito","org.mockito", "mockito-core").version("5.14.2")

0 commit comments

Comments
 (0)