Reconcile MISMATCH wire DTOs (issue #53) — backend half

src/main/java/edu/stanford/protege/webprotege/app/SetApplicationSettingsAction.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.common.ChangeRequest;
 import edu.stanford.protege.webprotege.common.ChangeRequestId;
@@ -15,8 +16,8 @@
 
 
 @JsonTypeName("webprotege.application.SetApplicationSettings")
-public record SetApplicationSettingsAction(ChangeRequestId changeRequestId,
-                                           @Nonnull ApplicationSettings applicationSettings) implements Action<SetApplicationSettingsResult>, ChangeRequest {
+public record SetApplicationSettingsAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
+                                           @JsonProperty("applicationSettings") @Nonnull ApplicationSettings applicationSettings) implements Action<SetApplicationSettingsResult>, ChangeRequest {
 
     public static final String CHANNEL = "webprotege.application.SetApplicationSettings";
 

src/main/java/edu/stanford/protege/webprotege/bulkop/EditAnnotationsAction.java

@@ -21,7 +21,7 @@
 
 
 @JsonTypeName("webprotege.bulkop.EditAnnotations")
-public record EditAnnotationsAction(@JsonProperty("contentChangeRequest") ChangeRequestId changeRequestId,
+public record EditAnnotationsAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
                                     @JsonProperty("projectId") @Nonnull ProjectId projectId,
                                     @JsonProperty("entities") @Nonnull ImmutableSet<OWLEntity> entities,
                                     @JsonProperty("operation") Operation operation,

src/main/java/edu/stanford/protege/webprotege/bulkop/SetAnnotationValueAction.java

@@ -21,7 +21,7 @@
 
 
 @JsonTypeName("webprotege.bulkop.SetAnnotationValue")
-public record SetAnnotationValueAction(ChangeRequestId changeRequestId,
+public record SetAnnotationValueAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
                                        @JsonProperty("projectId") @Nonnull ProjectId projectId,
                                        @JsonProperty("entities") @Nonnull ImmutableSet<OWLEntity> entities,
                                        @JsonProperty("property") @Nonnull OWLAnnotationProperty property,

src/main/java/edu/stanford/protege/webprotege/change/RevertRevisionAction.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.ChangeRequestId;
 import edu.stanford.protege.webprotege.common.ContentChangeRequest;
@@ -13,7 +14,9 @@
  * 19/03/15
  */
 @JsonTypeName("webprotege.history.RevertRevision")
-public record RevertRevisionAction(ChangeRequestId changeRequestId, ProjectId projectId, RevisionNumber revisionNumber) implements ProjectAction<RevertRevisionResult>, ContentChangeRequest {
+public record RevertRevisionAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
+                                   @JsonProperty("projectId") ProjectId projectId,
+                                   @JsonProperty("revisionNumber") RevisionNumber revisionNumber) implements ProjectAction<RevertRevisionResult>, ContentChangeRequest {
 
     public static final String CHANNEL = "webprotege.history.RevertRevision";
 

src/main/java/edu/stanford/protege/webprotege/crud/SetEntityCrudKitSettingsAction.java

@@ -1,5 +1,6 @@
 package edu.stanford.protege.webprotege.crud;
 
+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;
@@ -13,8 +14,11 @@
  * Date: 8/19/13
  */
 @JsonTypeName("webprotege.projects.SetEntityCrudKitSettings")
-public record SetEntityCrudKitSettingsAction(ChangeRequestId changeRequestId,
-                                             ProjectId projectId, EntityCrudKitSettings fromSettings, EntityCrudKitSettings toSettings, IRIPrefixUpdateStrategy prefixUpdateStrategy) implements ProjectAction<SetEntityCrudKitSettingsResult>, ChangeRequest {
+public record SetEntityCrudKitSettingsAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
+                                             @JsonProperty("projectId") ProjectId projectId,
+                                             @JsonProperty("fromSettings") EntityCrudKitSettings fromSettings,
+                                             @JsonProperty("toSettings") EntityCrudKitSettings toSettings,
+                                             @JsonProperty("prefixUpdateStrategy") IRIPrefixUpdateStrategy prefixUpdateStrategy) implements ProjectAction<SetEntityCrudKitSettingsResult>, ChangeRequest {
 
     public static final String CHANNEL = "webprotege.projects.SetEntityCrudKitSettings";
 

src/main/java/edu/stanford/protege/webprotege/entity/MergeEntitiesAction.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;
@@ -26,12 +27,12 @@
  * @param treatment The treatment for the merged term that specifies whether the merged term
  */
 @JsonTypeName("webprotege.entities.MergeEntities")
-public record MergeEntitiesAction(@Nonnull ChangeRequestId changeRequestId,
-                                  @Nonnull ProjectId projectId,
-                                  @Nonnull ImmutableSet<OWLEntity> sourceEntities,
-                                  @Nonnull OWLEntity targetEntity,
-                                  @Nonnull MergedEntityTreatment treatment,
-                                  @Nonnull String commitMessage) implements ProjectAction<MergeEntitiesResult>, ContentChangeRequest {
+public record MergeEntitiesAction(@JsonProperty("changeRequestId") @Nonnull ChangeRequestId changeRequestId,
+                                  @JsonProperty("projectId") @Nonnull ProjectId projectId,
+                                  @JsonProperty("sourceEntities") @Nonnull ImmutableSet<OWLEntity> sourceEntities,
+                                  @JsonProperty("targetEntity") @Nonnull OWLEntity targetEntity,
+                                  @JsonProperty("treatment") @Nonnull MergedEntityTreatment treatment,
+                                  @JsonProperty("commitMessage") @Nonnull String commitMessage) implements ProjectAction<MergeEntitiesResult>, ContentChangeRequest {
 
     public static final String CHANNEL = "webprotege.entities.MergeEntities";
 

src/main/java/edu/stanford/protege/webprotege/event/EntityDeprecationStatusChangedEvent.java

@@ -1,6 +1,7 @@
 package edu.stanford.protege.webprotege.event;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import edu.stanford.protege.webprotege.common.EventId;
 import edu.stanford.protege.webprotege.common.ProjectEvent;
@@ -14,10 +15,10 @@
  * Date: 21/03/2013
  */
 @JsonTypeName("webprotege.events.entities.EntityDeprecationStatusChanged")
-public record EntityDeprecationStatusChangedEvent(EventId eventId,
-                                                  ProjectId projectId,
-                                                  OWLEntity entity,
-                                                  boolean deprecated) implements ProjectEvent {
+public record EntityDeprecationStatusChangedEvent(@JsonProperty("eventId") EventId eventId,
+                                                  @JsonProperty("projectId") ProjectId projectId,
+                                                  @JsonProperty("entity") OWLEntity entity,
+                                                  @JsonProperty("deprecated") boolean deprecated) implements ProjectEvent {
 
     public static final String CHANNEL = "webprotege.events.entities.EntityDeprecationStatusChanged";
 

src/main/java/edu/stanford/protege/webprotege/event/LargeNumberOfChangesEvent.java

@@ -1,6 +1,7 @@
 package edu.stanford.protege.webprotege.event;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import edu.stanford.protege.webprotege.common.EventId;
 import edu.stanford.protege.webprotege.common.ProjectEvent;
@@ -12,8 +13,8 @@
  * 2020-11-04
  */
 @JsonTypeName("webprotege.events.projects.LargeNumberOfChanges")
-public record LargeNumberOfChangesEvent(EventId eventId,
-                                        ProjectId projectId) implements ProjectEvent {
+public record LargeNumberOfChangesEvent(@JsonProperty("eventId") EventId eventId,
+                                        @JsonProperty("projectId") ProjectId projectId) implements ProjectEvent {
 
     public static final String CHANNEL = "webprotege.events.projects.LargeNumberOfChanges";
 

src/main/java/edu/stanford/protege/webprotege/event/ProjectChangedEvent.java

@@ -1,6 +1,7 @@
 package edu.stanford.protege.webprotege.event;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import edu.stanford.protege.webprotege.common.EventId;
 import edu.stanford.protege.webprotege.common.ProjectEvent;
@@ -23,8 +24,10 @@
  * @throws NullPointerException if any parameters are {@code null}.
  */
 @JsonTypeName("webprotege.events.project.ProjectChanged")
-public record ProjectChangedEvent(EventId eventId,
-                                  ProjectId projectId, RevisionSummary revisionSummary, Set<OWLEntityData> subjects) implements ProjectEvent {
+public record ProjectChangedEvent(@JsonProperty("eventId") EventId eventId,
+                                  @JsonProperty("projectId") ProjectId projectId,
+                                  @JsonProperty("revisionSummary") RevisionSummary revisionSummary,
+                                  @JsonProperty("subjects") Set<OWLEntityData> subjects) implements ProjectEvent {
 
     public static final String CHANNEL = "webprotege.events.project.ProjectChanged";
 

src/main/java/edu/stanford/protege/webprotege/hierarchy/GetHierarchySiblingsResult.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.Page;
 import edu.stanford.protege.webprotege.dispatch.Result;
@@ -13,6 +14,6 @@
 
 
 @JsonTypeName("webprotege.hierarchies.GetHierarchySiblings")
-public record GetHierarchySiblingsResult(Page<GraphNode<EntityNode>> siblingsPage) implements Result {
+public record GetHierarchySiblingsResult(@JsonProperty("siblingsPage") Page<GraphNode<EntityNode>> siblingsPage) implements Result {
 
 }

src/main/java/edu/stanford/protege/webprotege/individuals/GetIndividualsAction.java

@@ -1,6 +1,7 @@
 package edu.stanford.protege.webprotege.individuals;
 
 
+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;
@@ -14,11 +15,11 @@
  * Date: 12/09/2013
  */
 @JsonTypeName("webprotege.entities.GetIndividuals")
-public record GetIndividualsAction(ProjectId projectId,
-                                  OWLClass type,
-                                  PageRequest pageRequest,
-                                  String searchString,
-                                  InstanceRetrievalMode instanceRetrievalMode) implements ProjectAction<GetIndividualsResult> {
+public record GetIndividualsAction(@JsonProperty("projectId") ProjectId projectId,
+                                  @JsonProperty("type") OWLClass type,
+                                  @JsonProperty("pageRequest") PageRequest pageRequest,
+                                  @JsonProperty("searchString") String searchString,
+                                  @JsonProperty("instanceRetrievalMode") InstanceRetrievalMode instanceRetrievalMode) implements ProjectAction<GetIndividualsResult> {
 
     public static final String CHANNEL = "webprotege.entities.GetIndividuals";
 

src/main/java/edu/stanford/protege/webprotege/issues/AddCommentAction.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.ChangeRequestId;
 import edu.stanford.protege.webprotege.common.ContentChangeRequest;
@@ -13,10 +14,10 @@
  * 7 Oct 2016
  */
 @JsonTypeName("webprotege.discussions.AddComment")
-public record AddCommentAction(ChangeRequestId changeRequestId,
-                               ProjectId projectId,
-                               ThreadId threadId,
-                               String comment) implements ProjectAction<AddCommentResult>, HasProjectId, ContentChangeRequest {
+public record AddCommentAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
+                               @JsonProperty("projectId") ProjectId projectId,
+                               @JsonProperty("threadId") ThreadId threadId,
+                               @JsonProperty("comment") String comment) implements ProjectAction<AddCommentResult>, HasProjectId, ContentChangeRequest {
 
     public static final String CHANNEL = "webprotege.discussions.AddComment";
 

src/main/java/edu/stanford/protege/webprotege/issues/CommentUpdatedEvent.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.common.EventId;
 import edu.stanford.protege.webprotege.common.ProjectEvent;
@@ -14,10 +15,10 @@
  * 11 Oct 2016
  */
 @JsonTypeName("webprotege.events.discussions.CommentUpdated")
-public record CommentUpdatedEvent(@Nonnull EventId eventId,
-                                  @Nonnull ProjectId projectId,
-                                  @Nonnull ThreadId threadId,
-                                  @Nonnull Comment comment) implements ProjectEvent {
+public record CommentUpdatedEvent(@JsonProperty("eventId") @Nonnull EventId eventId,
+                                  @JsonProperty("projectId") @Nonnull ProjectId projectId,
+                                  @JsonProperty("threadId") @Nonnull ThreadId threadId,
+                                  @JsonProperty("comment") @Nonnull Comment comment) implements ProjectEvent {
 
     public static final String CHANNEL = "webprotege.events.discussions.CommentUpdated";
 

src/main/java/edu/stanford/protege/webprotege/issues/CreateEntityDiscussionThreadAction.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.ChangeRequestId;
 import edu.stanford.protege.webprotege.common.ContentChangeRequest;
@@ -13,10 +14,10 @@
  * 6 Oct 2016
  */
 @JsonTypeName("webprotege.discussions.CreateEntityDiscussionThread")
-public record CreateEntityDiscussionThreadAction(ChangeRequestId changeRequestId,
-                                                 ProjectId projectId,
-                                                 OWLEntity entity,
-                                                 String comment) implements ProjectAction<CreateEntityDiscussionThreadResult>, ContentChangeRequest {
+public record CreateEntityDiscussionThreadAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
+                                                 @JsonProperty("projectId") ProjectId projectId,
+                                                 @JsonProperty("entity") OWLEntity entity,
+                                                 @JsonProperty("comment") String comment) implements ProjectAction<CreateEntityDiscussionThreadResult>, ContentChangeRequest {
 
     public static final String CHANNEL = "webprotege.discussions.CreateEntityDiscussionThread";
 

src/main/java/edu/stanford/protege/webprotege/issues/DeleteCommentAction.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.ChangeRequestId;
 import edu.stanford.protege.webprotege.common.ContentChangeRequest;
@@ -12,9 +13,9 @@
  * 9 Oct 2016
  */
 @JsonTypeName("webprotege.discussions.DeleteComment")
-public record DeleteCommentAction(ChangeRequestId changeRequestId,
-                                  ProjectId projectId,
-                                  CommentId commentId) implements ProjectAction<DeleteCommentResult>, ContentChangeRequest {
+public record DeleteCommentAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
+                                  @JsonProperty("projectId") ProjectId projectId,
+                                  @JsonProperty("commentId") CommentId commentId) implements ProjectAction<DeleteCommentResult>, ContentChangeRequest {
 
     public static final String CHANNEL = "webprotege.discussions.DeleteComment";
 

src/main/java/edu/stanford/protege/webprotege/issues/SetDiscussionThreadStatusAction.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.common.ChangeRequestId;
 import edu.stanford.protege.webprotege.common.ContentChangeRequest;
@@ -15,10 +16,10 @@
  * 12 Oct 2016
  */
 @JsonTypeName("webprotege.discussions.SetDiscussionThreadStatus")
-public record SetDiscussionThreadStatusAction(ChangeRequestId changeRequestId,
-                                              @Nonnull ProjectId projectId,
-                                              @Nonnull ThreadId threadId,
-                                              @Nonnull Status status) implements ProjectAction<SetDiscussionThreadStatusResult>, ContentChangeRequest {
+public record SetDiscussionThreadStatusAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
+                                              @JsonProperty("projectId") @Nonnull ProjectId projectId,
+                                              @JsonProperty("threadId") @Nonnull ThreadId threadId,
+                                              @JsonProperty("status") @Nonnull Status status) implements ProjectAction<SetDiscussionThreadStatusResult>, ContentChangeRequest {
 
     public static final String CHANNEL = "webprotege.discussions.SetDiscussionThreadStatus";
 

src/main/java/edu/stanford/protege/webprotege/lang/DisplayNameSettingsChangedEvent.java

@@ -15,9 +15,9 @@
  * 29 Jul 2018
  */
 @JsonTypeName("webprotege.events.projects.DisplayNameSettingsChanged")
-public record DisplayNameSettingsChangedEvent(EventId eventId,
-                                              ProjectId projectId,
-                                              DisplayNameSettings displayNameSettings) implements ProjectEvent {
+public record DisplayNameSettingsChangedEvent(@JsonProperty("eventId") EventId eventId,
+                                              @JsonProperty("projectId") ProjectId projectId,
+                                              @JsonProperty("displayNameSettings") DisplayNameSettings displayNameSettings) implements ProjectEvent {
 
     public static final String CHANNEL = "webprotege.events.projects.DisplayNameSettingsChanged";
 

src/main/java/edu/stanford/protege/webprotege/merge/MergeUploadedProjectAction.java

@@ -16,7 +16,7 @@
 
 
 @JsonTypeName("webprotege.projects.MergeUploadedProject")
-public record MergeUploadedProjectAction(@JsonProperty("changeRequesId") ChangeRequestId changeRequestId,
+public record MergeUploadedProjectAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
                                          @JsonProperty("projectId") ProjectId projectId,
                                          @JsonProperty("documentId") DocumentId uploadedDocumentId,
                                          @JsonProperty("commitMessage") String commitMessage) implements ProjectAction<MergeUploadedProjectResult>, ContentChangeRequest {

src/main/java/edu/stanford/protege/webprotege/merge_add/ExistingOntologyMergeAddAction.java

@@ -13,14 +13,14 @@
 
 
 
-@JsonTypeName("webprotege.ontologies.MergeOntologies")
+@JsonTypeName("webprotege.ontologies.ExistingOntologyMergeAdd")
 public record ExistingOntologyMergeAddAction(@JsonProperty("changeRequestId") ChangeRequestId changeRequestId,
                                              @JsonProperty("projectId") ProjectId projectId,
                                              @JsonProperty("documentId") DocumentId documentId,
                                              @JsonProperty("selectedOntologies") List<OWLOntologyID> selectedOntologies,
                                              @JsonProperty("targetOntology") OWLOntologyID targetOntology) implements ProjectAction<ExistingOntologyMergeAddResult>, ContentChangeRequest {
 
-    public static final String CHANNEL = "webprotege.ontologies.MergeOntologies";
+    public static final String CHANNEL = "webprotege.ontologies.ExistingOntologyMergeAdd";
 
     @Override
     public String getChannel() {

src/main/java/edu/stanford/protege/webprotege/merge_add/ExistingOntologyMergeAddResult.java

@@ -5,7 +5,7 @@
 
 
 
-@JsonTypeName("webprotege.ontologies.MergeOntologies")
+@JsonTypeName("webprotege.ontologies.ExistingOntologyMergeAdd")
 public record ExistingOntologyMergeAddResult() implements Result {
 
 }