Development: Replace if-else chains with pattern matching
#9303
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -337,36 +337,36 @@ private void filterOutUselessDataFromComplaint(Complaint complaint) { | |
| } | ||
|
|
||
| Submission originalSubmission = complaint.getResult().getSubmission(); | ||
| if (originalSubmission == null) { | ||
| return; | ||
| } | ||
|
|
||
| Submission submissionWithOnlyId = switch (originalSubmission) { | ||
| case TextSubmission ignored -> new TextSubmission(); | ||
| case ModelingSubmission ignored -> new ModelingSubmission(); | ||
| case FileUploadSubmission ignored -> new FileUploadSubmission(); | ||
| case ProgrammingSubmission ignored -> new ProgrammingSubmission(); | ||
| default -> null; | ||
| }; | ||
|
|
||
| if (submissionWithOnlyId == null) { | ||
| return; | ||
| } | ||
|
|
||
| submissionWithOnlyId.setId(originalSubmission.getId()); | ||
| complaint.getResult().setSubmission(submissionWithOnlyId); | ||
| } | ||
|
|
||
| private static Exercise getExercise(StudentParticipation originalParticipation) { | ||
| Exercise exerciseWithOnlyTitle = originalParticipation.getExercise(); | ||
| switch (exerciseWithOnlyTitle) { | ||
| case TextExercise ignored -> exerciseWithOnlyTitle = new TextExercise(); | ||
| case ModelingExercise ignored -> exerciseWithOnlyTitle = new ModelingExercise(); | ||
| case FileUploadExercise ignored -> exerciseWithOnlyTitle = new FileUploadExercise(); | ||
| case ProgrammingExercise ignored -> exerciseWithOnlyTitle = new ProgrammingExercise(); | ||
| case null, default -> log.error("Invalid exercise {} passed", exerciseWithOnlyTitle.getType()); | ||
| } | ||
|
|
||
| exerciseWithOnlyTitle.setTitle(originalParticipation.getExercise().getTitle()); | ||
| exerciseWithOnlyTitle.setId(originalParticipation.getExercise().getId()); | ||
| return exerciseWithOnlyTitle; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -100,8 +100,13 @@ private boolean createQuizAnswersExport(QuizExercise quizExercise, StudentPartic | |
| for (var question : quizQuestions) { | ||
| var submittedAnswer = quizSubmission.getSubmittedAnswerForQuestion(question); | ||
| // if this question wasn't answered, the submitted answer is null | ||
| if (submittedAnswer == null) { | ||
| // go to next question | ||
| continue; | ||
| } | ||
|
|
||
| switch (submittedAnswer) { | ||
| case DragAndDropSubmittedAnswer dragAndDropSubmittedAnswer -> { | ||
| try { | ||
| dragAndDropQuizAnswerConversionService.convertDragAndDropQuizAnswerAndStoreAsPdf(dragAndDropSubmittedAnswer, outputDir, includeResults); | ||
| } | ||
|
|
@@ -111,14 +116,15 @@ private boolean createQuizAnswersExport(QuizExercise quizExercise, StudentPartic | |
| + quizExercise.getTitle() + " with id " + quizExercise.getId())); | ||
| } | ||
| } | ||
| case ShortAnswerSubmittedAnswer shortAnswerSubmittedAnswer -> | ||
| shortAnswerQuestionsSubmissions.add(createExportForShortAnswerQuestion(shortAnswerSubmittedAnswer, includeResults)); | ||
| case MultipleChoiceSubmittedAnswer multipleChoiceSubmittedAnswer -> | ||
| multipleChoiceQuestionsSubmissions.add(createExportForMultipleChoiceAnswerQuestion(multipleChoiceSubmittedAnswer, includeResults)); | ||
| default -> { | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (!multipleChoiceQuestionsSubmissions.isEmpty()) { | ||
| try { | ||
| FileUtils.writeLines(outputDir.resolve("quiz_submission_" + submission.getId() + "_multiple_choice_questions_answers" + TXT_FILE_EXTENSION).toFile(), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -893,33 +893,33 @@ private Map<Long, Double> calculateAchievedPointsForExercises(List<StudentPartic | |
| * @return true if at least one submission is not empty else false | ||
| */ | ||
| private boolean hasNonEmptySubmission(Set<Submission> submissions, Exercise exercise) { | ||
| switch (exercise) { | ||
| case ProgrammingExercise ignored -> { | ||
| return submissions.stream().anyMatch(submission -> submission.getType() == SubmissionType.MANUAL); | ||
| } | ||
| case FileUploadExercise ignored -> { | ||
| FileUploadSubmission fileUploadSubmission = (FileUploadSubmission) submissions.iterator().next(); | ||
| return fileUploadSubmission.getFilePath() != null && !fileUploadSubmission.getFilePath().isEmpty(); | ||
| } | ||
| case TextExercise ignored -> { | ||
| TextSubmission textSubmission = (TextSubmission) submissions.iterator().next(); | ||
| return textSubmission.getText() != null && !textSubmission.getText().isBlank(); | ||
| } | ||
| case ModelingExercise ignored -> { | ||
| ModelingSubmission modelingSubmission = (ModelingSubmission) submissions.iterator().next(); | ||
| try { | ||
| return !modelingSubmission.isEmpty(this.defaultObjectMapper); | ||
| } | ||
| catch (Exception e) { | ||
| // Then the student most likely submitted something which breaks the model, if parsing fails | ||
| return true; | ||
| } | ||
| } | ||
| case QuizExercise ignored -> { | ||
| // NOTE: due to performance concerns, this is handled differently, search for quizSubmittedAnswerCounts to find out more | ||
| return true; | ||
| } | ||
| case null, default -> throw new IllegalArgumentException("The exercise type of the exercise with id " + exercise.getId() + " is not supported"); | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Use consistent variable naming in switch-case patterns
In the switch statement, the variable
team1is used incase Team team1 -> this.team = team1;. For consistency and clarity, consider renamingteam1toteam, aligning it with the field namethis.teamand improving readability.Apply this diff to rename the variable:
switch (participant) { case User user -> this.student = user; - case Team team1 -> this.team = team1; + case Team team -> this.team = team; case null -> { this.student = null; this.team = null; } default -> throw new Error("Unknown participant type"); }📝 Committable suggestion