Skip to content

Commit

Permalink
don't use boxed types
Browse files Browse the repository at this point in the history
  • Loading branch information
@Strohgelaender
Strohgelaender committed Feb 13, 2024
1 parent 9254da9 commit 611e77d
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 85 deletions.
62 changes: 31 additions & 31 deletions src/main/java/de/tum/in/www1/artemis/repository/ProgrammingExerciseRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,42 +53,42 @@ public interface ProgrammingExerciseRepository extends JpaRepository<Programming
AND (tpr.id = (SELECT MAX(re1.id) FROM tp.results re1) OR tpr.id IS NULL)
AND (spr.id = (SELECT MAX(re2.id) FROM sp.results re2) OR spr.id IS NULL)
""")
List<ProgrammingExercise> findByCourseIdWithLatestResultForTemplateSolutionParticipations(@Param("courseId") Long courseId);
List<ProgrammingExercise> findByCourseIdWithLatestResultForTemplateSolutionParticipations(@Param("courseId") long courseId);

@EntityGraph(type = LOAD, attributePaths = { "templateParticipation", "solutionParticipation", "teamAssignmentConfig", "categories", "auxiliaryRepositories",
"submissionPolicy" })
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesById(Long exerciseId);
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesById(long exerciseId);

@EntityGraph(type = LOAD, attributePaths = { "templateParticipation", "solutionParticipation", "teamAssignmentConfig", "categories", "competencies", "auxiliaryRepositories",
"submissionPolicy" })
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesById(Long exerciseId);
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesById(long exerciseId);

@EntityGraph(type = LOAD, attributePaths = { "templateParticipation", "solutionParticipation", "teamAssignmentConfig", "categories", "competencies", "auxiliaryRepositories",
"submissionPolicy", "plagiarismDetectionConfig" })
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigById(Long exerciseId);
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesAndCompetenciesAndPlagiarismDetectionConfigById(long exerciseId);

@EntityGraph(type = LOAD, attributePaths = { "templateParticipation", "solutionParticipation", "auxiliaryRepositories" })
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationAndAuxiliaryRepositoriesById(Long exerciseId);
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationAndAuxiliaryRepositoriesById(long exerciseId);

@EntityGraph(type = LOAD, attributePaths = { "templateParticipation", "solutionParticipation" })
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationById(Long exerciseId);
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationById(long exerciseId);

@EntityGraph(type = LOAD, attributePaths = { "categories", "teamAssignmentConfig", "templateParticipation.submissions.results", "solutionParticipation.submissions.results",
"auxiliaryRepositories" })
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationSubmissionsAndResultsAndAuxiliaryRepositoriesById(Long exerciseId);
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationSubmissionsAndResultsAndAuxiliaryRepositoriesById(long exerciseId);

@EntityGraph(type = LOAD, attributePaths = { "categories", "teamAssignmentConfig", "templateParticipation.submissions.results", "solutionParticipation.submissions.results",
"auxiliaryRepositories", "plagiarismDetectionConfig", "buildPlanConfiguration", "buildScript", "templateParticipation", "solutionParticipation" })
Optional<ProgrammingExercise> findForCreationById(Long exerciseId);
Optional<ProgrammingExercise> findForCreationById(long exerciseId);

@EntityGraph(type = LOAD, attributePaths = "testCases")
Optional<ProgrammingExercise> findWithTestCasesById(Long exerciseId);
Optional<ProgrammingExercise> findWithTestCasesById(long exerciseId);

@EntityGraph(type = LOAD, attributePaths = "auxiliaryRepositories")
Optional<ProgrammingExercise> findWithAuxiliaryRepositoriesById(Long exerciseId);
Optional<ProgrammingExercise> findWithAuxiliaryRepositoriesById(long exerciseId);

@EntityGraph(type = LOAD, attributePaths = "submissionPolicy")
Optional<ProgrammingExercise> findWithSubmissionPolicyById(Long exerciseId);
Optional<ProgrammingExercise> findWithSubmissionPolicyById(long exerciseId);

List<ProgrammingExercise> findAllByProjectKey(String projectKey);

Expand Down Expand Up @@ -142,7 +142,7 @@ default ProgrammingExercise findOneByProjectKeyOrThrow(String projectKey, boolea
AND (tpr.id = (SELECT MAX(re1.id) FROM tp.results re1) OR tpr.id IS NULL)
AND (spr.id = (SELECT MAX(re2.id) FROM sp.results re2) OR spr.id IS NULL)
""")
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationLatestResultFeedbackTestCasesById(@Param("exerciseId") Long exerciseId);
Optional<ProgrammingExercise> findWithTemplateAndSolutionParticipationLatestResultFeedbackTestCasesById(@Param("exerciseId") long exerciseId);

