diff --git a/src/main/java/edu/stanford/protege/webprotege/app/GetApplicationSettingsResult.java b/src/main/java/edu/stanford/protege/webprotege/app/GetApplicationSettingsResult.java index 076938c2..a1194b8a 100644 --- a/src/main/java/edu/stanford/protege/webprotege/app/GetApplicationSettingsResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/app/GetApplicationSettingsResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.app; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.dispatch.Result; @@ -11,6 +12,6 @@ @JsonTypeName("webprotege.application.GetApplicationSettings") -public record GetApplicationSettingsResult(ApplicationSettings settings) implements Result { +public record GetApplicationSettingsResult(@JsonProperty("settings") ApplicationSettings settings) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/change/GetProjectChangesAction.java b/src/main/java/edu/stanford/protege/webprotege/change/GetProjectChangesAction.java index 2b5e8ae8..a86e08fe 100644 --- a/src/main/java/edu/stanford/protege/webprotege/change/GetProjectChangesAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/change/GetProjectChangesAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.change; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.PageRequest; import edu.stanford.protege.webprotege.common.ProjectId; @@ -16,9 +17,9 @@ * 24/02/15 */ @JsonTypeName("webprotege.history.GetProjectChanges") -public record GetProjectChangesAction(@Nonnull ProjectId projectId, - @Nonnull Optional subject, - @Nonnull PageRequest pageRequest) implements ProjectAction { +public record GetProjectChangesAction(@JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("subject") @Nonnull Optional subject, + @JsonProperty("pageRequest") @Nonnull PageRequest pageRequest) implements ProjectAction { public static final String CHANNEL = "webprotege.history.GetProjectChanges"; diff --git a/src/main/java/edu/stanford/protege/webprotege/entity/CreateClassesAction.java b/src/main/java/edu/stanford/protege/webprotege/entity/CreateClassesAction.java index 92261b0b..e912fa60 100644 --- a/src/main/java/edu/stanford/protege/webprotege/entity/CreateClassesAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/entity/CreateClassesAction.java @@ -1,6 +1,7 @@ package edu.stanford.protege.webprotege.entity; import com.fasterxml.jackson.annotation.JsonClassDescription; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableSet; @@ -19,16 +20,20 @@ */ @JsonTypeName("webprotege.entities.CreateClasses") @JsonClassDescription("Represents a request to create OWL classes in a specified project") -public record CreateClassesAction(ChangeRequestId changeRequestId, +public record CreateClassesAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId, + @JsonProperty("projectId") @JsonPropertyDescription("The id of the project where the classes will be created") ProjectId projectId, + @JsonProperty("sourceText") @JsonPropertyDescription(""" The source text that contains the user supplied names for the classes. Multiple user-supplied class names should be separated with a new line.""") String sourceText, + @JsonProperty("langTag") @JsonPropertyDescription("The language tag that should be used for the labels of the created classes") String langTag, + @JsonProperty("parents") @JsonPropertyDescription(""" A set of classes that the created classes will be subclasses of. diff --git a/src/main/java/edu/stanford/protege/webprotege/entity/CreateClassesResult.java b/src/main/java/edu/stanford/protege/webprotege/entity/CreateClassesResult.java index 4586347b..8d30eba7 100644 --- a/src/main/java/edu/stanford/protege/webprotege/entity/CreateClassesResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/entity/CreateClassesResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.entity; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableSet; import edu.stanford.protege.webprotege.common.ChangeRequestId; @@ -14,7 +15,7 @@ * Date: 22/02/2013 */ @JsonTypeName("webprotege.entities.CreateClasses") -public record CreateClassesResult(ChangeRequestId changeRequestId, - ProjectId projectId, - ImmutableSet entities) implements Result, Response { +public record CreateClassesResult(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId, + @JsonProperty("projectId") ProjectId projectId, + @JsonProperty("entities") ImmutableSet entities) implements Result, Response { } diff --git a/src/main/java/edu/stanford/protege/webprotege/entity/CreateDataPropertiesAction.java b/src/main/java/edu/stanford/protege/webprotege/entity/CreateDataPropertiesAction.java index 99e14ce2..b8448896 100644 --- a/src/main/java/edu/stanford/protege/webprotege/entity/CreateDataPropertiesAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/entity/CreateDataPropertiesAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.entity; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableSet; import edu.stanford.protege.webprotege.common.ChangeRequestId; @@ -17,11 +18,11 @@ * Date: 25/03/2013 */ @JsonTypeName("webprotege.entities.CreateDataProperties") -public record CreateDataPropertiesAction(@Nonnull ChangeRequestId changeRequestId, - @Nonnull ProjectId projectId, - @Nonnull String sourceText, - @Nonnull String langTag, - ImmutableSet parents) implements ProjectAction, ContentChangeRequest { +public record CreateDataPropertiesAction(@JsonProperty("changeRequestId") @Nonnull ChangeRequestId changeRequestId, + @JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("sourceText") @Nonnull String sourceText, + @JsonProperty("langTag") @Nonnull String langTag, + @JsonProperty("parents") ImmutableSet parents) implements ProjectAction, ContentChangeRequest { public static final String CHANNEL = "webprotege.entities.CreateDataProperties"; diff --git a/src/main/java/edu/stanford/protege/webprotege/entity/CreateDataPropertiesResult.java b/src/main/java/edu/stanford/protege/webprotege/entity/CreateDataPropertiesResult.java index a43d287f..db58f346 100644 --- a/src/main/java/edu/stanford/protege/webprotege/entity/CreateDataPropertiesResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/entity/CreateDataPropertiesResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.entity; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableSet; import edu.stanford.protege.webprotege.common.ChangeRequestId; @@ -13,7 +14,7 @@ * Date: 25/03/2013 */ @JsonTypeName("webprotege.entities.CreateDataProperties") -public record CreateDataPropertiesResult(ProjectId projectId, - ImmutableSet entities, - ChangeRequestId changeRequestId) implements Result { +public record CreateDataPropertiesResult(@JsonProperty("projectId") ProjectId projectId, + @JsonProperty("entities") ImmutableSet entities, + @JsonProperty("changeRequestId") ChangeRequestId changeRequestId) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/entity/CreateNamedIndividualsAction.java b/src/main/java/edu/stanford/protege/webprotege/entity/CreateNamedIndividualsAction.java index 5ead1a9a..9756d507 100644 --- a/src/main/java/edu/stanford/protege/webprotege/entity/CreateNamedIndividualsAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/entity/CreateNamedIndividualsAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.entity; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableSet; import edu.stanford.protege.webprotege.common.ChangeRequestId; @@ -17,11 +18,11 @@ * Date: 12/09/2013 */ @JsonTypeName("webprotege.entities.CreateNamedIndividuals") -public record CreateNamedIndividualsAction(@Nonnull ChangeRequestId changeRequestId, - @Nonnull ProjectId projectId, - @Nonnull String sourceText, - @Nonnull String langTag, - @Nonnull ImmutableSet types) implements ProjectAction, ContentChangeRequest { +public record CreateNamedIndividualsAction(@JsonProperty("changeRequestId") @Nonnull ChangeRequestId changeRequestId, + @JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("sourceText") @Nonnull String sourceText, + @JsonProperty("langTag") @Nonnull String langTag, + @JsonProperty("types") @Nonnull ImmutableSet types) implements ProjectAction, ContentChangeRequest { public static final String CHANNEL = "webprotege.entities.CreateNamedIndividuals"; diff --git a/src/main/java/edu/stanford/protege/webprotege/entity/CreateNamedIndividualsResult.java b/src/main/java/edu/stanford/protege/webprotege/entity/CreateNamedIndividualsResult.java index 11df4bdb..5d7f2039 100644 --- a/src/main/java/edu/stanford/protege/webprotege/entity/CreateNamedIndividualsResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/entity/CreateNamedIndividualsResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.entity; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableSet; import edu.stanford.protege.webprotege.common.ChangeRequestId; @@ -15,7 +16,7 @@ * Date: 12/09/2013 */ @JsonTypeName("webprotege.entities.CreateNamedIndividuals") -public record CreateNamedIndividualsResult(@Nonnull ProjectId projectId, - ImmutableSet entities, - ChangeRequestId changeRequestId) implements Result { +public record CreateNamedIndividualsResult(@JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("entities") ImmutableSet entities, + @JsonProperty("changeRequestId") ChangeRequestId changeRequestId) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/entity/CreateObjectPropertiesAction.java b/src/main/java/edu/stanford/protege/webprotege/entity/CreateObjectPropertiesAction.java index 20a7c747..fd8fa984 100644 --- a/src/main/java/edu/stanford/protege/webprotege/entity/CreateObjectPropertiesAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/entity/CreateObjectPropertiesAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.entity; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableSet; import edu.stanford.protege.webprotege.common.ChangeRequestId; @@ -17,11 +18,11 @@ * Date: 25/03/2013 */ @JsonTypeName("webprotege.entities.CreateObjectProperties") -public record CreateObjectPropertiesAction(@Nonnull ChangeRequestId changeRequestId, - @Nonnull ProjectId projectId, - @Nonnull String sourceText, - @Nonnull String langTag, - @Nonnull ImmutableSet parents) implements ProjectAction, ContentChangeRequest { +public record CreateObjectPropertiesAction(@JsonProperty("changeRequestId") @Nonnull ChangeRequestId changeRequestId, + @JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("sourceText") @Nonnull String sourceText, + @JsonProperty("langTag") @Nonnull String langTag, + @JsonProperty("parents") @Nonnull ImmutableSet parents) implements ProjectAction, ContentChangeRequest { public static final String CHANNEL = "webprotege.entities.CreateObjectProperties"; diff --git a/src/main/java/edu/stanford/protege/webprotege/entity/DeleteEntitiesAction.java b/src/main/java/edu/stanford/protege/webprotege/entity/DeleteEntitiesAction.java index dcf1dc26..afe386c4 100644 --- a/src/main/java/edu/stanford/protege/webprotege/entity/DeleteEntitiesAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/entity/DeleteEntitiesAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.entity; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableSet; import edu.stanford.protege.webprotege.common.ChangeRequestId; @@ -16,9 +17,9 @@ * 9 May 2017 */ @JsonTypeName("webprotege.entities.DeleteEntities") -public record DeleteEntitiesAction(ChangeRequestId changeRequestId, - ProjectId projectId, - ImmutableSet entities) implements ProjectAction, ContentChangeRequest { +public record DeleteEntitiesAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId, + @JsonProperty("projectId") ProjectId projectId, + @JsonProperty("entities") ImmutableSet entities) implements ProjectAction, ContentChangeRequest { public static final String CHANNEL = "webprotege.entities.DeleteEntities"; @@ -27,7 +28,9 @@ public String getChannel() { return CHANNEL; } - public DeleteEntitiesAction(ChangeRequestId changeRequestId, ProjectId projectId, ImmutableSet entities) { + public DeleteEntitiesAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId, + @JsonProperty("projectId") ProjectId projectId, + @JsonProperty("entities") ImmutableSet entities) { this.changeRequestId = checkNotNull(changeRequestId); this.projectId = checkNotNull(projectId); this.entities = checkNotNull(entities); diff --git a/src/main/java/edu/stanford/protege/webprotege/entity/DeleteEntitiesResult.java b/src/main/java/edu/stanford/protege/webprotege/entity/DeleteEntitiesResult.java index 8534824a..757a3a86 100644 --- a/src/main/java/edu/stanford/protege/webprotege/entity/DeleteEntitiesResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/entity/DeleteEntitiesResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.entity; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableSet; import edu.stanford.protege.webprotege.dispatch.Result; @@ -11,5 +12,5 @@ * 9 May 2017 */ @JsonTypeName("webprotege.entities.DeleteEntities") -public record DeleteEntitiesResult(ImmutableSet deletedEntities) implements Result { +public record DeleteEntitiesResult(@JsonProperty("deletedEntities") ImmutableSet deletedEntities) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/entity/GetDeprecatedEntitiesResult.java b/src/main/java/edu/stanford/protege/webprotege/entity/GetDeprecatedEntitiesResult.java index 74696565..1c5d04bb 100644 --- a/src/main/java/edu/stanford/protege/webprotege/entity/GetDeprecatedEntitiesResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/entity/GetDeprecatedEntitiesResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.entity; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.Page; import edu.stanford.protege.webprotege.dispatch.Result; @@ -12,6 +13,6 @@ @JsonTypeName("webprotege.entities.GetDeprecatedEntities") -public record GetDeprecatedEntitiesResult(Page entities) implements Result { +public record GetDeprecatedEntitiesResult(@JsonProperty("entities") Page entities) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/entity/LookupEntitiesAction.java b/src/main/java/edu/stanford/protege/webprotege/entity/LookupEntitiesAction.java index d8d5cd95..c03602a0 100644 --- a/src/main/java/edu/stanford/protege/webprotege/entity/LookupEntitiesAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/entity/LookupEntitiesAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.entity; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.ProjectAction; @@ -17,7 +18,8 @@ * @throws NullPointerException if any parameters are {@code null}. */ @JsonTypeName("webprotege.entities.LookupEntities") -public record LookupEntitiesAction(ProjectId projectId, EntityLookupRequest entityLookupRequest) implements ProjectAction { +public record LookupEntitiesAction(@JsonProperty("projectId") ProjectId projectId, + @JsonProperty("entityLookupRequest") EntityLookupRequest entityLookupRequest) implements ProjectAction { public static final String CHANNEL = "webprotege.entities.LookupEntities"; diff --git a/src/main/java/edu/stanford/protege/webprotege/entity/LookupEntitiesResult.java b/src/main/java/edu/stanford/protege/webprotege/entity/LookupEntitiesResult.java index af7ba8f8..9b4b358a 100644 --- a/src/main/java/edu/stanford/protege/webprotege/entity/LookupEntitiesResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/entity/LookupEntitiesResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.entity; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.dispatch.Result; @@ -14,6 +15,6 @@ @JsonTypeName("webprotege.entities.LookupEntities") -public record LookupEntitiesResult(List results) implements Result { +public record LookupEntitiesResult(@JsonProperty("results") List results) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/hierarchy/GetHierarchyPathsToRootResult.java b/src/main/java/edu/stanford/protege/webprotege/hierarchy/GetHierarchyPathsToRootResult.java index 376d66d3..29c52aaf 100644 --- a/src/main/java/edu/stanford/protege/webprotege/hierarchy/GetHierarchyPathsToRootResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/hierarchy/GetHierarchyPathsToRootResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.hierarchy; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.dispatch.Result; import edu.stanford.protege.webprotege.entity.EntityNode; @@ -12,6 +13,6 @@ @JsonTypeName("webprotege.hierarchies.GetHierarchyPathsToRoot") -public record GetHierarchyPathsToRootResult(Collection>> paths) implements Result { +public record GetHierarchyPathsToRootResult(@JsonProperty("paths") Collection>> paths) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/hierarchy/GetHierarchyRootsAction.java b/src/main/java/edu/stanford/protege/webprotege/hierarchy/GetHierarchyRootsAction.java index 3eec5eb8..664c913a 100644 --- a/src/main/java/edu/stanford/protege/webprotege/hierarchy/GetHierarchyRootsAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/hierarchy/GetHierarchyRootsAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.hierarchy; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.ProjectAction; @@ -12,7 +13,8 @@ * Matthew Horridge Stanford Center for Biomedical Informatics Research 30 Nov 2017 */ @JsonTypeName("webprotege.hierarchies.GetHierarchyRoots") -public record GetHierarchyRootsAction(@Nonnull ProjectId projectId, @Nonnull HierarchyDescriptor hierarchyDescriptor) implements ProjectAction { +public record GetHierarchyRootsAction(@JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("hierarchyDescriptor") @Nonnull HierarchyDescriptor hierarchyDescriptor) implements ProjectAction { public static final String CHANNEL = "webprotege.hierarchies.GetHierarchyRoots"; @@ -21,7 +23,8 @@ public String getChannel() { return CHANNEL; } - public GetHierarchyRootsAction(@Nonnull ProjectId projectId, @Nonnull HierarchyDescriptor hierarchyDescriptor) { + public GetHierarchyRootsAction(@JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("hierarchyDescriptor") @Nonnull HierarchyDescriptor hierarchyDescriptor) { this.projectId = checkNotNull(projectId); this.hierarchyDescriptor = checkNotNull(hierarchyDescriptor); } diff --git a/src/main/java/edu/stanford/protege/webprotege/issues/CreateEntityDiscussionThreadResult.java b/src/main/java/edu/stanford/protege/webprotege/issues/CreateEntityDiscussionThreadResult.java index 6cf4c549..d38487d3 100644 --- a/src/main/java/edu/stanford/protege/webprotege/issues/CreateEntityDiscussionThreadResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/issues/CreateEntityDiscussionThreadResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.issues; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableList; import edu.stanford.protege.webprotege.dispatch.Result; @@ -12,5 +13,5 @@ * 6 Oct 2016 */ @JsonTypeName("webprotege.discussions.CreateEntityDiscussionThread") -public record CreateEntityDiscussionThreadResult(@Nonnull ImmutableList threads) implements Result { +public record CreateEntityDiscussionThreadResult(@JsonProperty("threads") @Nonnull ImmutableList threads) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/issues/GetEntityDiscussionThreadsAction.java b/src/main/java/edu/stanford/protege/webprotege/issues/GetEntityDiscussionThreadsAction.java index d4251ea5..43741d9d 100644 --- a/src/main/java/edu/stanford/protege/webprotege/issues/GetEntityDiscussionThreadsAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/issues/GetEntityDiscussionThreadsAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.issues; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.ProjectAction; @@ -13,7 +14,8 @@ * 5 Oct 2016 */ @JsonTypeName("webprotege.discussions.GetEntityDiscussionThreads") -public record GetEntityDiscussionThreadsAction(@Nonnull ProjectId projectId, @Nonnull OWLEntity entity) implements ProjectAction { +public record GetEntityDiscussionThreadsAction(@JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("entity") @Nonnull OWLEntity entity) implements ProjectAction { public static final String CHANNEL = "webprotege.discussions.GetEntityDiscussionThreads"; diff --git a/src/main/java/edu/stanford/protege/webprotege/issues/GetEntityDiscussionThreadsResult.java b/src/main/java/edu/stanford/protege/webprotege/issues/GetEntityDiscussionThreadsResult.java index 1d639a25..d79de904 100644 --- a/src/main/java/edu/stanford/protege/webprotege/issues/GetEntityDiscussionThreadsResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/issues/GetEntityDiscussionThreadsResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.issues; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableList; import edu.stanford.protege.webprotege.dispatch.Result; @@ -13,6 +14,6 @@ @JsonTypeName("webprotege.discussions.GetEntityDiscussionThreads") -public record GetEntityDiscussionThreadsResult(OWLEntityData entity, - ImmutableList threads) implements Result { +public record GetEntityDiscussionThreadsResult(@JsonProperty("entity") OWLEntityData entity, + @JsonProperty("threads") ImmutableList threads) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/issues/SetDiscussionThreadStatusResult.java b/src/main/java/edu/stanford/protege/webprotege/issues/SetDiscussionThreadStatusResult.java index 46f39707..d94dfc24 100644 --- a/src/main/java/edu/stanford/protege/webprotege/issues/SetDiscussionThreadStatusResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/issues/SetDiscussionThreadStatusResult.java @@ -1,6 +1,7 @@ package edu.stanford.protege.webprotege.issues; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.dispatch.Result; @@ -12,7 +13,7 @@ * 12 Oct 2016 */ @JsonTypeName("webprotege.discussions.SetDiscussionThreadStatus") -public record SetDiscussionThreadStatusResult(@Nonnull ThreadId threadId, - @Nonnull Status result) implements Result { +public record SetDiscussionThreadStatusResult(@JsonProperty("threadId") @Nonnull ThreadId threadId, + @JsonProperty("result") @Nonnull Status result) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/lang/GetProjectLangTagsAction.java b/src/main/java/edu/stanford/protege/webprotege/lang/GetProjectLangTagsAction.java index 39d19a4d..b1e17600 100644 --- a/src/main/java/edu/stanford/protege/webprotege/lang/GetProjectLangTagsAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/lang/GetProjectLangTagsAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.lang; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.ProjectAction; @@ -12,7 +13,7 @@ * 2020-04-26 */ @JsonTypeName("webprotege.projects.GetProjectLangTags") -public record GetProjectLangTagsAction(ProjectId projectId) implements ProjectAction { +public record GetProjectLangTagsAction(@JsonProperty("projectId") ProjectId projectId) implements ProjectAction { public static final String CHANNEL = "webprotege.projects.GetProjectLangTags"; diff --git a/src/main/java/edu/stanford/protege/webprotege/lang/GetProjectLangTagsResult.java b/src/main/java/edu/stanford/protege/webprotege/lang/GetProjectLangTagsResult.java index bbaf2c1e..1cf7bac6 100644 --- a/src/main/java/edu/stanford/protege/webprotege/lang/GetProjectLangTagsResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/lang/GetProjectLangTagsResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.lang; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableSet; import edu.stanford.protege.webprotege.common.LangTag; @@ -14,6 +15,7 @@ * 2020-04-26 */ @JsonTypeName("webprotege.projects.GetProjectLangTags") -public record GetProjectLangTagsResult(@Nonnull ProjectId projectId, @Nonnull ImmutableSet langTags) implements Result { +public record GetProjectLangTagsResult(@JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("langTags") @Nonnull ImmutableSet langTags) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/mail/GetEmailAddressAction.java b/src/main/java/edu/stanford/protege/webprotege/mail/GetEmailAddressAction.java index 9f4d78bd..5baaa0d7 100644 --- a/src/main/java/edu/stanford/protege/webprotege/mail/GetEmailAddressAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/mail/GetEmailAddressAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.mail; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.UserId; import edu.stanford.protege.webprotege.dispatch.Action; @@ -11,7 +12,7 @@ * Date: 06/11/2013 */ @JsonTypeName("webprotege.users.GetEmailAddress") -public record GetEmailAddressAction(UserId userId) implements Action { +public record GetEmailAddressAction(@JsonProperty("userId") UserId userId) implements Action { public static final String CHANNEL = "webprotege.users.GetEmailAddress"; diff --git a/src/main/java/edu/stanford/protege/webprotege/mail/SetEmailAddressAction.java b/src/main/java/edu/stanford/protege/webprotege/mail/SetEmailAddressAction.java index b8ac501d..7f2fc7f6 100644 --- a/src/main/java/edu/stanford/protege/webprotege/mail/SetEmailAddressAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/mail/SetEmailAddressAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.mail; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.UserId; import edu.stanford.protege.webprotege.dispatch.Action; @@ -19,7 +20,8 @@ * */ @JsonTypeName("webprotege.users.SetEmailAddress") -public record SetEmailAddressAction(UserId userId, EmailAddress emailAddress) implements Action { +public record SetEmailAddressAction(@JsonProperty("userId") UserId userId, + @JsonProperty("emailAddress") EmailAddress emailAddress) implements Action { public static final String CHANNEL = "webprotege.users.SetEmailAddress"; diff --git a/src/main/java/edu/stanford/protege/webprotege/mail/SetEmailAddressResult.java b/src/main/java/edu/stanford/protege/webprotege/mail/SetEmailAddressResult.java index b36f5339..aefd80fa 100644 --- a/src/main/java/edu/stanford/protege/webprotege/mail/SetEmailAddressResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/mail/SetEmailAddressResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.mail; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.dispatch.Result; @@ -10,7 +11,7 @@ * Date: 06/11/2013 */ @JsonTypeName("webprotege.users.SetEmailAddress") -public record SetEmailAddressResult(Result result) implements Result { +public record SetEmailAddressResult(@JsonProperty("result") Result result) implements Result { public enum Result { /** diff --git a/src/main/java/edu/stanford/protege/webprotege/match/GetMatchingEntitiesResult.java b/src/main/java/edu/stanford/protege/webprotege/match/GetMatchingEntitiesResult.java index a045a16b..78c9b6bc 100644 --- a/src/main/java/edu/stanford/protege/webprotege/match/GetMatchingEntitiesResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/match/GetMatchingEntitiesResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.match; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.Page; import edu.stanford.protege.webprotege.common.Response; @@ -16,6 +17,6 @@ @JsonTypeName("webprotege.entities.GetMatchingEntities") -public record GetMatchingEntitiesResult(@Nonnull Page entities) implements Result, Response { +public record GetMatchingEntitiesResult(@JsonProperty("entities") @Nonnull Page entities) implements Result, Response { } diff --git a/src/main/java/edu/stanford/protege/webprotege/merge/ComputeProjectMergeResult.java b/src/main/java/edu/stanford/protege/webprotege/merge/ComputeProjectMergeResult.java index 5510bd2e..fc72e992 100644 --- a/src/main/java/edu/stanford/protege/webprotege/merge/ComputeProjectMergeResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/merge/ComputeProjectMergeResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.merge; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.diff.DiffElement; import edu.stanford.protege.webprotege.dispatch.Result; @@ -14,6 +15,6 @@ @JsonTypeName("webprotege.projects.ComputeProjectMerge") -public record ComputeProjectMergeResult(List> diff) implements Result { +public record ComputeProjectMergeResult(@JsonProperty("diff") List> diff) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/ontology/GetRootOntologyIdAction.java b/src/main/java/edu/stanford/protege/webprotege/ontology/GetRootOntologyIdAction.java index 5b4ea476..da5083dd 100644 --- a/src/main/java/edu/stanford/protege/webprotege/ontology/GetRootOntologyIdAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/ontology/GetRootOntologyIdAction.java @@ -1,6 +1,7 @@ package edu.stanford.protege.webprotege.ontology; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.ProjectAction; @@ -14,7 +15,7 @@ @JsonTypeName("webprotege.ontologies.GetRootOntologyId") -public record GetRootOntologyIdAction(ProjectId projectId) implements ProjectAction { +public record GetRootOntologyIdAction(@JsonProperty("projectId") ProjectId projectId) implements ProjectAction { public static final String CHANNEL = "webprotege.ontologies.GetRootOntologyId"; diff --git a/src/main/java/edu/stanford/protege/webprotege/permissions/GetProjectPermissionsAction.java b/src/main/java/edu/stanford/protege/webprotege/permissions/GetProjectPermissionsAction.java index bea96396..b1c45dcf 100644 --- a/src/main/java/edu/stanford/protege/webprotege/permissions/GetProjectPermissionsAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/permissions/GetProjectPermissionsAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.permissions; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.common.UserId; @@ -15,7 +16,8 @@ * 23/02/15 */ @JsonTypeName("webprotege.auth.GetProjectPermissions") -public record GetProjectPermissionsAction(@Nonnull ProjectId projectId, @Nonnull UserId userId) implements Action { +public record GetProjectPermissionsAction(@JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("userId") @Nonnull UserId userId) implements Action { public static final String CHANNEL = "webprotege.auth.GetProjectPermissions"; @@ -24,7 +26,8 @@ public String getChannel() { return CHANNEL; } - public GetProjectPermissionsAction(@Nonnull ProjectId projectId, @Nonnull UserId userId) { + public GetProjectPermissionsAction(@JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("userId") @Nonnull UserId userId) { this.projectId = checkNotNull(projectId); this.userId = checkNotNull(userId); } diff --git a/src/main/java/edu/stanford/protege/webprotege/permissions/GetProjectPermissionsResult.java b/src/main/java/edu/stanford/protege/webprotege/permissions/GetProjectPermissionsResult.java index 98467b7d..0e55da48 100644 --- a/src/main/java/edu/stanford/protege/webprotege/permissions/GetProjectPermissionsResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/permissions/GetProjectPermissionsResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.permissions; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.collect.ImmutableSet; import edu.stanford.protege.webprotege.authorization.Capability; @@ -11,6 +12,6 @@ * 23/02/15 */ @JsonTypeName("webprotege.auth.GetProjectPermissions") -public record GetProjectPermissionsResult(ImmutableSet allowedActions) implements Result { +public record GetProjectPermissionsResult(@JsonProperty("allowedActions") ImmutableSet allowedActions) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/perspective/GetPerspectiveLayoutAction.java b/src/main/java/edu/stanford/protege/webprotege/perspective/GetPerspectiveLayoutAction.java index 1d1afaa2..9b3590cd 100644 --- a/src/main/java/edu/stanford/protege/webprotege/perspective/GetPerspectiveLayoutAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/perspective/GetPerspectiveLayoutAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.perspective; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.common.UserId; @@ -14,7 +15,9 @@ * 17/02/16 */ @JsonTypeName("webprotege.perspectives.GetPerspectiveLayout") -public record GetPerspectiveLayoutAction(ProjectId projectId, UserId userId, PerspectiveId perspectiveId) implements ProjectAction, HasProjectId { +public record GetPerspectiveLayoutAction(@JsonProperty("projectId") ProjectId projectId, + @JsonProperty("userId") UserId userId, + @JsonProperty("perspectiveId") PerspectiveId perspectiveId) implements ProjectAction, HasProjectId { public static final String CHANNEL = "webprotege.perspectives.GetPerspectiveLayout"; @@ -23,7 +26,9 @@ public String getChannel() { return CHANNEL; } - public GetPerspectiveLayoutAction(ProjectId projectId, UserId userId, PerspectiveId perspectiveId) { + public GetPerspectiveLayoutAction(@JsonProperty("projectId") ProjectId projectId, + @JsonProperty("userId") UserId userId, + @JsonProperty("perspectiveId") PerspectiveId perspectiveId) { this.projectId = checkNotNull(projectId); this.userId = checkNotNull(userId); this.perspectiveId = checkNotNull(perspectiveId); diff --git a/src/main/java/edu/stanford/protege/webprotege/perspective/GetPerspectiveLayoutResult.java b/src/main/java/edu/stanford/protege/webprotege/perspective/GetPerspectiveLayoutResult.java index 7fe3df57..42302d04 100644 --- a/src/main/java/edu/stanford/protege/webprotege/perspective/GetPerspectiveLayoutResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/perspective/GetPerspectiveLayoutResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.perspective; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.dispatch.Result; @@ -11,6 +12,6 @@ @JsonTypeName("webprotege.perspectives.GetPerspectiveLayout") -public record GetPerspectiveLayoutResult(PerspectiveLayout layout) implements Result { +public record GetPerspectiveLayoutResult(@JsonProperty("layout") PerspectiveLayout layout) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/perspective/ResetPerspectiveLayoutAction.java b/src/main/java/edu/stanford/protege/webprotege/perspective/ResetPerspectiveLayoutAction.java index 283c2a68..5c52dc4c 100644 --- a/src/main/java/edu/stanford/protege/webprotege/perspective/ResetPerspectiveLayoutAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/perspective/ResetPerspectiveLayoutAction.java @@ -1,6 +1,7 @@ package edu.stanford.protege.webprotege.perspective; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ChangeRequest; import edu.stanford.protege.webprotege.common.ChangeRequestId; @@ -21,9 +22,9 @@ * @param perspectiveId The perspective id. */ @JsonTypeName("webprotege.perspectives.ResetPerspectiveLayout") -public record ResetPerspectiveLayoutAction(ChangeRequestId changeRequestId, - ProjectId projectId, - PerspectiveId perspectiveId) implements ProjectAction, ChangeRequest { +public record ResetPerspectiveLayoutAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId, + @JsonProperty("projectId") ProjectId projectId, + @JsonProperty("perspectiveId") PerspectiveId perspectiveId) implements ProjectAction, ChangeRequest { public static final String CHANNEL = "webprotege.perspectives.ResetPerspectiveLayout"; @@ -32,7 +33,9 @@ public String getChannel() { return CHANNEL; } - public ResetPerspectiveLayoutAction(ChangeRequestId changeRequestId, ProjectId projectId, PerspectiveId perspectiveId) { + public ResetPerspectiveLayoutAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId, + @JsonProperty("projectId") ProjectId projectId, + @JsonProperty("perspectiveId") PerspectiveId perspectiveId) { this.changeRequestId = checkNotNull(changeRequestId); this.projectId = checkNotNull(projectId); this.perspectiveId = checkNotNull(perspectiveId); diff --git a/src/main/java/edu/stanford/protege/webprotege/perspective/ResetPerspectiveLayoutResult.java b/src/main/java/edu/stanford/protege/webprotege/perspective/ResetPerspectiveLayoutResult.java index ec85169e..1b975f21 100644 --- a/src/main/java/edu/stanford/protege/webprotege/perspective/ResetPerspectiveLayoutResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/perspective/ResetPerspectiveLayoutResult.java @@ -1,6 +1,7 @@ package edu.stanford.protege.webprotege.perspective; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.dispatch.Result; @@ -14,9 +15,9 @@ * 15 Mar 2017 */ @JsonTypeName("webprotege.perspectives.ResetPerspectiveLayout") -public record ResetPerspectiveLayoutResult(@Nonnull PerspectiveLayout resetLayout) implements Result { +public record ResetPerspectiveLayoutResult(@JsonProperty("resetLayout") @Nonnull PerspectiveLayout resetLayout) implements Result { - public ResetPerspectiveLayoutResult(@Nonnull PerspectiveLayout resetLayout) { + public ResetPerspectiveLayoutResult(@JsonProperty("resetLayout") @Nonnull PerspectiveLayout resetLayout) { this.resetLayout = checkNotNull(resetLayout); } } diff --git a/src/main/java/edu/stanford/protege/webprotege/perspective/SetPerspectiveLayoutAction.java b/src/main/java/edu/stanford/protege/webprotege/perspective/SetPerspectiveLayoutAction.java index 50ed5412..dcee2b3b 100644 --- a/src/main/java/edu/stanford/protege/webprotege/perspective/SetPerspectiveLayoutAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/perspective/SetPerspectiveLayoutAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.perspective; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ChangeRequest; import edu.stanford.protege.webprotege.common.ChangeRequestId; @@ -16,10 +17,10 @@ * 28/02/16 */ @JsonTypeName("webprotege.perspectives.SetPerspectiveLayout") -public record SetPerspectiveLayoutAction(@Nonnull ChangeRequestId changeRequestId, - @Nonnull ProjectId projectId, - @Nonnull UserId userId, - @Nonnull PerspectiveLayout layout) implements ProjectAction, ChangeRequest { +public record SetPerspectiveLayoutAction(@JsonProperty("changeRequestId") @Nonnull ChangeRequestId changeRequestId, + @JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("userId") @Nonnull UserId userId, + @JsonProperty("layout") @Nonnull PerspectiveLayout layout) implements ProjectAction, ChangeRequest { public static final String CHANNEL = "webprotege.perspectives.SetPerspectiveLayout"; @@ -28,10 +29,10 @@ public String getChannel() { return CHANNEL; } - public SetPerspectiveLayoutAction(@Nonnull ChangeRequestId changeRequestId, - @Nonnull ProjectId projectId, - @Nonnull UserId userId, - @Nonnull PerspectiveLayout layout) { + public SetPerspectiveLayoutAction(@JsonProperty("changeRequestId") @Nonnull ChangeRequestId changeRequestId, + @JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("userId") @Nonnull UserId userId, + @JsonProperty("layout") @Nonnull PerspectiveLayout layout) { this.changeRequestId = Objects.requireNonNull(changeRequestId); this.projectId = Objects.requireNonNull(projectId); this.userId = Objects.requireNonNull(userId); diff --git a/src/main/java/edu/stanford/protege/webprotege/project/CreateNewProjectResult.java b/src/main/java/edu/stanford/protege/webprotege/project/CreateNewProjectResult.java index fa68c170..82981763 100644 --- a/src/main/java/edu/stanford/protege/webprotege/project/CreateNewProjectResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/project/CreateNewProjectResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.project; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.Response; import edu.stanford.protege.webprotege.dispatch.Result; @@ -12,9 +13,9 @@ * 21/02/15 */ @JsonTypeName("webprotege.projects.CreateNewProject") -public record CreateNewProjectResult(ProjectDetails projectDetails) implements Result, Response { +public record CreateNewProjectResult(@JsonProperty("projectDetails") ProjectDetails projectDetails) implements Result, Response { - public CreateNewProjectResult(ProjectDetails projectDetails) { + public CreateNewProjectResult(@JsonProperty("projectDetails") ProjectDetails projectDetails) { this.projectDetails = checkNotNull(projectDetails); } } diff --git a/src/main/java/edu/stanford/protege/webprotege/project/GetProjectDetailsAction.java b/src/main/java/edu/stanford/protege/webprotege/project/GetProjectDetailsAction.java index b239645c..c2b34c6b 100644 --- a/src/main/java/edu/stanford/protege/webprotege/project/GetProjectDetailsAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/project/GetProjectDetailsAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.project; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.Action; @@ -12,7 +13,7 @@ * 10/03/16 */ @JsonTypeName("webprotege.projects.GetProjectDetails") -public record GetProjectDetailsAction(ProjectId projectId) implements Action, HasProjectId { +public record GetProjectDetailsAction(@JsonProperty("projectId") ProjectId projectId) implements Action, HasProjectId { public static final String CHANNEL = "webprotege.projects.GetProjectDetails"; @@ -21,7 +22,7 @@ public String getChannel() { return CHANNEL; } - public GetProjectDetailsAction(ProjectId projectId) { + public GetProjectDetailsAction(@JsonProperty("projectId") ProjectId projectId) { this.projectId = checkNotNull(projectId); } } diff --git a/src/main/java/edu/stanford/protege/webprotege/project/GetProjectDetailsResult.java b/src/main/java/edu/stanford/protege/webprotege/project/GetProjectDetailsResult.java index 6525021c..8de1d92b 100644 --- a/src/main/java/edu/stanford/protege/webprotege/project/GetProjectDetailsResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/project/GetProjectDetailsResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.project; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.dispatch.Result; @@ -13,9 +14,9 @@ @JsonTypeName("webprotege.projects.GetProjectDetails") -public record GetProjectDetailsResult(ProjectDetails projectDetails) implements Result { +public record GetProjectDetailsResult(@JsonProperty("projectDetails") ProjectDetails projectDetails) implements Result { - public GetProjectDetailsResult(ProjectDetails projectDetails) { + public GetProjectDetailsResult(@JsonProperty("projectDetails") ProjectDetails projectDetails) { this.projectDetails = checkNotNull(projectDetails); } } diff --git a/src/main/java/edu/stanford/protege/webprotege/project/GetProjectInfoAction.java b/src/main/java/edu/stanford/protege/webprotege/project/GetProjectInfoAction.java index b9fe9920..30dd49a1 100644 --- a/src/main/java/edu/stanford/protege/webprotege/project/GetProjectInfoAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/project/GetProjectInfoAction.java @@ -1,6 +1,7 @@ package edu.stanford.protege.webprotege.project; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.ProjectAction; @@ -11,7 +12,7 @@ * 21 Aug 2018 */ @JsonTypeName("webprotege.projects.GetProjectInfo") -public record GetProjectInfoAction(ProjectId projectId) implements ProjectAction { +public record GetProjectInfoAction(@JsonProperty("projectId") ProjectId projectId) implements ProjectAction { public static final String CHANNEL = "webprotege.projects.GetProjectInfo"; diff --git a/src/main/java/edu/stanford/protege/webprotege/project/LoadProjectAction.java b/src/main/java/edu/stanford/protege/webprotege/project/LoadProjectAction.java index ea0e66d7..d411140f 100644 --- a/src/main/java/edu/stanford/protege/webprotege/project/LoadProjectAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/project/LoadProjectAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.project; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.Action; @@ -13,7 +14,7 @@ * Date: 05/04/2013 */ @JsonTypeName("webprotege.projects.LoadProject") -public record LoadProjectAction(ProjectId projectId) implements Action, HasProjectId { +public record LoadProjectAction(@JsonProperty("projectId") ProjectId projectId) implements Action, HasProjectId { public static final String CHANNEL = "webprotege.projects.LoadProject"; @@ -22,7 +23,7 @@ public String getChannel() { return CHANNEL; } - public LoadProjectAction(ProjectId projectId) { + public LoadProjectAction(@JsonProperty("projectId") ProjectId projectId) { this.projectId = checkNotNull(projectId); } } diff --git a/src/main/java/edu/stanford/protege/webprotege/project/MoveProjectsToTrashAction.java b/src/main/java/edu/stanford/protege/webprotege/project/MoveProjectsToTrashAction.java index ed9455ef..a40ba3c6 100644 --- a/src/main/java/edu/stanford/protege/webprotege/project/MoveProjectsToTrashAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/project/MoveProjectsToTrashAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.project; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.Action; @@ -13,7 +14,7 @@ @JsonTypeName("webprotege.projects.MoveProjectToTrash") -public record MoveProjectsToTrashAction(ProjectId projectId) implements Action { +public record MoveProjectsToTrashAction(@JsonProperty("projectId") ProjectId projectId) implements Action { public static final String CHANNEL = "webprotege.projects.MoveProjectToTrash"; diff --git a/src/main/java/edu/stanford/protege/webprotege/project/RemoveProjectFromTrashAction.java b/src/main/java/edu/stanford/protege/webprotege/project/RemoveProjectFromTrashAction.java index 69893850..4e076521 100644 --- a/src/main/java/edu/stanford/protege/webprotege/project/RemoveProjectFromTrashAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/project/RemoveProjectFromTrashAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.project; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.Action; @@ -13,7 +14,7 @@ @JsonTypeName("webprotege.projects.RemoveProjectFromTrash") -public record RemoveProjectFromTrashAction(ProjectId projectId) implements Action { +public record RemoveProjectFromTrashAction(@JsonProperty("projectId") ProjectId projectId) implements Action { public static final String CHANNEL = "webprotege.projects.RemoveProjectFromTrash"; diff --git a/src/main/java/edu/stanford/protege/webprotege/project/SetProjectPrefixDeclarationsResult.java b/src/main/java/edu/stanford/protege/webprotege/project/SetProjectPrefixDeclarationsResult.java index a76a570e..ca881928 100644 --- a/src/main/java/edu/stanford/protege/webprotege/project/SetProjectPrefixDeclarationsResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/project/SetProjectPrefixDeclarationsResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.project; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.Result; @@ -15,11 +16,11 @@ * 1 Mar 2018 */ @JsonTypeName("webprotege.projects.SetProjectPrefixDeclarations") -public record SetProjectPrefixDeclarationsResult(@Nonnull ProjectId projectId, - @Nonnull List prefixDeclarations) implements Result { +public record SetProjectPrefixDeclarationsResult(@JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("prefixDeclarations") @Nonnull List prefixDeclarations) implements Result { - public SetProjectPrefixDeclarationsResult(@Nonnull ProjectId projectId, - @Nonnull List prefixDeclarations) { + public SetProjectPrefixDeclarationsResult(@JsonProperty("projectId") @Nonnull ProjectId projectId, + @JsonProperty("prefixDeclarations") @Nonnull List prefixDeclarations) { this.projectId = checkNotNull(projectId); this.prefixDeclarations = checkNotNull(prefixDeclarations); } diff --git a/src/main/java/edu/stanford/protege/webprotege/projectsettings/GetProjectSettingsResult.java b/src/main/java/edu/stanford/protege/webprotege/projectsettings/GetProjectSettingsResult.java index d3e95b6a..907b2095 100644 --- a/src/main/java/edu/stanford/protege/webprotege/projectsettings/GetProjectSettingsResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/projectsettings/GetProjectSettingsResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.projectsettings; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.dispatch.Result; @@ -11,9 +12,9 @@ * 25/11/14 */ @JsonTypeName("webprotege.projects.GetProjectSettings") -public record GetProjectSettingsResult(ProjectSettings settings) implements Result { +public record GetProjectSettingsResult(@JsonProperty("settings") ProjectSettings settings) implements Result { - public GetProjectSettingsResult(ProjectSettings settings) { + public GetProjectSettingsResult(@JsonProperty("settings") ProjectSettings settings) { this.settings = checkNotNull(settings); } } diff --git a/src/main/java/edu/stanford/protege/webprotege/renderer/GetEntityRenderingResult.java b/src/main/java/edu/stanford/protege/webprotege/renderer/GetEntityRenderingResult.java index b38c2c27..9ef82078 100644 --- a/src/main/java/edu/stanford/protege/webprotege/renderer/GetEntityRenderingResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/renderer/GetEntityRenderingResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.renderer; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.dispatch.Result; import edu.stanford.protege.webprotege.entity.OWLEntityData; @@ -12,6 +13,6 @@ @JsonTypeName("webprotege.entities.GetEntityRendering") -public record GetEntityRenderingResult(@Nonnull OWLEntityData entityData) implements Result { +public record GetEntityRenderingResult(@JsonProperty("entityData") @Nonnull OWLEntityData entityData) implements Result { } diff --git a/src/main/java/edu/stanford/protege/webprotege/revision/GetHeadRevisionNumberAction.java b/src/main/java/edu/stanford/protege/webprotege/revision/GetHeadRevisionNumberAction.java index a19af246..e35ad53b 100644 --- a/src/main/java/edu/stanford/protege/webprotege/revision/GetHeadRevisionNumberAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/revision/GetHeadRevisionNumberAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.revision; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.ProjectAction; @@ -12,7 +13,7 @@ * 21/02/15 */ @JsonTypeName("webprotege.history.GetHeadRevisionNumber") -public record GetHeadRevisionNumberAction(ProjectId projectId) implements ProjectAction { +public record GetHeadRevisionNumberAction(@JsonProperty("projectId") ProjectId projectId) implements ProjectAction { public static final String CHANNEL = "webprotege.history.GetHeadRevisionNumber"; @@ -21,7 +22,7 @@ public String getChannel() { return CHANNEL; } - public GetHeadRevisionNumberAction(ProjectId projectId) { + public GetHeadRevisionNumberAction(@JsonProperty("projectId") ProjectId projectId) { this.projectId = checkNotNull(projectId); } } diff --git a/src/main/java/edu/stanford/protege/webprotege/revision/GetRevisionSummariesResult.java b/src/main/java/edu/stanford/protege/webprotege/revision/GetRevisionSummariesResult.java index c68a9e50..9a806375 100644 --- a/src/main/java/edu/stanford/protege/webprotege/revision/GetRevisionSummariesResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/revision/GetRevisionSummariesResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.revision; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.Page; import edu.stanford.protege.webprotege.dispatch.Result; @@ -12,9 +13,9 @@ * 21/02/15 */ @JsonTypeName("webprotege.history.GetRevisionSummaries") -public record GetRevisionSummariesResult(Page revisionSummaries) implements Result { +public record GetRevisionSummariesResult(@JsonProperty("revisionSummaries") Page revisionSummaries) implements Result { - public GetRevisionSummariesResult(Page revisionSummaries) { + public GetRevisionSummariesResult(@JsonProperty("revisionSummaries") Page revisionSummaries) { this.revisionSummaries = checkNotNull(revisionSummaries); } } diff --git a/src/main/java/edu/stanford/protege/webprotege/search/GetSearchSettingsAction.java b/src/main/java/edu/stanford/protege/webprotege/search/GetSearchSettingsAction.java index 773d769e..2cda5326 100644 --- a/src/main/java/edu/stanford/protege/webprotege/search/GetSearchSettingsAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/search/GetSearchSettingsAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.search; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.ProjectAction; @@ -12,7 +13,7 @@ @JsonTypeName("webprotege.search.GetSearchSettings") -public record GetSearchSettingsAction(ProjectId projectId) implements ProjectAction { +public record GetSearchSettingsAction(@JsonProperty("projectId") ProjectId projectId) implements ProjectAction { public static final String CHANNEL = "webprotege.search.GetSearchSettings"; diff --git a/src/main/java/edu/stanford/protege/webprotege/sharing/GetProjectSharingSettingsAction.java b/src/main/java/edu/stanford/protege/webprotege/sharing/GetProjectSharingSettingsAction.java index 77fdb916..9f84f235 100644 --- a/src/main/java/edu/stanford/protege/webprotege/sharing/GetProjectSharingSettingsAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/sharing/GetProjectSharingSettingsAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.sharing; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.ProjectAction; @@ -12,7 +13,7 @@ * 07/02/15 */ @JsonTypeName("webprotege.projects.GetProjectSharingSettings") -public record GetProjectSharingSettingsAction(ProjectId projectId) implements ProjectAction { +public record GetProjectSharingSettingsAction(@JsonProperty("projectId") ProjectId projectId) implements ProjectAction { public static final String CHANNEL = "webprotege.projects.GetProjectSharingSettings"; @@ -21,7 +22,7 @@ public String getChannel() { return CHANNEL; } - public GetProjectSharingSettingsAction(ProjectId projectId) { + public GetProjectSharingSettingsAction(@JsonProperty("projectId") ProjectId projectId) { this.projectId = checkNotNull(projectId); } } diff --git a/src/main/java/edu/stanford/protege/webprotege/sharing/SetProjectSharingSettingsAction.java b/src/main/java/edu/stanford/protege/webprotege/sharing/SetProjectSharingSettingsAction.java index 85e90dcd..6b06e56d 100644 --- a/src/main/java/edu/stanford/protege/webprotege/sharing/SetProjectSharingSettingsAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/sharing/SetProjectSharingSettingsAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.sharing; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ChangeRequest; import edu.stanford.protege.webprotege.common.ChangeRequestId; @@ -14,8 +15,9 @@ * 07/02/15 */ @JsonTypeName("webprotege.sharing.SetProjectSharingSettings") -public record SetProjectSharingSettingsAction(ChangeRequestId changeRequestId, - ProjectId projectId, ProjectSharingSettings settings) implements ProjectAction, ChangeRequest { +public record SetProjectSharingSettingsAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId, + @JsonProperty("projectId") ProjectId projectId, + @JsonProperty("settings") ProjectSharingSettings settings) implements ProjectAction, ChangeRequest { public static final String CHANNEL = "webprotege.sharing.SetProjectSharingSettings"; @@ -24,7 +26,9 @@ public String getChannel() { return CHANNEL; } - public SetProjectSharingSettingsAction(ChangeRequestId changeRequestId, ProjectId projectId, ProjectSharingSettings settings) { + public SetProjectSharingSettingsAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId, + @JsonProperty("projectId") ProjectId projectId, + @JsonProperty("settings") ProjectSharingSettings settings) { this.changeRequestId = checkNotNull(changeRequestId); this.projectId = checkNotNull(projectId); this.settings = checkNotNull(settings); diff --git a/src/main/java/edu/stanford/protege/webprotege/tag/AddProjectTagResult.java b/src/main/java/edu/stanford/protege/webprotege/tag/AddProjectTagResult.java index e191fe53..0c89fdd8 100644 --- a/src/main/java/edu/stanford/protege/webprotege/tag/AddProjectTagResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/tag/AddProjectTagResult.java @@ -15,7 +15,7 @@ * 18 Mar 2018 */ @JsonTypeName("webprotege.tags.AddProjectTag") -public record AddProjectTagResult(Tag addedTag) implements Result { +public record AddProjectTagResult(@JsonProperty("addedTag") Tag addedTag) implements Result { @JsonCreator public static AddProjectTagResult create(@JsonProperty("addedTag") @Nullable Tag addedTag) { diff --git a/src/main/java/edu/stanford/protege/webprotege/tag/GetEntityTagsAction.java b/src/main/java/edu/stanford/protege/webprotege/tag/GetEntityTagsAction.java index 3611ecb8..82274123 100644 --- a/src/main/java/edu/stanford/protege/webprotege/tag/GetEntityTagsAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/tag/GetEntityTagsAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.tag; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.ProjectAction; @@ -13,7 +14,8 @@ * 18 Mar 2018 */ @JsonTypeName("webprotege.tags.GetEntityTags") -public record GetEntityTagsAction(ProjectId projectId, OWLEntity entity) implements ProjectAction { +public record GetEntityTagsAction(@JsonProperty("projectId") ProjectId projectId, + @JsonProperty("entity") OWLEntity entity) implements ProjectAction { public static final String CHANNEL = "webprotege.tags.GetEntityTags"; @@ -22,7 +24,8 @@ public String getChannel() { return CHANNEL; } - public GetEntityTagsAction(ProjectId projectId, OWLEntity entity) { + public GetEntityTagsAction(@JsonProperty("projectId") ProjectId projectId, + @JsonProperty("entity") OWLEntity entity) { this.projectId = checkNotNull(projectId); this.entity = checkNotNull(entity); } diff --git a/src/main/java/edu/stanford/protege/webprotege/tag/GetEntityTagsResult.java b/src/main/java/edu/stanford/protege/webprotege/tag/GetEntityTagsResult.java index 0bab5a34..aab29b4c 100644 --- a/src/main/java/edu/stanford/protege/webprotege/tag/GetEntityTagsResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/tag/GetEntityTagsResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.tag; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.dispatch.Result; @@ -13,10 +14,11 @@ * 18 Mar 2018 */ @JsonTypeName("webprotege.tags.GetEntityTags") -public record GetEntityTagsResult(Collection entityTags, - Collection projectTags) implements Result { +public record GetEntityTagsResult(@JsonProperty("entityTags") Collection entityTags, + @JsonProperty("projectTags") Collection projectTags) implements Result { - public GetEntityTagsResult(Collection entityTags, Collection projectTags) { + public GetEntityTagsResult(@JsonProperty("entityTags") Collection entityTags, + @JsonProperty("projectTags") Collection projectTags) { this.entityTags = checkNotNull(entityTags); this.projectTags = checkNotNull(projectTags); } diff --git a/src/main/java/edu/stanford/protege/webprotege/tag/GetProjectTagsAction.java b/src/main/java/edu/stanford/protege/webprotege/tag/GetProjectTagsAction.java index b97a3f53..cc4b34d6 100644 --- a/src/main/java/edu/stanford/protege/webprotege/tag/GetProjectTagsAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/tag/GetProjectTagsAction.java @@ -1,6 +1,7 @@ package edu.stanford.protege.webprotege.tag; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.ProjectAction; @@ -13,7 +14,7 @@ * 18 Mar 2018 */ @JsonTypeName("webprotege.tags.GetProjectTags") -public record GetProjectTagsAction(ProjectId projectId) implements ProjectAction { +public record GetProjectTagsAction(@JsonProperty("projectId") ProjectId projectId) implements ProjectAction { public static final String CHANNEL = "webprotege.tags.GetProjectTags"; @@ -22,7 +23,7 @@ public String getChannel() { return CHANNEL; } - public GetProjectTagsAction(ProjectId projectId) { + public GetProjectTagsAction(@JsonProperty("projectId") ProjectId projectId) { this.projectId = checkNotNull(projectId); } } diff --git a/src/main/java/edu/stanford/protege/webprotege/tag/GetProjectTagsResult.java b/src/main/java/edu/stanford/protege/webprotege/tag/GetProjectTagsResult.java index 2583c007..baba17e2 100644 --- a/src/main/java/edu/stanford/protege/webprotege/tag/GetProjectTagsResult.java +++ b/src/main/java/edu/stanford/protege/webprotege/tag/GetProjectTagsResult.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.tag; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.dispatch.Result; @@ -14,10 +15,11 @@ * 18 Mar 2018 */ @JsonTypeName("webprotege.tags.GetProjectTags") -public record GetProjectTagsResult(Set tags, - Map tagUsage) implements Result { +public record GetProjectTagsResult(@JsonProperty("tags") Set tags, + @JsonProperty("tagUsage") Map tagUsage) implements Result { - public GetProjectTagsResult(Set tags, Map tagUsage) { + public GetProjectTagsResult(@JsonProperty("tags") Set tags, + @JsonProperty("tagUsage") Map tagUsage) { this.tags = checkNotNull(tags); this.tagUsage = checkNotNull(tagUsage); } diff --git a/src/main/java/edu/stanford/protege/webprotege/viz/GetProjectEntityGraphDefaultEdgeCriteriaAction.java b/src/main/java/edu/stanford/protege/webprotege/viz/GetProjectEntityGraphDefaultEdgeCriteriaAction.java index d190b157..514179b3 100644 --- a/src/main/java/edu/stanford/protege/webprotege/viz/GetProjectEntityGraphDefaultEdgeCriteriaAction.java +++ b/src/main/java/edu/stanford/protege/webprotege/viz/GetProjectEntityGraphDefaultEdgeCriteriaAction.java @@ -1,5 +1,6 @@ package edu.stanford.protege.webprotege.viz; +import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; import edu.stanford.protege.webprotege.common.ProjectId; import edu.stanford.protege.webprotege.dispatch.ProjectAction; @@ -14,7 +15,7 @@ * 2019-12-07 */ @JsonTypeName("webprotege.graphs.GetProjectEntityGraphDefaultEdgeCriteria") -public record GetProjectEntityGraphDefaultEdgeCriteriaAction(ProjectId projectId) implements ProjectAction { +public record GetProjectEntityGraphDefaultEdgeCriteriaAction(@JsonProperty("projectId") ProjectId projectId) implements ProjectAction { public static final String CHANNEL = "webprotege.graphs.GetProjectEntityGraphDefaultEdgeCriteria";