From 15b23802a0ae1e253a5ac4e8c2456573721172f7 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Wed, 4 May 2022 09:48:50 +0200 Subject: [PATCH] fixed bug in jackson deserialise --- .../socialnetworking/model/beans/WorkspaceFolderBean.java | 7 +++++++ .../model/beans/WorkspaceNotificationSharedFolder.java | 4 ++-- .../model/beans/WorkspaceNotificationUnsharedFolder.java | 3 +-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/social_networking/socialnetworking/model/beans/WorkspaceFolderBean.java b/src/main/java/org/gcube/social_networking/socialnetworking/model/beans/WorkspaceFolderBean.java index ba0ed6c..80f3dcc 100644 --- a/src/main/java/org/gcube/social_networking/socialnetworking/model/beans/WorkspaceFolderBean.java +++ b/src/main/java/org/gcube/social_networking/socialnetworking/model/beans/WorkspaceFolderBean.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class WorkspaceFolderBean { + + @JsonProperty("id") @NotNull private String id; @@ -35,6 +37,11 @@ public class WorkspaceFolderBean { @NotNull boolean vreFolder; + public WorkspaceFolderBean() { + super(); + // TODO Auto-generated constructor stub + } + public WorkspaceFolderBean(String id, String name, String title, String displayName, String path, String parentId, boolean vreFolder) { super(); this.id = id; diff --git a/src/main/java/org/gcube/social_networking/socialnetworking/model/beans/WorkspaceNotificationSharedFolder.java b/src/main/java/org/gcube/social_networking/socialnetworking/model/beans/WorkspaceNotificationSharedFolder.java index 05e6fda..b004528 100644 --- a/src/main/java/org/gcube/social_networking/socialnetworking/model/beans/WorkspaceNotificationSharedFolder.java +++ b/src/main/java/org/gcube/social_networking/socialnetworking/model/beans/WorkspaceNotificationSharedFolder.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; @JsonIgnoreProperties(ignoreUnknown=true) -@JsonTypeName("SHARED_FOLDER") +@JsonTypeName("FOLDER_SHARE") public class WorkspaceNotificationSharedFolder extends WorkspaceNotification { /** @@ -23,7 +23,7 @@ public class WorkspaceNotificationSharedFolder extends WorkspaceNotification { private WorkspaceFolderBean folder; - public WorkspaceNotificationSharedFolder(WorkspaceNotificationType TYPE) { + public WorkspaceNotificationSharedFolder() { super(WorkspaceNotificationType.FOLDER_SHARE); } diff --git a/src/main/java/org/gcube/social_networking/socialnetworking/model/beans/WorkspaceNotificationUnsharedFolder.java b/src/main/java/org/gcube/social_networking/socialnetworking/model/beans/WorkspaceNotificationUnsharedFolder.java index b7899d6..d8f0f9d 100644 --- a/src/main/java/org/gcube/social_networking/socialnetworking/model/beans/WorkspaceNotificationUnsharedFolder.java +++ b/src/main/java/org/gcube/social_networking/socialnetworking/model/beans/WorkspaceNotificationUnsharedFolder.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; @JsonIgnoreProperties(ignoreUnknown=true) -@JsonTypeName("UNSHARED_FOLDER") +@JsonTypeName("FOLDER_UNSHARE") public class WorkspaceNotificationUnsharedFolder extends WorkspaceNotification { @@ -26,7 +26,6 @@ public class WorkspaceNotificationUnsharedFolder extends WorkspaceNotification { @NotNull(message="unsharedFolderName cannot be missing") private String unsharedFolderName; - public WorkspaceNotificationUnsharedFolder() { super(WorkspaceNotificationType.FOLDER_UNSHARE);