From 497e26eef41b8b2bdbda8344e9f035b4ec48f4f8 Mon Sep 17 00:00:00 2001
From: Matthew Horridge <matthew.horridge@stanford.edu>
Date: Wed, 19 Jun 2024 00:04:53 -0700
Subject: [PATCH] Use data instead of controlData

---
 .../edu/stanford/protege/webprotege/forms/PropertyNames.java  | 2 +-
 .../stanford/protege/webprotege/forms/data/FormFieldData.java | 4 ++--
 .../protege/webprotege/forms/data/FormFieldDataDto.java       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/edu/stanford/protege/webprotege/forms/PropertyNames.java b/src/main/java/edu/stanford/protege/webprotege/forms/PropertyNames.java
index eebc5df..94f0ff5 100644
--- a/src/main/java/edu/stanford/protege/webprotege/forms/PropertyNames.java
+++ b/src/main/java/edu/stanford/protege/webprotege/forms/PropertyNames.java
@@ -131,7 +131,7 @@ public interface PropertyNames {
 
     String FORM = "form";
 
-    String CONTROL_DATA = "controlData";
+    String DATA = "data";
 
     String FIELD = "field";
 }
diff --git a/src/main/java/edu/stanford/protege/webprotege/forms/data/FormFieldData.java b/src/main/java/edu/stanford/protege/webprotege/forms/data/FormFieldData.java
index 295ef14..e5c0440 100644
--- a/src/main/java/edu/stanford/protege/webprotege/forms/data/FormFieldData.java
+++ b/src/main/java/edu/stanford/protege/webprotege/forms/data/FormFieldData.java
@@ -19,7 +19,7 @@ public abstract class FormFieldData {
 
     @JsonCreator
     public static FormFieldData get(@JsonProperty(PropertyNames.FIELD) @Nonnull FormFieldDescriptor descriptor,
-                                    @JsonProperty(PropertyNames.CONTROL_DATA) @Nonnull Page<FormControlData> formControlData) {
+                                    @JsonProperty(PropertyNames.DATA) @Nonnull Page<FormControlData> formControlData) {
         return new AutoValue_FormFieldData(descriptor, formControlData);
     }
 
@@ -31,7 +31,7 @@ public static FormFieldData get(@JsonProperty(PropertyNames.FIELD) @Nonnull Form
      * Gets the page of form control values for this field.
      */
     @Nonnull
-    @JsonPropertyOrder(PropertyNames.CONTROL_DATA)
+    @JsonPropertyOrder(PropertyNames.DATA)
     public abstract Page<FormControlData> getFormControlData();
 
     @JsonIgnore
diff --git a/src/main/java/edu/stanford/protege/webprotege/forms/data/FormFieldDataDto.java b/src/main/java/edu/stanford/protege/webprotege/forms/data/FormFieldDataDto.java
index 635fb88..dd03211 100644
--- a/src/main/java/edu/stanford/protege/webprotege/forms/data/FormFieldDataDto.java
+++ b/src/main/java/edu/stanford/protege/webprotege/forms/data/FormFieldDataDto.java
@@ -17,7 +17,7 @@ public abstract class FormFieldDataDto {
     @JsonCreator
     @Nonnull
     public static FormFieldDataDto get(@JsonProperty(PropertyNames.FIELD) @Nonnull FormFieldDescriptorDto descriptor,
-                                       @JsonProperty(PropertyNames.CONTROL_DATA) @Nonnull Page<FormControlDataDto> formControlData) {
+                                       @JsonProperty(PropertyNames.DATA) @Nonnull Page<FormControlDataDto> formControlData) {
         return new AutoValue_FormFieldDataDto(descriptor, formControlData);
     }
 
@@ -29,7 +29,7 @@ public static FormFieldDataDto get(@JsonProperty(PropertyNames.FIELD) @Nonnull F
      * Gets the page of form control values for this field.
      */
     @Nonnull
-    @JsonProperty(PropertyNames.CONTROL_DATA)
+    @JsonProperty(PropertyNames.DATA)
     public abstract Page<FormControlDataDto> getFormControlData();
 
     @Nonnull