Remove unused/non-useful fields from LLMFreeTextQuestionValidationResponse

src/main/java/uk/ac/cam/cl/dtg/isaac/dos/IsaacLLMFreeTextQuestion.java

@@ -22,8 +22,6 @@ public class IsaacLLMFreeTextQuestion extends Question {
     private List<LLMFreeTextMarkSchemeEntry> markScheme;
     private Integer maxMarks;
     private String additionalMarkingInstructions;
-    @Deprecated
-    private String markCalculationInstructions;
     private List<LLMFreeTextMarkedExample> markedExamples;
     private LLMMarkingExpression markingFormula;
     @Deprecated
@@ -60,15 +58,6 @@ public void setAdditionalMarkingInstructions(String additionalMarkingInstruction
         this.additionalMarkingInstructions = additionalMarkingInstructions;
     }
 
-    @Deprecated
-    public String getMarkCalculationInstructions() {
-        return markCalculationInstructions;
-    }
-    @Deprecated
-    public void setMarkCalculationInstructions(String markCalculationInstructions) {
-        this.markCalculationInstructions = markCalculationInstructions;
-    }
-
     public List<LLMFreeTextMarkedExample> getMarkedExamples() {
         return markedExamples;
     }

src/main/java/uk/ac/cam/cl/dtg/isaac/dos/LLMFreeTextQuestionValidationResponse.java

@@ -11,9 +11,6 @@
 
 @DTOMapping(LLMFreeTextQuestionValidationResponseDTO.class)
 public class LLMFreeTextQuestionValidationResponse extends QuestionValidationResponse {
-    private String markCalculationInstructions;
-    private String additionalMarkingInstructions;
-    private Integer maxMarks;
     private Integer marksAwarded;
     private List<LLMFreeTextMarkSchemeEntry> markBreakdown;
 
@@ -26,27 +23,6 @@ public LLMFreeTextQuestionValidationResponse(final String questionId, final Choi
         super(questionId, answer, correct, explanation, dateAttempted);
     }
 
-    public String getMarkCalculationInstructions() {
-        return markCalculationInstructions;
-    }
-    public void setMarkCalculationInstructions(String markCalculationInstructions) {
-        this.markCalculationInstructions = markCalculationInstructions;
-    }
-
-    public String getAdditionalMarkingInstructions() {
-        return additionalMarkingInstructions;
-    }
-    public void setAdditionalMarkingInstructions(String additionalMarkingInstructions) {
-        this.additionalMarkingInstructions = additionalMarkingInstructions;
-    }
-
-    public Integer getMaxMarks() {
-        return maxMarks;
-    }
-    public void setMaxMarks(Integer maxMarks) {
-        this.maxMarks = maxMarks;
-    }
-
     public Integer getMarksAwarded() {
         return marksAwarded;
     }

src/main/java/uk/ac/cam/cl/dtg/isaac/dto/LLMFreeTextQuestionValidationResponseDTO.java

@@ -5,51 +5,22 @@
 import java.util.List;
 
 public class LLMFreeTextQuestionValidationResponseDTO extends QuestionValidationResponseDTO {
-    private String markCalculationInstructions;
-    private String additionalMarkingInstructions;
-    private Integer maxMarks;
     private Integer marksAwarded;
     private List<LLMFreeTextMarkSchemeEntryDTO> markBreakdown;
 
     public LLMFreeTextQuestionValidationResponseDTO() {
     }
 
-    public String getMarkCalculationInstructions() {
-        return markCalculationInstructions;
-    }
-
-    public void setMarkCalculationInstructions(String markCalculationInstructions) {
-        this.markCalculationInstructions = markCalculationInstructions;
-    }
-
-    public String getAdditionalMarkingInstructions() {
-        return additionalMarkingInstructions;
-    }
-
-    public void setAdditionalMarkingInstructions(String additionalMarkingInstructions) {
-        this.additionalMarkingInstructions = additionalMarkingInstructions;
-    }
-
-    public Integer getMaxMarks() {
-        return maxMarks;
-    }
-
-    public void setMaxMarks(Integer maxMarks) {
-        this.maxMarks = maxMarks;
-    }
-
     public Integer getMarksAwarded() {
         return marksAwarded;
     }
-
     public void setMarksAwarded(Integer marksAwarded) {
         this.marksAwarded = marksAwarded;
     }
 
     public List<LLMFreeTextMarkSchemeEntryDTO> getMarkBreakdown() {
         return markBreakdown;
     }
-
     public void setMarkBreakdown(List<LLMFreeTextMarkSchemeEntryDTO> markBreakdown) {
         this.markBreakdown = markBreakdown;
     }

src/main/java/uk/ac/cam/cl/dtg/isaac/quiz/IsaacLLMFreeTextValidator.java

@@ -294,10 +294,8 @@ private LLMFreeTextQuestionValidationResponse generateQuestionValidationResponse
 
         LLMFreeTextQuestionValidationResponse validationResponse = new LLMFreeTextQuestionValidationResponse(
                 question.getId(), answer, isConsideredCorrect, null, new Date());
-        validationResponse.setMaxMarks(question.getMaxMarks());
         validationResponse.setMarksAwarded(markTotal);
         validationResponse.setMarkBreakdown(markBreakdown);
-        validationResponse.setAdditionalMarkingInstructions(question.getAdditionalMarkingInstructions());
         return validationResponse;
     }