Pin @JsonProperty on FRAGILE wire DTO record components (#52)

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 {
 
 }

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<OWLEntity> subject,
-                                     @Nonnull PageRequest pageRequest) implements ProjectAction<GetProjectChangesResult> {
+public record GetProjectChangesAction(@JsonProperty("projectId") @Nonnull ProjectId projectId,
+                                     @JsonProperty("subject") @Nonnull Optional<OWLEntity> subject,
+                                     @JsonProperty("pageRequest") @Nonnull PageRequest pageRequest) implements ProjectAction<GetProjectChangesResult> {
 
     public static final String CHANNEL = "webprotege.history.GetProjectChanges";
 

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.
 

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<EntityNode> entities) implements Result, Response {
+public record CreateClassesResult(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
+                                  @JsonProperty("projectId") ProjectId projectId,
+                                  @JsonProperty("entities") ImmutableSet<EntityNode> entities) implements Result, Response {
 }

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<OWLDataProperty> parents) implements ProjectAction<CreateDataPropertiesResult>, 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<OWLDataProperty> parents) implements ProjectAction<CreateDataPropertiesResult>, ContentChangeRequest {
 
     public static final String CHANNEL = "webprotege.entities.CreateDataProperties";
 

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<EntityNode> entities,
-                                         ChangeRequestId changeRequestId) implements Result {
+public record CreateDataPropertiesResult(@JsonProperty("projectId") ProjectId projectId,
+                                         @JsonProperty("entities") ImmutableSet<EntityNode> entities,
+                                         @JsonProperty("changeRequestId") ChangeRequestId changeRequestId) implements Result {
 }

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<OWLClass> types) implements ProjectAction<CreateNamedIndividualsResult>, 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<OWLClass> types) implements ProjectAction<CreateNamedIndividualsResult>, ContentChangeRequest {
 
     public static final String CHANNEL = "webprotege.entities.CreateNamedIndividuals";
 

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<EntityNode> entities,
-                                           ChangeRequestId changeRequestId) implements Result {
+public record CreateNamedIndividualsResult(@JsonProperty("projectId") @Nonnull ProjectId projectId,
+                                           @JsonProperty("entities") ImmutableSet<EntityNode> entities,
+                                           @JsonProperty("changeRequestId") ChangeRequestId changeRequestId) implements Result {
 }

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<OWLObjectProperty> parents) implements ProjectAction<CreateObjectPropertiesResult>, 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<OWLObjectProperty> parents) implements ProjectAction<CreateObjectPropertiesResult>, ContentChangeRequest {
 
     public static final String CHANNEL = "webprotege.entities.CreateObjectProperties";
 

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<OWLEntity> entities) implements ProjectAction<DeleteEntitiesResult>, ContentChangeRequest {
+public record DeleteEntitiesAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
+                                   @JsonProperty("projectId") ProjectId projectId,
+                                   @JsonProperty("entities") ImmutableSet<OWLEntity> entities) implements ProjectAction<DeleteEntitiesResult>, 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<OWLEntity> entities) {
+    public DeleteEntitiesAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
+                                @JsonProperty("projectId") ProjectId projectId,
+                                @JsonProperty("entities") ImmutableSet<OWLEntity> entities) {
         this.changeRequestId = checkNotNull(changeRequestId);
         this.projectId = checkNotNull(projectId);
         this.entities = checkNotNull(entities);

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<OWLEntity> deletedEntities) implements Result {
+public record DeleteEntitiesResult(@JsonProperty("deletedEntities") ImmutableSet<OWLEntity> deletedEntities) implements Result {
 }

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<OWLEntityData> entities) implements Result {
+public record GetDeprecatedEntitiesResult(@JsonProperty("entities") Page<OWLEntityData> entities) implements Result {
 
 }

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<LookupEntitiesResult> {
+public record LookupEntitiesAction(@JsonProperty("projectId") ProjectId projectId,
+                                   @JsonProperty("entityLookupRequest") EntityLookupRequest entityLookupRequest) implements ProjectAction<LookupEntitiesResult> {
 
     public static final String CHANNEL = "webprotege.entities.LookupEntities";
 

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<EntityLookupResult> results) implements Result {
+public record LookupEntitiesResult(@JsonProperty("results") List<EntityLookupResult> results) implements Result {
 
 }

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<Path<GraphNode<EntityNode>>> paths) implements Result {
+public record GetHierarchyPathsToRootResult(@JsonProperty("paths") Collection<Path<GraphNode<EntityNode>>> paths) implements Result {
 
 }

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<GetHierarchyRootsResult> {
+public record GetHierarchyRootsAction(@JsonProperty("projectId") @Nonnull ProjectId projectId,
+                                      @JsonProperty("hierarchyDescriptor") @Nonnull HierarchyDescriptor hierarchyDescriptor) implements ProjectAction<GetHierarchyRootsResult> {
 
     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);
     }

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<EntityDiscussionThread> threads) implements Result {
+public record CreateEntityDiscussionThreadResult(@JsonProperty("threads") @Nonnull ImmutableList<EntityDiscussionThread> threads) implements Result {
 }

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<GetEntityDiscussionThreadsResult> {
+public record GetEntityDiscussionThreadsAction(@JsonProperty("projectId") @Nonnull ProjectId projectId,
+                                               @JsonProperty("entity") @Nonnull OWLEntity entity) implements ProjectAction<GetEntityDiscussionThreadsResult> {
 
     public static final String CHANNEL = "webprotege.discussions.GetEntityDiscussionThreads";
 

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<EntityDiscussionThread> threads) implements Result {
+public record GetEntityDiscussionThreadsResult(@JsonProperty("entity") OWLEntityData entity,
+                                               @JsonProperty("threads") ImmutableList<EntityDiscussionThread> threads) implements Result {
 }