/**
* Get all programming exercises that need to be scheduled: Those must satisfy one of the following requirements:
Expand Down Expand Up @@ -224,10 +224,10 @@ default ProgrammingExercise findOneByProjectKeyOrThrow(String projectKey, boolea
LEFT JOIN FETCH pe.solutionParticipation
WHERE pe.id = :exerciseId
""")
Optional<ProgrammingExercise> findWithEagerTemplateAndSolutionParticipationsById(@Param("exerciseId") Long exerciseId);
Optional<ProgrammingExercise> findWithEagerTemplateAndSolutionParticipationsById(@Param("exerciseId") long exerciseId);

@EntityGraph(type = LOAD, attributePaths = { "studentParticipations", "studentParticipations.team", "studentParticipations.team.students" })
Optional<ProgrammingExercise> findWithEagerStudentParticipationsById(Long exerciseId);
Optional<ProgrammingExercise> findWithEagerStudentParticipationsById(long exerciseId);

@Query("""
SELECT pe
Expand All @@ -240,10 +240,10 @@ default ProgrammingExercise findOneByProjectKeyOrThrow(String projectKey, boolea
WHERE pe.id = :exerciseId
AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL)
""")
Optional<ProgrammingExercise> findWithEagerStudentParticipationsStudentAndLegalSubmissionsById(@Param("exerciseId") Long exerciseId);
Optional<ProgrammingExercise> findWithEagerStudentParticipationsStudentAndLegalSubmissionsById(@Param("exerciseId") long exerciseId);

@EntityGraph(type = LOAD, attributePaths = { "templateParticipation", "solutionParticipation", "studentParticipations.team.students" })
Optional<ProgrammingExercise> findWithAllParticipationsById(Long exerciseId);
Optional<ProgrammingExercise> findWithAllParticipationsById(long exerciseId);

@Query("""
SELECT pe
Expand All @@ -253,7 +253,7 @@ default ProgrammingExercise findOneByProjectKeyOrThrow(String projectKey, boolea
OR pe.templateParticipation.id = :participationId
OR pe.solutionParticipation.id = :participationId
""")
Optional<ProgrammingExercise> findByParticipationId(@Param("participationId") Long participationId);
Optional<ProgrammingExercise> findByParticipationId(@Param("participationId") long participationId);

default ProgrammingExercise findByParticipationIdOrElseThrow(long participationId) throws EntityNotFoundException {
return findByParticipationId(participationId)
Expand All @@ -267,7 +267,7 @@ default ProgrammingExercise findByParticipationIdOrElseThrow(long participationI
LEFT JOIN FETCH pe.templateParticipation tp
WHERE pep.id = :participationId
""")
Optional<ProgrammingExercise> findByStudentParticipationIdWithTemplateParticipation(@Param("participationId") Long participationId);
Optional<ProgrammingExercise> findByStudentParticipationIdWithTemplateParticipation(@Param("participationId") long participationId);

@Query("""
SELECT p
Expand All @@ -281,7 +281,7 @@ default ProgrammingExercise findByParticipationIdOrElseThrow(long participationI
LEFT JOIN FETCH tc.solutionEntries
WHERE p.id = :exerciseId
""")
Optional<ProgrammingExercise> findByIdWithEagerTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxRepos(@Param("exerciseId") Long exerciseId);
Optional<ProgrammingExercise> findByIdWithEagerTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxRepos(@Param("exerciseId") long exerciseId);

/**
* Returns all programming exercises that have a due date after {@code now} and have tests marked with
Expand Down Expand Up @@ -333,7 +333,7 @@ SELECT COUNT (DISTINCT p)
AND s.submitted = TRUE
AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL)
""")
long countLegalSubmissionsByExerciseIdSubmittedIgnoreTestRunSubmissions(@Param("exerciseId") Long exerciseId);
long countLegalSubmissionsByExerciseIdSubmittedIgnoreTestRunSubmissions(@Param("exerciseId") long exerciseId);

/**
* In distinction to other exercise types, students can have multiple submissions in a programming exercise.
Expand Down Expand Up @@ -377,7 +377,7 @@ SELECT COUNT (DISTINCT p)
AND r.assessor IS NOT NULL
AND r.completionDate IS NOT NULL
""")
long countAssessmentsByExerciseIdSubmittedIgnoreTestRunSubmissions(@Param("exerciseId") Long exerciseId);
long countAssessmentsByExerciseIdSubmittedIgnoreTestRunSubmissions(@Param("exerciseId") long exerciseId);

/**
* In distinction to other exercise types, students can have multiple submissions in a programming exercise.
Expand All @@ -396,7 +396,7 @@ SELECT COUNT (DISTINCT p)
AND s IS NOT EMPTY
AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL)
""")
long countLegalSubmissionsByExamIdSubmitted(@Param("examId") Long examId);
long countLegalSubmissionsByExamIdSubmitted(@Param("examId") long examId);

/**
* In distinction to other exercise types, students can have multiple submissions in a programming exercise.
Expand Down Expand Up @@ -453,7 +453,7 @@ SELECT COUNT (DISTINCT p)
List<ProgrammingExercise> findAllProgrammingExercisesInCourseOrInExamsOfCourse(@Param("course") Course course);

@EntityGraph(type = LOAD, attributePaths = { "plagiarismDetectionConfig" })
Optional<ProgrammingExercise> findWithPlagiarismDetectionConfigById(Long exerciseId);
Optional<ProgrammingExercise> findWithPlagiarismDetectionConfigById(long exerciseId);

long countByShortNameAndCourse(String shortName, Course course);

Expand All @@ -470,7 +470,7 @@ SELECT COUNT (DISTINCT p)
* @return The programming exercise related to the given id
*/
@NotNull
default ProgrammingExercise findByIdElseThrow(Long programmingExerciseId) throws EntityNotFoundException {
default ProgrammingExercise findByIdElseThrow(long programmingExerciseId) throws EntityNotFoundException {
return findById(programmingExerciseId).orElseThrow(() -> new EntityNotFoundException("Programming Exercise", programmingExerciseId));
}

Expand Down Expand Up @@ -514,7 +514,7 @@ default ProgrammingExercise findByIdWithGradingCriteriaElseThrow(long exerciseId
* @return The programming exercise related to the given id
*/
@NotNull
default ProgrammingExercise findByIdWithPlagiarismDetectionConfigElseThrow(Long programmingExerciseId) throws EntityNotFoundException {
default ProgrammingExercise findByIdWithPlagiarismDetectionConfigElseThrow(long programmingExerciseId) throws EntityNotFoundException {
return findWithPlagiarismDetectionConfigById(programmingExerciseId).orElseThrow(() -> new EntityNotFoundException("Programming Exercise", programmingExerciseId));
}

Expand All @@ -525,7 +525,7 @@ default ProgrammingExercise findByIdWithPlagiarismDetectionConfigElseThrow(Long
* @return The programming exercise related to the given id
*/
@NotNull
default ProgrammingExercise findByIdWithAuxiliaryRepositoriesElseThrow(Long programmingExerciseId) throws EntityNotFoundException {
default ProgrammingExercise findByIdWithAuxiliaryRepositoriesElseThrow(long programmingExerciseId) throws EntityNotFoundException {
return findWithAuxiliaryRepositoriesById(programmingExerciseId).orElseThrow(() -> new EntityNotFoundException("Programming Exercise", programmingExerciseId));
}

Expand All @@ -536,7 +536,7 @@ default ProgrammingExercise findByIdWithAuxiliaryRepositoriesElseThrow(Long prog
* @return The programming exercise related to the given id
*/
@NotNull
default ProgrammingExercise findByIdWithSubmissionPolicyElseThrow(Long programmingExerciseId) throws EntityNotFoundException {
default ProgrammingExercise findByIdWithSubmissionPolicyElseThrow(long programmingExerciseId) throws EntityNotFoundException {
return findWithSubmissionPolicyById(programmingExerciseId).orElseThrow(() -> new EntityNotFoundException("Programming Exercise", programmingExerciseId));
}

Expand All @@ -550,7 +550,7 @@ default ProgrammingExercise findByIdWithSubmissionPolicyElseThrow(Long programmi
* @throws EntityNotFoundException the programming exercise could not be found.
*/
@NotNull
default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationElseThrow(Long programmingExerciseId) throws EntityNotFoundException {
default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationElseThrow(long programmingExerciseId) throws EntityNotFoundException {
Optional<ProgrammingExercise> programmingExercise = findWithTemplateAndSolutionParticipationTeamAssignmentConfigCategoriesById(programmingExerciseId);
return programmingExercise.orElseThrow(() -> new EntityNotFoundException("Programming Exercise", programmingExerciseId));
}
Expand All @@ -564,7 +564,7 @@ default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationElseThro
* @throws EntityNotFoundException the programming exercise could not be found.
*/
@NotNull
default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationAndAuxiliaryRepositoriesElseThrow(Long programmingExerciseId) throws EntityNotFoundException {
default ProgrammingExercise findByIdWithTemplateAndSolutionParticipationAndAuxiliaryRepositoriesElseThrow(long programmingExerciseId) throws EntityNotFoundException {
Optional<ProgrammingExercise> programmingExercise = findWithTemplateAndSolutionParticipationAndAuxiliaryRepositoriesById(programmingExerciseId);
return programmingExercise.orElseThrow(() -> new EntityNotFoundException("Programming Exercise", programmingExerciseId));
}
Expand All @@ -587,7 +587,7 @@ default ProgrammingExercise findByIdWithStudentParticipationsAndLegalSubmissions
* @return the number of programming submissions which should be assessed
* We don't need to check for the submission date, because students cannot participate in programming exercises with manual assessment after their due date
*/
default long countLegalSubmissionsByExerciseIdSubmitted(Long exerciseId) {
default long countLegalSubmissionsByExerciseIdSubmitted(long exerciseId) {
return countLegalSubmissionsByExerciseIdSubmittedIgnoreTestRunSubmissions(exerciseId);
}

Expand All @@ -596,7 +596,7 @@ default long countLegalSubmissionsByExerciseIdSubmitted(Long exerciseId) {
* @return the number of assessed programming submissions
* We don't need to check for the submission date, because students cannot participate in programming exercises with manual assessment after their due date
*/
default long countAssessmentsByExerciseIdSubmitted(Long exerciseId) {
default long countAssessmentsByExerciseIdSubmitted(long exerciseId) {
return countAssessmentsByExerciseIdSubmittedIgnoreTestRunSubmissions(exerciseId);
}

Expand Down
Loading

0 comments on commit 611e77d

Please sign in to comment.