Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ repositories {
dependencies {
implementation("org.java-websocket:Java-WebSocket:1.5.2")

val jacksonVersion = "2.13.3"
val jacksonVersion = "2.19.0"
implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/cz/smarteon/loxone/calendar/CalEntryBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import cz.smarteon.loxone.LoxoneUuid;
Expand Down Expand Up @@ -65,8 +66,12 @@ public abstract class CalEntryBase {
*/
protected int calMode;

@JsonCreator
protected CalEntryBase(@NotNull LoxoneUuid uuid, @NotNull String name, int operatingMode, @NotNull String calMode) {
@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
protected CalEntryBase(
@JsonProperty("uuid") @NotNull LoxoneUuid uuid,
@JsonProperty("name") @NotNull String name,
@JsonProperty("operatingMode") int operatingMode,
@JsonProperty("calMode") @NotNull String calMode) {
this.uuid = uuid;
this.name = name;
this.operatingMode = operatingMode;
Expand Down
Loading