Merge pull request #672 from isaacphysics/feature/cleanup-coordinate-…

…questions Remove deprecated coordinate question properties
isaacphysics · Feb 5, 2025 · 915d086 · 915d086
2 parents e746a3d + 7e5c3df
commit 915d086
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 49 deletions.
diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/IsaacCoordinateQuestion.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/IsaacCoordinateQuestion.java
@@ -21,10 +21,6 @@ public class IsaacCoordinateQuestion extends IsaacQuestionBase {
     private Integer numberOfDimensions;
 
     private Boolean ordered;  // If true, the order of the coordinates in a choice matters.
-    @Deprecated
-    private String placeholderXValue;
-    @Deprecated
-    private String placeholderYValue;
     private List<String> placeholderValues;
     private Integer significantFiguresMin;
     private Integer significantFiguresMax;
@@ -91,26 +87,6 @@ public void setSignificantFiguresMax(final Integer significantFigures) {
         this.significantFiguresMax = significantFigures;
     }
 
-    @Deprecated
-    public String getPlaceholderXValue() {
-        return placeholderXValue;
-    }
-
-    @Deprecated
-    public void setPlaceholderXValue(String placeholderXValue) {
-        this.placeholderXValue = placeholderXValue;
-    }
-
-    @Deprecated
-    public String getPlaceholderYValue() {
-        return placeholderYValue;
-    }
-
-    @Deprecated
-    public void setPlaceholderYValue(String placeholderYValue) {
-        this.placeholderYValue = placeholderYValue;
-    }
-
     public List<String> getPlaceholderValues() {
         return placeholderValues;
     }

diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/content/CoordinateItem.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/dos/content/CoordinateItem.java
@@ -9,6 +9,7 @@
 @JsonContentType("coordinateItem")
 public class CoordinateItem extends Item {
     private List<String> coordinates;
+    // These two are needed to load old attempts out of the database:
     @Deprecated
     private String x;
     @Deprecated

diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/dto/IsaacCoordinateQuestionDTO.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/dto/IsaacCoordinateQuestionDTO.java
@@ -13,11 +13,6 @@ public class IsaacCoordinateQuestionDTO extends IsaacQuestionBaseDTO {
 
     private List<String> placeholderValues;
 
-    @Deprecated
-    private String placeholderXValue;
-    @Deprecated
-    private String placeholderYValue;
-
     public Integer getNumberOfCoordinates() {
         return numberOfCoordinates;
     }
@@ -42,26 +37,6 @@ public void setOrdered(final Boolean ordered) {
         this.ordered = ordered;
     }
 
-    @Deprecated
-    public String getPlaceholderXValue() {
-        return placeholderXValue;
-    }
-
-    @Deprecated
-    public void setPlaceholderXValue(String placeholderXValue) {
-        this.placeholderXValue = placeholderXValue;
-    }
-
-    @Deprecated
-    public String getPlaceholderYValue() {
-        return placeholderYValue;
-    }
-
-    @Deprecated
-    public void setPlaceholderYValue(String placeholderYValue) {
-        this.placeholderYValue = placeholderYValue;
-    }
-
     public List<String> getPlaceholderValues() {
         return placeholderValues;
     }

diff --git a/src/main/java/uk/ac/cam/cl/dtg/isaac/dto/content/CoordinateItemDTO.java b/src/main/java/uk/ac/cam/cl/dtg/isaac/dto/content/CoordinateItemDTO.java
@@ -4,6 +4,7 @@
 
 public class CoordinateItemDTO extends ItemDTO {
     private List<String> coordinates;
+    // These two are needed to load old attempts out of the database:
     @Deprecated
     private String x;
     @Deprecated