Skip to content

Commit 9b0361a

Browse files
authored
Merge pull request #230 from Smarteon/jimi/fix
chore: upgrade to jackson 2.19.0
2 parents aa491e3 + fcfebff commit 9b0361a

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ repositories {
3838
dependencies {
3939
implementation("org.java-websocket:Java-WebSocket:1.5.2")
4040

41-
val jacksonVersion = "2.13.3"
41+
val jacksonVersion = "2.19.0"
4242
implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
4343
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
4444
implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")

src/main/java/cz/smarteon/loxone/calendar/CalEntryBase.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
55
import com.fasterxml.jackson.annotation.JsonInclude;
6+
import com.fasterxml.jackson.annotation.JsonProperty;
67
import com.fasterxml.jackson.annotation.JsonSubTypes;
78
import com.fasterxml.jackson.annotation.JsonTypeInfo;
89
import cz.smarteon.loxone.LoxoneUuid;
@@ -65,8 +66,12 @@ public abstract class CalEntryBase {
6566
*/
6667
protected int calMode;
6768

68-
@JsonCreator
69-
protected CalEntryBase(@NotNull LoxoneUuid uuid, @NotNull String name, int operatingMode, @NotNull String calMode) {
69+
@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
70+
protected CalEntryBase(
71+
@JsonProperty("uuid") @NotNull LoxoneUuid uuid,
72+
@JsonProperty("name") @NotNull String name,
73+
@JsonProperty("operatingMode") int operatingMode,
74+
@JsonProperty("calMode") @NotNull String calMode) {
7075
this.uuid = uuid;
7176
this.name = name;
7277
this.operatingMode = operatingMode;

0 commit comments

Comments
 (0)